mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glslang front-end: Implement AEP *_point_size extensions.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31560 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2015-06-23 04:14:00 +00:00
parent 6e76bdc88d
commit b61b82182f
11 changed files with 248 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Test/310.geom
View File

@@ -47,7 +47,7 @@ void main()
gl_ClipDistance[3] = // ERROR, no ClipDistance
gl_in[1].gl_ClipDistance[2]; // ERROR, no ClipDistance
gl_Position = gl_in[0].gl_Position;
gl_PointSize = gl_in[3].gl_PointSize;
gl_PrimitiveID = gl_PrimitiveIDIn;
gl_Layer = 2;
}
@@ -137,3 +137,16 @@ void notHere()
gl_VerticesIn; // ERROR, not in ES
}
void pointSize1()
{
highp float ps = gl_in[3].gl_PointSize; // ERROR, need point_size extension
gl_PointSize = ps; // ERROR, need point_size extension
}
#extension GL_OES_geometry_point_size : enable
void pointSize2()
{
highp float ps = gl_in[3].gl_PointSize;
gl_PointSize = ps;
}

12
Test/310.tesc
View File

@@ -23,7 +23,7 @@ void main()
gl_MaxTessControlTotalOutputComponents;
vec4 p = gl_in[1].gl_Position;
float ps = gl_in[1].gl_PointSize;
float ps = gl_in[1].gl_PointSize; // ERROR, need point_size extension
float cd = gl_in[1].gl_ClipDistance[2]; // ERROR, not in ES
int pvi = gl_PatchVerticesIn;
@@ -31,7 +31,7 @@ void main()
int iid = gl_InvocationID;
gl_out[1].gl_Position = p;
gl_out[1].gl_PointSize = ps;
gl_out[1].gl_PointSize = ps; // ERROR, need point_size extension
gl_out[1].gl_ClipDistance[1] = cd; // ERROR, not in ES
gl_TessLevelOuter[3] = 3.2;
@@ -107,6 +107,14 @@ layout(vertices = 4) out float badlay[]; // ERROR, not on a variable
out float misSized[5]; // ERROR, size doesn't match
out float okaySize[4];
#extension GL_OES_tessellation_point_size : enable
void pointSize2()
{
float ps = gl_in[1].gl_PointSize;
gl_out[1].gl_PointSize = ps;
}
// for testing with gpu_shader5
//precise vec3 pv3;
//

12
Test/310.tese
View File

@@ -34,7 +34,7 @@ void main()
gl_MaxTessGenLevel;
vec4 p = gl_in[1].gl_Position;
float ps = gl_in[1].gl_PointSize;
float ps = gl_in[1].gl_PointSize; // ERROR, need point_size extension
float cd = gl_in[1].gl_ClipDistance[2]; // ERROR, not in ES
int pvi = gl_PatchVerticesIn;
@@ -44,7 +44,7 @@ void main()
float tli = gl_TessLevelInner[1];
gl_Position = p;
gl_PointSize = ps;
gl_PointSize = ps; // ERROR, need point_size extension
gl_ClipDistance[2] = cd; // ERROR, not in ES
}
@@ -111,3 +111,11 @@ patch in pinbn {
centroid out vec3 myColor2;
centroid in vec3 centr[];
sample out vec4 perSampleColor; // ERROR without sample extensions
#extension GL_OES_tessellation_point_size : enable
void pointSize2()
{
float ps = gl_in[1].gl_PointSize; // ERROR, not in the redeclaration, but no error on use of gl_PointSize
gl_PointSize = ps;
}

110
Test/baseResults/310.geom.out
View File

@@ -35,12 +35,19 @@ ERROR: 0:128: 'sample' : Reserved word.
ERROR: 0:132: 'component' : not supported with this profile: es
ERROR: 0:136: 'gl_MaxGeometryVaryingComponents' : undeclared identifier
ERROR: 0:137: 'gl_VerticesIn' : undeclared identifier
ERROR: 35 compilation errors. No code generated.
ERROR: 0:142: 'gl_PointSize' : required extension not requested: Possible extensions include:
GL_EXT_geometry_point_size
GL_OES_geometry_point_size
ERROR: 0:143: 'gl_PointSize' : required extension not requested: Possible extensions include:
GL_EXT_geometry_point_size
GL_OES_geometry_point_size
ERROR: 37 compilation errors. No code generated.
Shader version: 310
Requested GL_EXT_geometry_shader
Requested GL_EXT_shader_io_blocks
Requested GL_OES_geometry_point_size
invocations = 4
max_vertices = 200
input primitive = lines_adjacency
@@ -84,18 +91,6 @@ ERROR: node is still EOpNull!
0:49 0 (const int)
0:49 Constant:
0:49 0 (const int)
0:50 move second child to first child (temp highp float)
0:50 gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize highp float PointSize)
0:50 'anon@1' (layout(stream=0 ) out block{layout(stream=0 ) gl_Position highp 4-component vector of float Position gl_Position, layout(stream=0 ) gl_PointSize highp float PointSize gl_PointSize})
0:50 Constant:
0:50 1 (const uint)
0:50 gl_PointSize: direct index for structure (in highp float PointSize)
0:50 direct index (temp block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:50 'gl_in' (in 4-element array of block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:50 Constant:
0:50 3 (const int)
0:50 Constant:
0:50 1 (const int)
0:51 move second child to first child (temp highp int)
0:51 'gl_PrimitiveID' (layout(stream=0 ) out highp int PrimitiveID)
0:51 'gl_PrimitiveIDIn' (in highp int PrimitiveID)
@@ -133,6 +128,44 @@ ERROR: node is still EOpNull!
0:136 Sequence
0:136 'gl_MaxGeometryVaryingComponents' (temp float)
0:137 'gl_VerticesIn' (temp float)
0:140 Function Definition: pointSize1( (global void)
0:140 Function Parameters:
0:142 Sequence
0:142 Sequence
0:142 move second child to first child (temp highp float)
0:142 'ps' (temp highp float)
0:142 gl_PointSize: direct index for structure (in highp float PointSize)
0:142 direct index (temp block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:142 'gl_in' (in 4-element array of block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:142 Constant:
0:142 3 (const int)
0:142 Constant:
0:142 1 (const int)
0:143 move second child to first child (temp highp float)
0:143 gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize highp float PointSize)
0:143 'anon@1' (layout(stream=0 ) out block{layout(stream=0 ) gl_Position highp 4-component vector of float Position gl_Position, layout(stream=0 ) gl_PointSize highp float PointSize gl_PointSize})
0:143 Constant:
0:143 1 (const uint)
0:143 'ps' (temp highp float)
0:148 Function Definition: pointSize2( (global void)
0:148 Function Parameters:
0:150 Sequence
0:150 Sequence
0:150 move second child to first child (temp highp float)
0:150 'ps' (temp highp float)
0:150 gl_PointSize: direct index for structure (in highp float PointSize)
0:150 direct index (temp block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:150 'gl_in' (in 4-element array of block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:150 Constant:
0:150 3 (const int)
0:150 Constant:
0:150 1 (const int)
0:151 move second child to first child (temp highp float)
0:151 gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize highp float PointSize)
0:151 'anon@1' (layout(stream=0 ) out block{layout(stream=0 ) gl_Position highp 4-component vector of float Position gl_Position, layout(stream=0 ) gl_PointSize highp float PointSize gl_PointSize})
0:151 Constant:
0:151 1 (const uint)
0:151 'ps' (temp highp float)
0:? Linker Objects
0:? 'fromV' (in 4-element array of block{in mediump 3-component vector of float color})
0:? 'nonBlockUnsized' (in 4-element array of mediump 4-component vector of float)
@@ -166,6 +199,7 @@ Linked geometry stage:
Shader version: 310
Requested GL_EXT_geometry_shader
Requested GL_EXT_shader_io_blocks
Requested GL_OES_geometry_point_size
invocations = 4
max_vertices = 200
input primitive = lines_adjacency
@@ -209,18 +243,6 @@ ERROR: node is still EOpNull!
0:49 0 (const int)
0:49 Constant:
0:49 0 (const int)
0:50 move second child to first child (temp highp float)
0:50 gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize highp float PointSize)
0:50 'anon@1' (layout(stream=0 ) out block{layout(stream=0 ) gl_Position highp 4-component vector of float Position gl_Position, layout(stream=0 ) gl_PointSize highp float PointSize gl_PointSize})
0:50 Constant:
0:50 1 (const uint)
0:50 gl_PointSize: direct index for structure (in highp float PointSize)
0:50 direct index (temp block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:50 'gl_in' (in 4-element array of block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:50 Constant:
0:50 3 (const int)
0:50 Constant:
0:50 1 (const int)
0:51 move second child to first child (temp highp int)
0:51 'gl_PrimitiveID' (layout(stream=0 ) out highp int PrimitiveID)
0:51 'gl_PrimitiveIDIn' (in highp int PrimitiveID)
@@ -258,6 +280,44 @@ ERROR: node is still EOpNull!
0:136 Sequence
0:136 'gl_MaxGeometryVaryingComponents' (temp float)
0:137 'gl_VerticesIn' (temp float)
0:140 Function Definition: pointSize1( (global void)
0:140 Function Parameters:
0:142 Sequence
0:142 Sequence
0:142 move second child to first child (temp highp float)
0:142 'ps' (temp highp float)
0:142 gl_PointSize: direct index for structure (in highp float PointSize)
0:142 direct index (temp block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:142 'gl_in' (in 4-element array of block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:142 Constant:
0:142 3 (const int)
0:142 Constant:
0:142 1 (const int)
0:143 move second child to first child (temp highp float)
0:143 gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize highp float PointSize)
0:143 'anon@1' (layout(stream=0 ) out block{layout(stream=0 ) gl_Position highp 4-component vector of float Position gl_Position, layout(stream=0 ) gl_PointSize highp float PointSize gl_PointSize})
0:143 Constant:
0:143 1 (const uint)
0:143 'ps' (temp highp float)
0:148 Function Definition: pointSize2( (global void)
0:148 Function Parameters:
0:150 Sequence
0:150 Sequence
0:150 move second child to first child (temp highp float)
0:150 'ps' (temp highp float)
0:150 gl_PointSize: direct index for structure (in highp float PointSize)
0:150 direct index (temp block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:150 'gl_in' (in 4-element array of block{in highp 4-component vector of float Position gl_Position, in highp float PointSize gl_PointSize})
0:150 Constant:
0:150 3 (const int)
0:150 Constant:
0:150 1 (const int)
0:151 move second child to first child (temp highp float)
0:151 gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize highp float PointSize)
0:151 'anon@1' (layout(stream=0 ) out block{layout(stream=0 ) gl_Position highp 4-component vector of float Position gl_Position, layout(stream=0 ) gl_PointSize highp float PointSize gl_PointSize})
0:151 Constant:
0:151 1 (const uint)
0:151 'ps' (temp highp float)
0:? Linker Objects
0:? 'fromV' (in 4-element array of block{in mediump 3-component vector of float color})
0:? 'nonBlockUnsized' (in 4-element array of mediump 4-component vector of float)

54
Test/baseResults/310.tesc.out
View File

@@ -4,8 +4,14 @@ ERROR: 0:8: 'quads' : unrecognized layout identifier, or qualifier requires assi
ERROR: 0:9: 'ccw' : unrecognized layout identifier, or qualifier requires assignment (e.g., binding = 4)
ERROR: 0:10: 'fractional_even_spacing' : unrecognized layout identifier, or qualifier requires assignment (e.g., binding = 4)
ERROR: 0:12: 'patch' : can only use on output in tessellation-control shader
ERROR: 0:26: 'gl_PointSize' : required extension not requested: Possible extensions include:
GL_EXT_tessellation_point_size
GL_OES_tessellation_point_size
ERROR: 0:27: 'gl_ClipDistance' : no such field in structure
ERROR: 0:27: 'expression' : left of '[' is not of type array, matrix, or vector
ERROR: 0:34: 'gl_PointSize' : required extension not requested: Possible extensions include:
GL_EXT_tessellation_point_size
GL_OES_tessellation_point_size
ERROR: 0:35: 'gl_ClipDistance' : no such field in structure
ERROR: 0:35: 'expression' : left of '[' is not of type array, matrix, or vector
ERROR: 0:35: 'assign' : l-value required (can't modify a const)
@@ -29,12 +35,13 @@ ERROR: 0:95: 'fma' : no matching overloaded function found
ERROR: 0:104: 'sample' : Reserved word.
ERROR: 0:106: 'vertices' : can only apply to a standalone qualifier
ERROR: 0:107: 'vertices' : inconsistent output number of vertices for array size of misSized
ERROR: 29 compilation errors. No code generated.
ERROR: 31 compilation errors. No code generated.
Shader version: 310
Requested GL_ARB_separate_shader_objects
Requested GL_OES_shader_io_blocks
Requested GL_OES_tessellation_point_size
Requested GL_OES_tessellation_shader
vertices = 4
ERROR: node is still EOpNull!
@@ -183,6 +190,28 @@ ERROR: node is still EOpNull!
0:95 'd' (temp highp float)
0:95 Constant:
0:95 0.000000
0:112 Function Definition: pointSize2( (global void)
0:112 Function Parameters:
0:114 Sequence
0:114 Sequence
0:114 move second child to first child (temp highp float)
0:114 'ps' (temp highp float)
0:114 gl_PointSize: direct index for structure (in highp float)
0:114 direct index (temp block{in highp 4-component vector of float gl_Position, in highp float gl_PointSize})
0:114 'gl_in' (in 32-element array of block{in highp 4-component vector of float gl_Position, in highp float gl_PointSize})
0:114 Constant:
0:114 1 (const int)
0:114 Constant:
0:114 1 (const int)
0:115 move second child to first child (temp highp float)
0:115 gl_PointSize: direct index for structure (out highp float PointSize)
0:115 direct index (temp block{out highp 4-component vector of float Position gl_Position, out highp float PointSize gl_PointSize})
0:115 'gl_out' (out 4-element array of block{out highp 4-component vector of float Position gl_Position, out highp float PointSize gl_PointSize})
0:115 Constant:
0:115 1 (const int)
0:115 Constant:
0:115 1 (const int)
0:115 'ps' (temp highp float)
0:? Linker Objects
0:? 'gl_out' (out 4-element array of block{out highp 4-component vector of float Position gl_Position, out highp float PointSize gl_PointSize})
0:? 'outa' (global 4-element array of highp int)
@@ -214,6 +243,7 @@ Linked tessellation control stage:
Shader version: 310
Requested GL_ARB_separate_shader_objects
Requested GL_OES_shader_io_blocks
Requested GL_OES_tessellation_point_size
Requested GL_OES_tessellation_shader
vertices = 4
ERROR: node is still EOpNull!
@@ -362,6 +392,28 @@ ERROR: node is still EOpNull!
0:95 'd' (temp highp float)
0:95 Constant:
0:95 0.000000
0:112 Function Definition: pointSize2( (global void)
0:112 Function Parameters:
0:114 Sequence
0:114 Sequence
0:114 move second child to first child (temp highp float)
0:114 'ps' (temp highp float)
0:114 gl_PointSize: direct index for structure (in highp float)
0:114 direct index (temp block{in highp 4-component vector of float gl_Position, in highp float gl_PointSize})
0:114 'gl_in' (in 32-element array of block{in highp 4-component vector of float gl_Position, in highp float gl_PointSize})
0:114 Constant:
0:114 1 (const int)
0:114 Constant:
0:114 1 (const int)
0:115 move second child to first child (temp highp float)
0:115 gl_PointSize: direct index for structure (out highp float PointSize)
0:115 direct index (temp block{out highp 4-component vector of float Position gl_Position, out highp float PointSize gl_PointSize})
0:115 'gl_out' (out 4-element array of block{out highp 4-component vector of float Position gl_Position, out highp float PointSize gl_PointSize})
0:115 Constant:
0:115 1 (const int)
0:115 Constant:
0:115 1 (const int)
0:115 'ps' (temp highp float)
0:? Linker Objects
0:? 'gl_out' (out 4-element array of block{out highp 4-component vector of float Position gl_Position, out highp float PointSize gl_PointSize})
0:? 'outa' (global 4-element array of highp int)

30
Test/baseResults/310.tese.out
View File

@@ -8,8 +8,14 @@ ERROR: 0:16: 'equal_spacing' : cannot change previously set vertex spacing
ERROR: 0:17: 'fractional_even_spacing' : cannot change previously set vertex spacing
ERROR: 0:22: 'patch' : can only use on input in tessellation-evaluation shader
ERROR: 0:26: 'barrier' : no matching overloaded function found
ERROR: 0:37: 'gl_PointSize' : required extension not requested: Possible extensions include:
GL_EXT_tessellation_point_size
GL_OES_tessellation_point_size
ERROR: 0:38: 'gl_ClipDistance' : no such field in structure
ERROR: 0:38: 'expression' : left of '[' is not of type array, matrix, or vector
ERROR: 0:47: 'gl_PointSize' : required extension not requested: Possible extensions include:
GL_EXT_tessellation_point_size
GL_OES_tessellation_point_size
ERROR: 0:48: 'gl_ClipDistance' : undeclared identifier
ERROR: 0:48: 'gl_ClipDistance' : left of '[' is not of type array, matrix, or vector
ERROR: 0:48: 'assign' : l-value required (can't modify a const)
@@ -39,7 +45,9 @@ ERROR: 0:100: 'location' : overlapping use of location 24
ERROR: 0:103: 'location' : overlapping use of location 24
ERROR: 0:105: 'gl_TessLevelOuter' : identifiers starting with "gl_" are reserved
ERROR: 0:113: 'sample' : Reserved word.
ERROR: 39 compilation errors. No code generated.
ERROR: 0:119: 'gl_PointSize' : no such field in structure
ERROR: 0:119: '=' : cannot convert from 'temp block{in highp 4-component vector of float gl_Position}' to 'temp highp float'
ERROR: 43 compilation errors. No code generated.
Shader version: 310
@@ -47,6 +55,7 @@ Requested GL_ARB_separate_shader_objects
Requested GL_EXT_shader_io_blocks
Requested GL_EXT_tessellation_shader
Requested GL_OES_shader_io_blocks
Requested GL_OES_tessellation_point_size
Requested GL_OES_tessellation_shader
input primitive = quads
vertex spacing = fractional_odd_spacing
@@ -130,6 +139,15 @@ ERROR: node is still EOpNull!
0:48 Constant:
0:48 0.000000
0:48 'cd' (temp highp float)
0:117 Function Definition: pointSize2( (global void)
0:117 Function Parameters:
0:? Sequence
0:120 move second child to first child (temp highp float)
0:120 gl_PointSize: direct index for structure (gl_PointSize highp float PointSize)
0:120 'anon@1' (out block{gl_Position highp 4-component vector of float Position gl_Position, gl_PointSize highp float PointSize gl_PointSize})
0:120 Constant:
0:120 1 (const uint)
0:120 'ps' (temp highp float)
0:? Linker Objects
0:? 'patchIn' (patch in highp 4-component vector of float)
0:? 'patchOut' (patch out highp 4-component vector of float)
@@ -165,6 +183,7 @@ Requested GL_ARB_separate_shader_objects
Requested GL_EXT_shader_io_blocks
Requested GL_EXT_tessellation_shader
Requested GL_OES_shader_io_blocks
Requested GL_OES_tessellation_point_size
Requested GL_OES_tessellation_shader
input primitive = quads
vertex spacing = fractional_odd_spacing
@@ -248,6 +267,15 @@ ERROR: node is still EOpNull!
0:48 Constant:
0:48 0.000000
0:48 'cd' (temp highp float)
0:117 Function Definition: pointSize2( (global void)
0:117 Function Parameters:
0:? Sequence
0:120 move second child to first child (temp highp float)
0:120 gl_PointSize: direct index for structure (gl_PointSize highp float PointSize)
0:120 'anon@1' (out block{gl_Position highp 4-component vector of float Position gl_Position, gl_PointSize highp float PointSize gl_PointSize})
0:120 Constant:
0:120 1 (const uint)
0:120 'ps' (temp highp float)
0:? Linker Objects
0:? 'patchIn' (patch in highp 4-component vector of float)
0:? 'patchOut' (patch out highp 4-component vector of float)