Skip to content

G
glslang
Commit 9fb31ce8 by John Kessenich
Options

Tests: strengthen the value of test for NV members.

parent 0e737844
Showing with 46 additions and 41 deletions
Test/baseResults/spv.450.geom.out
...@@ -3,52 +3,65 @@ Warning, version 450 is not yet complete; most version-specific features are pre ...@@ -3,52 +3,65 @@ Warning, version 450 is not yet complete; most version-specific features are pre
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 24 // Id's are bound by 26
Capability Geometry Capability Geometry
Capability GeometryPointSize Capability GeometryPointSize
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Geometry 4 "main" 14 23 EntryPoint Geometry 4 "main" 13 20
ExecutionMode 4 Triangles ExecutionMode 4 Triangles
ExecutionMode 4 Invocations 4 ExecutionMode 4 Invocations 4
ExecutionMode 4 OutputLineStrip ExecutionMode 4 OutputLineStrip
ExecutionMode 4 OutputVertices 127 ExecutionMode 4 OutputVertices 127
Source GLSL 450 Source GLSL 450
Name 4 "main" Name 4 "main"
Name 8 "p" Name 11 "gl_PerVertex"
Name 9 "gl_PerVertex" MemberName 11(gl_PerVertex) 0 "gl_Position"
MemberName 9(gl_PerVertex) 0 "gl_PointSize" MemberName 11(gl_PerVertex) 1 "gl_PointSize"
Name 14 "gl_in" MemberName 11(gl_PerVertex) 2 "gl_ClipDistance"
Name 21 "gl_PerVertex" MemberName 11(gl_PerVertex) 3 "gl_CullDistance"
MemberName 21(gl_PerVertex) 0 "gl_PointSize" Name 13 ""
Name 23 "" Name 16 "gl_PerVertex"
MemberDecorate 9(gl_PerVertex) 0 BuiltIn PointSize MemberName 16(gl_PerVertex) 0 "gl_Position"
Decorate 9(gl_PerVertex) Block MemberName 16(gl_PerVertex) 1 "gl_PointSize"
MemberDecorate 21(gl_PerVertex) 0 BuiltIn PointSize MemberName 16(gl_PerVertex) 2 "gl_ClipDistance"
Decorate 21(gl_PerVertex) Block 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 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
7: TypePointer Function 6(float) 7: TypeVector 6(float) 4
9(gl_PerVertex): TypeStruct 6(float) 8: TypeInt 32 0
10: TypeInt 32 0 9: 8(int) Constant 1
11: 10(int) Constant 3 10: TypeArray 6(float) 9
12: TypeArray 9(gl_PerVertex) 11 11(gl_PerVertex): TypeStruct 7(fvec4) 6(float) 10 10
13: TypePointer Input 12 12: TypePointer Output 11(gl_PerVertex)
14(gl_in): 13(ptr) Variable Input 13: 12(ptr) Variable Output
15: TypeInt 32 1 14: TypeInt 32 1
16: 15(int) Constant 1 15: 14(int) Constant 1
17: 15(int) Constant 0 16(gl_PerVertex): TypeStruct 7(fvec4) 6(float) 10 10
18: TypePointer Input 6(float) 17: 8(int) Constant 3
21(gl_PerVertex): TypeStruct 6(float) 18: TypeArray 16(gl_PerVertex) 17
22: TypePointer Output 21(gl_PerVertex) 19: TypePointer Input 18
23: 22(ptr) Variable Output 20(gl_in): 19(ptr) Variable Input
21: TypePointer Input 6(float)
24: TypePointer Output 6(float)
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(p): 7(ptr) Variable Function 22: 21(ptr) AccessChain 20(gl_in) 15 15
19: 18(ptr) AccessChain 14(gl_in) 16 17 23: 6(float) Load 22
20: 6(float) Load 19 25: 24(ptr) AccessChain 13 15
Store 8(p) 20 Store 25 23
Return Return
FunctionEnd FunctionEnd
Test/spv.450.geom
...@@ -2,19 +2,11 @@ ...@@ -2,19 +2,11 @@
layout(triangles) in; layout(triangles) in;
in gl_PerVertex {
float gl_PointSize;
} gl_in[];
out gl_PerVertex {
float gl_PointSize;
};
layout(line_strip) out; layout(line_strip) out;
layout(max_vertices = 127) out; layout(max_vertices = 127) out;
layout(invocations = 4) in; layout(invocations = 4) in;
void main() void main()
{ {
float p = gl_in[1].gl_PointSize; gl_PointSize = gl_in[1].gl_PointSize;
} }
glslang/Include/revision.h
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // 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). // 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" #define GLSLANG_DATE "24-Mar-2017"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment