Updated GLSL and SPIR-V shaders (added gl_PerVertex redeclaration to vertex shaders).

This commit is contained in:
plapins
2016-06-16 10:35:43 +02:00
parent 482e337fad
commit 77c5c16467
12 changed files with 113 additions and 121 deletions

View File

@@ -1,4 +1,4 @@
shader.frag
Tutorial03/Data03/shader.frag
Warning, version 400 is not yet complete; most version-specific features are present, but some are missing.

View File

@@ -8,7 +8,12 @@
// Intel does not assume any responsibility for any errors which may appear in this software
// nor any responsibility to update it.
#version 400
#version 450
out gl_PerVertex
{
vec4 gl_Position;
};
void main() {
vec2 pos[3] = vec2[3]( vec2(-0.7, 0.7), vec2(0.7, 0.7), vec2(0.0, -0.7) );

Binary file not shown.

View File

@@ -1,5 +1,5 @@
shader.vert
Warning, version 400 is not yet complete; most version-specific features are present, but some are missing.
Tutorial03/Data03/shader.vert
Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
Linked vertex stage:
@@ -7,27 +7,22 @@ Linked vertex stage:
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 40
// Id's are bound by 38
Capability Shader
Capability ClipDistance
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 25 29
Source GLSL 400
EntryPoint Vertex 4 "main" 23 27
Source GLSL 450
Name 4 "main"
Name 12 "pos"
Name 23 "gl_PerVertex"
MemberName 23(gl_PerVertex) 0 "gl_Position"
MemberName 23(gl_PerVertex) 1 "gl_PointSize"
MemberName 23(gl_PerVertex) 2 "gl_ClipDistance"
Name 25 ""
Name 29 "gl_VertexIndex"
MemberDecorate 23(gl_PerVertex) 0 BuiltIn Position
MemberDecorate 23(gl_PerVertex) 1 BuiltIn PointSize
MemberDecorate 23(gl_PerVertex) 2 BuiltIn ClipDistance
Decorate 23(gl_PerVertex) Block
Decorate 29(gl_VertexIndex) BuiltIn VertexIndex
Name 21 "gl_PerVertex"
MemberName 21(gl_PerVertex) 0 "gl_Position"
Name 23 ""
Name 27 "gl_VertexIndex"
MemberDecorate 21(gl_PerVertex) 0 BuiltIn Position
Decorate 21(gl_PerVertex) Block
Decorate 27(gl_VertexIndex) BuiltIn VertexIndex
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -44,29 +39,27 @@ Linked vertex stage:
18: 7(fvec2) ConstantComposite 17 13
19: 10 ConstantComposite 15 16 18
20: TypeVector 6(float) 4
21: 8(int) Constant 1
22: TypeArray 6(float) 21
23(gl_PerVertex): TypeStruct 20(fvec4) 6(float) 22
24: TypePointer Output 23(gl_PerVertex)
25: 24(ptr) Variable Output
26: TypeInt 32 1
27: 26(int) Constant 0
28: TypePointer Input 26(int)
29(gl_VertexIndex): 28(ptr) Variable Input
31: TypePointer Function 7(fvec2)
34: 6(float) Constant 1065353216
38: TypePointer Output 20(fvec4)
21(gl_PerVertex): TypeStruct 20(fvec4)
22: TypePointer Output 21(gl_PerVertex)
23: 22(ptr) Variable Output
24: TypeInt 32 1
25: 24(int) Constant 0
26: TypePointer Input 24(int)
27(gl_VertexIndex): 26(ptr) Variable Input
29: TypePointer Function 7(fvec2)
32: 6(float) Constant 1065353216
36: TypePointer Output 20(fvec4)
4(main): 2 Function None 3
5: Label
12(pos): 11(ptr) Variable Function
Store 12(pos) 19
30: 26(int) Load 29(gl_VertexIndex)
32: 31(ptr) AccessChain 12(pos) 30
33: 7(fvec2) Load 32
35: 6(float) CompositeExtract 33 0
36: 6(float) CompositeExtract 33 1
37: 20(fvec4) CompositeConstruct 35 36 17 34
39: 38(ptr) AccessChain 25 27
Store 39 37
28: 24(int) Load 27(gl_VertexIndex)
30: 29(ptr) AccessChain 12(pos) 28
31: 7(fvec2) Load 30
33: 6(float) CompositeExtract 31 0
34: 6(float) CompositeExtract 31 1
35: 20(fvec4) CompositeConstruct 33 34 17 32
37: 36(ptr) AccessChain 23 25
Store 37 35
Return
FunctionEnd