From 9fb31ce8ecdac1e0c029729177144545186c509f Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 24 Mar 2017 18:57:50 -0600 Subject: [PATCH] Tests: strengthen the value of test for NV members. --- Test/baseResults/spv.450.geom.out | 75 +++++++++++++++++++++++---------------- Test/spv.450.geom | 10 +----- glslang/Include/revision.h | 2 +- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Test/baseResults/spv.450.geom.out b/Test/baseResults/spv.450.geom.out index 2fa72cd..85c6814 100755 --- a/Test/baseResults/spv.450.geom.out +++ b/Test/baseResults/spv.450.geom.out @@ -3,52 +3,65 @@ Warning, version 450 is not yet complete; most version-specific features are pre // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 24 +// Id's are bound by 26 Capability Geometry Capability GeometryPointSize 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Geometry 4 "main" 14 23 + EntryPoint Geometry 4 "main" 13 20 ExecutionMode 4 Triangles ExecutionMode 4 Invocations 4 ExecutionMode 4 OutputLineStrip ExecutionMode 4 OutputVertices 127 Source GLSL 450 Name 4 "main" - Name 8 "p" - Name 9 "gl_PerVertex" - MemberName 9(gl_PerVertex) 0 "gl_PointSize" - Name 14 "gl_in" - Name 21 "gl_PerVertex" - MemberName 21(gl_PerVertex) 0 "gl_PointSize" - Name 23 "" - MemberDecorate 9(gl_PerVertex) 0 BuiltIn PointSize - Decorate 9(gl_PerVertex) Block - MemberDecorate 21(gl_PerVertex) 0 BuiltIn PointSize - Decorate 21(gl_PerVertex) Block + Name 11 "gl_PerVertex" + MemberName 11(gl_PerVertex) 0 "gl_Position" + MemberName 11(gl_PerVertex) 1 "gl_PointSize" + MemberName 11(gl_PerVertex) 2 "gl_ClipDistance" + MemberName 11(gl_PerVertex) 3 "gl_CullDistance" + Name 13 "" + Name 16 "gl_PerVertex" + MemberName 16(gl_PerVertex) 0 "gl_Position" + MemberName 16(gl_PerVertex) 1 "gl_PointSize" + MemberName 16(gl_PerVertex) 2 "gl_ClipDistance" + MemberName 16(gl_PerVertex) 3 "gl_CullDistance" + Name 20 "gl_in" + MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position + MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize + MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance + MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance + Decorate 11(gl_PerVertex) Block + MemberDecorate 16(gl_PerVertex) 0 BuiltIn Position + MemberDecorate 16(gl_PerVertex) 1 BuiltIn PointSize + MemberDecorate 16(gl_PerVertex) 2 BuiltIn ClipDistance + MemberDecorate 16(gl_PerVertex) 3 BuiltIn CullDistance + Decorate 16(gl_PerVertex) Block 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 - 7: TypePointer Function 6(float) - 9(gl_PerVertex): TypeStruct 6(float) - 10: TypeInt 32 0 - 11: 10(int) Constant 3 - 12: TypeArray 9(gl_PerVertex) 11 - 13: TypePointer Input 12 - 14(gl_in): 13(ptr) Variable Input - 15: TypeInt 32 1 - 16: 15(int) Constant 1 - 17: 15(int) Constant 0 - 18: TypePointer Input 6(float) -21(gl_PerVertex): TypeStruct 6(float) - 22: TypePointer Output 21(gl_PerVertex) - 23: 22(ptr) Variable Output + 7: TypeVector 6(float) 4 + 8: TypeInt 32 0 + 9: 8(int) Constant 1 + 10: TypeArray 6(float) 9 +11(gl_PerVertex): TypeStruct 7(fvec4) 6(float) 10 10 + 12: TypePointer Output 11(gl_PerVertex) + 13: 12(ptr) Variable Output + 14: TypeInt 32 1 + 15: 14(int) Constant 1 +16(gl_PerVertex): TypeStruct 7(fvec4) 6(float) 10 10 + 17: 8(int) Constant 3 + 18: TypeArray 16(gl_PerVertex) 17 + 19: TypePointer Input 18 + 20(gl_in): 19(ptr) Variable Input + 21: TypePointer Input 6(float) + 24: TypePointer Output 6(float) 4(main): 2 Function None 3 5: Label - 8(p): 7(ptr) Variable Function - 19: 18(ptr) AccessChain 14(gl_in) 16 17 - 20: 6(float) Load 19 - Store 8(p) 20 + 22: 21(ptr) AccessChain 20(gl_in) 15 15 + 23: 6(float) Load 22 + 25: 24(ptr) AccessChain 13 15 + Store 25 23 Return FunctionEnd diff --git a/Test/spv.450.geom b/Test/spv.450.geom index dff0329..8aefe50 100644 --- a/Test/spv.450.geom +++ b/Test/spv.450.geom @@ -2,19 +2,11 @@ layout(triangles) in; -in gl_PerVertex { - float gl_PointSize; -} gl_in[]; - -out gl_PerVertex { - float gl_PointSize; -}; - layout(line_strip) out; layout(max_vertices = 127) out; layout(invocations = 4) in; void main() { - float p = gl_in[1].gl_PointSize; + gl_PointSize = gl_in[1].gl_PointSize; } diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 0ced98e..d442909 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 "Overload400-PrecQual.1933" +#define GLSLANG_REVISION "Overload400-PrecQual.1937" #define GLSLANG_DATE "24-Mar-2017" -- 2.7.4