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

HLSL: remove pervertex output blocks

Browse Source 
This removes pervertex output blocks, in favor of using only
loose variables.  The pervertex blocks are not required and were
only partly implemented, and were adding some complication.

This change goes with wrap-entry-point.
This commit is contained in:
steve-lunarg
2017-02-03 13:37:54 -07:00
committed by John Kessenich
parent fbb58a4e0b
commit 2c5ab9c8fc
11 changed files with 20 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Test/baseResults/hlsl.struct.split.nested.geom.out
View File

@@ -129,7 +129,6 @@ output primitive = triangle_strip
0:? 'ts' (temp structure{temp structure{temp 4-component vector of float pos, temp 2-component vector of float tc} psIn, temp structure{temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io})
0:? Linker Objects
0:? 'tin' (layout(location=0 ) in 3-element array of structure{temp 2-component vector of float tc})
0:? 'PerVertex_in' (in 3-element array of block{in 4-component vector of float Position tin_pos})
Linked geometry stage:
@@ -265,16 +264,15 @@ output primitive = triangle_strip
0:? 'ts' (temp structure{temp structure{temp 4-component vector of float pos, temp 2-component vector of float tc} psIn, temp structure{temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io})
0:? Linker Objects
0:? 'tin' (layout(location=0 ) in 3-element array of structure{temp 2-component vector of float tc})
0:? 'PerVertex_in' (in 3-element array of block{in 4-component vector of float Position tin_pos})
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 80
// Id's are bound by 76
Capability Geometry
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Geometry 4 "main" 45 53 79
EntryPoint Geometry 4 "main" 45 53
ExecutionMode 4 Triangles
ExecutionMode 4 Invocations 1
ExecutionMode 4 OutputTriangleStrip
@@ -304,13 +302,8 @@ output primitive = triangle_strip
Name 71 "ts"
Name 72 "param"
Name 74 "param"
Name 76 "PerVertex_in"
MemberName 76(PerVertex_in) 0 "tin_pos"
Name 79 "PerVertex_in"
Decorate 45(tin_pos) BuiltIn Position
Decorate 53(tin) Location 0
MemberDecorate 76(PerVertex_in) 0 BuiltIn Position
Decorate 76(PerVertex_in) Block
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -351,10 +344,6 @@ output primitive = triangle_strip
53(tin): 52(ptr) Variable Input
54: TypePointer Input 8(fvec2)
64: 17(int) Constant 2
76(PerVertex_in): TypeStruct 7(fvec4)
77: TypeArray 76(PerVertex_in) 11
78: TypePointer Input 77
79(PerVertex_in): 78(ptr) Variable Input
4(main): 2 Function None 3
5: Label
42(tin): 13(ptr) Variable Function