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

PP: Address #737: accept 'h'/'H' floating-point suffix more broadly.

Browse Source
This commit is contained in:
John Kessenich
2017-02-28 12:40:40 -07:00
parent f67f9d7e4d
commit b67b4a7072
8 changed files with 142 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
Test/baseResults/hlsl.numericsuffixes.frag.out
View File

@@ -50,16 +50,36 @@ gl_FragCoord origin is upper left
0:15 'r08' (temp uint)
0:15 Constant:
0:15 58 (const uint)
0:18 move second child to first child (temp 4-component vector of float)
0:18 color: direct index for structure (temp 4-component vector of float)
0:18 'ps_output' (temp structure{temp 4-component vector of float color})
0:16 Sequence
0:16 move second child to first child (temp float)
0:16 'r09' (temp float)
0:16 Constant:
0:16 1.000000
0:17 Sequence
0:17 move second child to first child (temp float)
0:17 'r10' (temp float)
0:17 Constant:
0:17 1.000000
0:18 Sequence
0:18 move second child to first child (temp float)
0:18 'r11' (temp float)
0:18 Constant:
0:18 0 (const int)
0:18 Construct vec4 (temp 4-component vector of float)
0:18 Convert int to float (temp float)
0:18 'r07' (temp int)
0:19 Branch: Return with expression
0:19 'ps_output' (temp structure{temp 4-component vector of float color})
0:18 1.100000
0:19 Sequence
0:19 move second child to first child (temp float)
0:19 'r12' (temp float)
0:19 Constant:
0:19 1.100000
0:22 move second child to first child (temp 4-component vector of float)
0:22 color: direct index for structure (temp 4-component vector of float)
0:22 'ps_output' (temp structure{temp 4-component vector of float color})
0:22 Constant:
0:22 0 (const int)
0:22 Construct vec4 (temp 4-component vector of float)
0:22 Convert int to float (temp float)
0:22 'r07' (temp int)
0:23 Branch: Return with expression
0:23 'ps_output' (temp structure{temp 4-component vector of float color})
0:5 Function Definition: main( (temp void)
0:5 Function Parameters:
0:? Sequence
@@ -128,16 +148,36 @@ gl_FragCoord origin is upper left
0:15 'r08' (temp uint)
0:15 Constant:
0:15 58 (const uint)
0:18 move second child to first child (temp 4-component vector of float)
0:18 color: direct index for structure (temp 4-component vector of float)
0:18 'ps_output' (temp structure{temp 4-component vector of float color})
0:16 Sequence
0:16 move second child to first child (temp float)
0:16 'r09' (temp float)
0:16 Constant:
0:16 1.000000
0:17 Sequence
0:17 move second child to first child (temp float)
0:17 'r10' (temp float)
0:17 Constant:
0:17 1.000000
0:18 Sequence
0:18 move second child to first child (temp float)
0:18 'r11' (temp float)
0:18 Constant:
0:18 0 (const int)
0:18 Construct vec4 (temp 4-component vector of float)
0:18 Convert int to float (temp float)
0:18 'r07' (temp int)
0:19 Branch: Return with expression
0:19 'ps_output' (temp structure{temp 4-component vector of float color})
0:18 1.100000
0:19 Sequence
0:19 move second child to first child (temp float)
0:19 'r12' (temp float)
0:19 Constant:
0:19 1.100000
0:22 move second child to first child (temp 4-component vector of float)
0:22 color: direct index for structure (temp 4-component vector of float)
0:22 'ps_output' (temp structure{temp 4-component vector of float color})
0:22 Constant:
0:22 0 (const int)
0:22 Construct vec4 (temp 4-component vector of float)
0:22 Convert int to float (temp float)
0:22 'r07' (temp int)
0:23 Branch: Return with expression
0:23 'ps_output' (temp structure{temp 4-component vector of float color})
0:5 Function Definition: main( (temp void)
0:5 Function Parameters:
0:? Sequence
@@ -153,12 +193,12 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 49
// Id's are bound by 54
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 46
EntryPoint Fragment 4 "main" 51
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "PS_OUTPUT"
@@ -173,9 +213,13 @@ gl_FragCoord origin is upper left
Name 28 "r06"
Name 30 "r07"
Name 32 "r08"
Name 35 "ps_output"
Name 46 "color"
Decorate 46(color) Location 0
Name 34 "r09"
Name 35 "r10"
Name 36 "r11"
Name 38 "r12"
Name 40 "ps_output"
Name 51 "color"
Decorate 51(color) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -195,16 +239,17 @@ gl_FragCoord origin is upper left
29: 24(int) Constant 6
31: 24(int) Constant 57
33: 15(int) Constant 58
34: TypePointer Function 8(PS_OUTPUT)
36: 24(int) Constant 0
40: TypePointer Function 7(fvec4)
45: TypePointer Output 7(fvec4)
46(color): 45(ptr) Variable Output
37: 6(float) Constant 1066192077
39: TypePointer Function 8(PS_OUTPUT)
41: 24(int) Constant 0
45: TypePointer Function 7(fvec4)
50: TypePointer Output 7(fvec4)
51(color): 50(ptr) Variable Output
4(main): 2 Function None 3
5: Label
47:8(PS_OUTPUT) FunctionCall 10(@main()
48: 7(fvec4) CompositeExtract 47 0
Store 46(color) 48
52:8(PS_OUTPUT) FunctionCall 10(@main()
53: 7(fvec4) CompositeExtract 52 0
Store 51(color) 53
Return
FunctionEnd
10(@main():8(PS_OUTPUT) Function None 9
@@ -218,7 +263,11 @@ gl_FragCoord origin is upper left
28(r06): 25(ptr) Variable Function
30(r07): 25(ptr) Variable Function
32(r08): 16(ptr) Variable Function
35(ps_output): 34(ptr) Variable Function
34(r09): 12(ptr) Variable Function
35(r10): 12(ptr) Variable Function
36(r11): 12(ptr) Variable Function
38(r12): 12(ptr) Variable Function
40(ps_output): 39(ptr) Variable Function
Store 13(r00) 14
Store 17(r01) 18
Store 19(r02) 20
@@ -228,11 +277,15 @@ gl_FragCoord origin is upper left
Store 28(r06) 29
Store 30(r07) 31
Store 32(r08) 33
37: 24(int) Load 30(r07)
38: 6(float) ConvertSToF 37
39: 7(fvec4) CompositeConstruct 38 38 38 38
41: 40(ptr) AccessChain 35(ps_output) 36
Store 41 39
42:8(PS_OUTPUT) Load 35(ps_output)
ReturnValue 42
Store 34(r09) 14
Store 35(r10) 14
Store 36(r11) 37
Store 38(r12) 37
42: 24(int) Load 30(r07)
43: 6(float) ConvertSToF 42
44: 7(fvec4) CompositeConstruct 43 43 43 43
46: 45(ptr) AccessChain 40(ps_output) 41
Store 46 44
47:8(PS_OUTPUT) Load 40(ps_output)
ReturnValue 47
FunctionEnd