Support in/out for stage inputs/outputs, tied to being desktop version 150 or ES 300.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20077 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-01-10 01:47:54 +00:00
parent 1b12b9c575
commit f59bfa07e0
7 changed files with 26 additions and 9 deletions

3
Test/pre150.frag Normal file
View File

@@ -0,0 +1,3 @@
varying vec4 v;
in vec4 i;
out vec4 o;

View File

@@ -1,4 +1,4 @@
#version 110
#version 150
#extension GL_3DL_array_objects : enable
@@ -61,13 +61,13 @@ layout(row_major, column_major)
layout(shared, row_major) uniform; // default is now shared and row_major
layout(std140) uniform Transform { // layout of this block is std140
layout(std140) uniform Transform { // layout of this block is std140
mat4 M1; // row_major
layout(column_major) mat4 M2; // column major
mat3 N1; // row_major
};
layout(column_major) uniform T3 { // shared and column_major
layout(column_major) uniform T3 { // shared and column_major
mat4 M3; // column_major
layout(row_major) mat4 m4; // row major
mat3 N2; // column_major
@@ -178,7 +178,7 @@ void main()
light lightVar = light(3.0, vec3(1.0, 2.0, 3.0));
}
{
const float c[3] = float[3](5.0, 7.2, 1.1);
const float c[3] = float[3](5.0, 7.2, 1.1);
const float d[3] = float[](5.0, 7.2, 1.1);
float g;

View File

@@ -6,3 +6,4 @@ versionsClean.frag
versionsClean.vert
versionsErrors.frag
versionsErrors.vert
pre150.frag