From: John Kessenich Date: Thu, 21 Jul 2016 21:39:23 +0000 (-0600) Subject: Tests: line-number change only: make room for more component tests. X-Git-Tag: upstream/0.1~71 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c08ecb4193f7a10f9948e706233f6c3c323c08b;p=platform%2Fupstream%2Fglslang.git Tests: line-number change only: make room for more component tests. --- diff --git a/Test/440.vert b/Test/440.vert index ac946be..c1a396f 100644 --- a/Test/440.vert +++ b/Test/440.vert @@ -63,6 +63,17 @@ layout(location = 1, component = 1) out; // ERROR, no global set layout(location = 50, component = 3) out int be; layout(location = 50, component = 0) out vec3 bf; +//layout(location = 51, component = 1) out double dfo; // ERROR, odd component +//layout(location = 52, component = 2) out dvec2 dvo; // ERROR, overflow +//layout(location = 53) out double dfo2; +//layout(location = 53, component = 2) out vec2 ffv2; // okay, fits +//layout(location = 54) out dvec4 dvec4out; // uses up location 55 too +//layout(location = 55) out float overf; // ERROR, collides with previous dvec4 +//layout(location = 56, component = 1) out vec2 df2o; +//layout(location = 56, component = 3) out float sf2o; +//layout(location = 57, component = 2) out vec2 dv3o; +//layout(location = 57, component = 3) out float sf4o; // ERROR, overlapping component + out bblck1 { vec4 bbv; } bbinst1; diff --git a/Test/baseResults/440.vert.out b/Test/baseResults/440.vert.out index 9ad3c1b..b5a8f2e 100644 --- a/Test/baseResults/440.vert.out +++ b/Test/baseResults/440.vert.out @@ -19,36 +19,36 @@ ERROR: 0:55: 'component' : type overflows the available 4 components ERROR: 0:57: 'component' : cannot apply to a matrix, structure, or block ERROR: 0:58: 'component' : cannot apply to a matrix, structure, or block ERROR: 0:61: 'location/component/index' : cannot declare a default, use a full declaration -ERROR: 0:81: 'xfb layout qualifier' : can only be used on an output -ERROR: 0:87: 'xfb_offset' : cannot declare a default, use a full declaration -ERROR: 0:97: 'xfb_buffer' : member cannot contradict block (or what block inherited from global) -ERROR: 0:102: 'xfb_buffer' : member cannot contradict block (or what block inherited from global) -ERROR: 0:102: 'xfb_offset' : overlapping offsets at offset 32 in buffer 3 -ERROR: 0:103: 'xfb_offset' : overlapping offsets at offset 0 in buffer 2 -ERROR: 0:105: 'xfb_offset' : overlapping offsets at offset 24 in buffer 2 -ERROR: 0:108: 'xfb_stride' : all stride settings must match for xfb buffer 15 -ERROR: 0:112: 'xfb_offset' : overlapping offsets at offset 4 in buffer 1 -ERROR: 0:114: 'xfb_stride' : all stride settings must match for xfb buffer 3 -ERROR: 0:115: 'xfb_stride' : all stride settings must match for xfb buffer 3 -ERROR: 0:119: 'xfb_stride' : all stride settings must match for xfb buffer 3 -ERROR: 0:117: 'xfb_stride' : all stride settings must match for xfb buffer 3 -ERROR: 0:138: 'xfb_offset' : overlapping offsets at offset 64 in buffer 0 -ERROR: 0:143: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 -ERROR: 0:144: 'xfb_offset' : must be a multiple of size of first component -ERROR: 0:145: 'xfb_offset' : type contains double; xfb_offset must be a multiple of 8 -ERROR: 0:147: 'xfb_offset' : must be a multiple of size of first component -ERROR: 0:148: 'xfb_offset' : type contains double; xfb_offset must be a multiple of 8 -ERROR: 0:152: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 -ERROR: 0:155: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 -ERROR: 0:155: 'xfb_stride' : 1/4 stride is too large: gl_MaxTransformFeedbackInterleavedComponents is 64 -ERROR: 0:157: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 -ERROR: 0:165: 'gl_BaseVertexARB' : required extension not requested: GL_ARB_shader_draw_parameters -ERROR: 0:165: 'gl_BaseInstanceARB' : required extension not requested: GL_ARB_shader_draw_parameters -ERROR: 0:165: 'gl_DrawIDARB' : required extension not requested: GL_ARB_shader_draw_parameters -ERROR: 0:173: 'assign' : l-value required "gl_BaseVertexARB" (can't modify shader input) -ERROR: 0:174: 'assign' : l-value required "gl_BaseInstanceARB" (can't modify shader input) -ERROR: 0:175: 'assign' : l-value required "gl_DrawIDARB" (can't modify shader input) -ERROR: 0:176: 'glBaseInstanceARB' : undeclared identifier +ERROR: 0:92: 'xfb layout qualifier' : can only be used on an output +ERROR: 0:98: 'xfb_offset' : cannot declare a default, use a full declaration +ERROR: 0:108: 'xfb_buffer' : member cannot contradict block (or what block inherited from global) +ERROR: 0:113: 'xfb_buffer' : member cannot contradict block (or what block inherited from global) +ERROR: 0:113: 'xfb_offset' : overlapping offsets at offset 32 in buffer 3 +ERROR: 0:114: 'xfb_offset' : overlapping offsets at offset 0 in buffer 2 +ERROR: 0:116: 'xfb_offset' : overlapping offsets at offset 24 in buffer 2 +ERROR: 0:119: 'xfb_stride' : all stride settings must match for xfb buffer 15 +ERROR: 0:123: 'xfb_offset' : overlapping offsets at offset 4 in buffer 1 +ERROR: 0:125: 'xfb_stride' : all stride settings must match for xfb buffer 3 +ERROR: 0:126: 'xfb_stride' : all stride settings must match for xfb buffer 3 +ERROR: 0:130: 'xfb_stride' : all stride settings must match for xfb buffer 3 +ERROR: 0:128: 'xfb_stride' : all stride settings must match for xfb buffer 3 +ERROR: 0:149: 'xfb_offset' : overlapping offsets at offset 64 in buffer 0 +ERROR: 0:154: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 +ERROR: 0:155: 'xfb_offset' : must be a multiple of size of first component +ERROR: 0:156: 'xfb_offset' : type contains double; xfb_offset must be a multiple of 8 +ERROR: 0:158: 'xfb_offset' : must be a multiple of size of first component +ERROR: 0:159: 'xfb_offset' : type contains double; xfb_offset must be a multiple of 8 +ERROR: 0:163: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 +ERROR: 0:166: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 +ERROR: 0:166: 'xfb_stride' : 1/4 stride is too large: gl_MaxTransformFeedbackInterleavedComponents is 64 +ERROR: 0:168: 'xfb_buffer' : buffer is too large: gl_MaxTransformFeedbackBuffers is 4 +ERROR: 0:176: 'gl_BaseVertexARB' : required extension not requested: GL_ARB_shader_draw_parameters +ERROR: 0:176: 'gl_BaseInstanceARB' : required extension not requested: GL_ARB_shader_draw_parameters +ERROR: 0:176: 'gl_DrawIDARB' : required extension not requested: GL_ARB_shader_draw_parameters +ERROR: 0:184: 'assign' : l-value required "gl_BaseVertexARB" (can't modify shader input) +ERROR: 0:185: 'assign' : l-value required "gl_BaseInstanceARB" (can't modify shader input) +ERROR: 0:186: 'assign' : l-value required "gl_DrawIDARB" (can't modify shader input) +ERROR: 0:187: 'glBaseInstanceARB' : undeclared identifier ERROR: 49 compilation errors. No code generated. @@ -56,37 +56,37 @@ Shader version: 440 Requested GL_ARB_shader_draw_parameters in xfb mode ERROR: node is still EOpNull! -0:163 Function Definition: drawParamsBad( (global int) -0:163 Function Parameters: -0:165 Sequence -0:165 Branch: Return with expression -0:165 add (temp int) -0:165 add (temp int) -0:165 'gl_BaseVertexARB' (in int BaseVertex) -0:165 'gl_BaseInstanceARB' (in int BaseInstance) -0:165 'gl_DrawIDARB' (in int DrawId) -0:170 Function Definition: drawParams( (global int) -0:170 Function Parameters: -0:172 Sequence -0:172 Branch: Return with expression -0:172 add (temp int) -0:172 add (temp int) -0:172 'gl_BaseVertexARB' (in int BaseVertex) -0:172 'gl_BaseInstanceARB' (in int BaseInstance) -0:172 'gl_DrawIDARB' (in int DrawId) -0:173 move second child to first child (temp int) -0:173 'gl_BaseVertexARB' (in int BaseVertex) -0:173 Constant: -0:173 3 (const int) -0:174 move second child to first child (temp int) -0:174 'gl_BaseInstanceARB' (in int BaseInstance) -0:174 Constant: -0:174 3 (const int) -0:175 move second child to first child (temp int) -0:175 'gl_DrawIDARB' (in int DrawId) -0:175 Constant: -0:175 3 (const int) -0:176 'glBaseInstanceARB' (temp float) +0:174 Function Definition: drawParamsBad( (global int) +0:174 Function Parameters: +0:176 Sequence +0:176 Branch: Return with expression +0:176 add (temp int) +0:176 add (temp int) +0:176 'gl_BaseVertexARB' (in int BaseVertex) +0:176 'gl_BaseInstanceARB' (in int BaseInstance) +0:176 'gl_DrawIDARB' (in int DrawId) +0:181 Function Definition: drawParams( (global int) +0:181 Function Parameters: +0:183 Sequence +0:183 Branch: Return with expression +0:183 add (temp int) +0:183 add (temp int) +0:183 'gl_BaseVertexARB' (in int BaseVertex) +0:183 'gl_BaseInstanceARB' (in int BaseInstance) +0:183 'gl_DrawIDARB' (in int DrawId) +0:184 move second child to first child (temp int) +0:184 'gl_BaseVertexARB' (in int BaseVertex) +0:184 Constant: +0:184 3 (const int) +0:185 move second child to first child (temp int) +0:185 'gl_BaseInstanceARB' (in int BaseInstance) +0:185 Constant: +0:185 3 (const int) +0:186 move second child to first child (temp int) +0:186 'gl_DrawIDARB' (in int DrawId) +0:186 Constant: +0:186 3 (const int) +0:187 'glBaseInstanceARB' (temp float) 0:? Linker Objects 0:? 'a' (layout(location=2 component=2 ) in 2-component vector of float) 0:? 'b' (layout(location=2 component=1 ) in float) @@ -156,37 +156,37 @@ Shader version: 440 Requested GL_ARB_shader_draw_parameters in xfb mode ERROR: node is still EOpNull! -0:163 Function Definition: drawParamsBad( (global int) -0:163 Function Parameters: -0:165 Sequence -0:165 Branch: Return with expression -0:165 add (temp int) -0:165 add (temp int) -0:165 'gl_BaseVertexARB' (in int BaseVertex) -0:165 'gl_BaseInstanceARB' (in int BaseInstance) -0:165 'gl_DrawIDARB' (in int DrawId) -0:170 Function Definition: drawParams( (global int) -0:170 Function Parameters: -0:172 Sequence -0:172 Branch: Return with expression -0:172 add (temp int) -0:172 add (temp int) -0:172 'gl_BaseVertexARB' (in int BaseVertex) -0:172 'gl_BaseInstanceARB' (in int BaseInstance) -0:172 'gl_DrawIDARB' (in int DrawId) -0:173 move second child to first child (temp int) -0:173 'gl_BaseVertexARB' (in int BaseVertex) -0:173 Constant: -0:173 3 (const int) -0:174 move second child to first child (temp int) -0:174 'gl_BaseInstanceARB' (in int BaseInstance) -0:174 Constant: -0:174 3 (const int) -0:175 move second child to first child (temp int) -0:175 'gl_DrawIDARB' (in int DrawId) -0:175 Constant: -0:175 3 (const int) -0:176 'glBaseInstanceARB' (temp float) +0:174 Function Definition: drawParamsBad( (global int) +0:174 Function Parameters: +0:176 Sequence +0:176 Branch: Return with expression +0:176 add (temp int) +0:176 add (temp int) +0:176 'gl_BaseVertexARB' (in int BaseVertex) +0:176 'gl_BaseInstanceARB' (in int BaseInstance) +0:176 'gl_DrawIDARB' (in int DrawId) +0:181 Function Definition: drawParams( (global int) +0:181 Function Parameters: +0:183 Sequence +0:183 Branch: Return with expression +0:183 add (temp int) +0:183 add (temp int) +0:183 'gl_BaseVertexARB' (in int BaseVertex) +0:183 'gl_BaseInstanceARB' (in int BaseInstance) +0:183 'gl_DrawIDARB' (in int DrawId) +0:184 move second child to first child (temp int) +0:184 'gl_BaseVertexARB' (in int BaseVertex) +0:184 Constant: +0:184 3 (const int) +0:185 move second child to first child (temp int) +0:185 'gl_BaseInstanceARB' (in int BaseInstance) +0:185 Constant: +0:185 3 (const int) +0:186 move second child to first child (temp int) +0:186 'gl_DrawIDARB' (in int DrawId) +0:186 Constant: +0:186 3 (const int) +0:187 'glBaseInstanceARB' (temp float) 0:? Linker Objects 0:? 'a' (layout(location=2 component=2 ) in 2-component vector of float) 0:? 'b' (layout(location=2 component=1 ) in float) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index ca7d044..342a333 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "SPIRV99.1321" -#define GLSLANG_DATE "20-Jul-2016" +#define GLSLANG_REVISION "SPIRV99.1330" +#define GLSLANG_DATE "21-Jul-2016"