From 21e7e3212646013e46f7c9367c613b1d403677ed Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 29 Sep 2016 10:27:57 -0600 Subject: [PATCH] HLSL: Fix merge conflict. --- Test/baseResults/hlsl.array.implicit-size.frag.out | 277 ++++++++++----------- Test/hlsl.array.implicit-size.frag | 6 +- glslang/Include/revision.h | 4 +- 3 files changed, 143 insertions(+), 144 deletions(-) diff --git a/Test/baseResults/hlsl.array.implicit-size.frag.out b/Test/baseResults/hlsl.array.implicit-size.frag.out index 6345c89..d8e0ed8 100644 --- a/Test/baseResults/hlsl.array.implicit-size.frag.out +++ b/Test/baseResults/hlsl.array.implicit-size.frag.out @@ -2,7 +2,35 @@ hlsl.array.implicit-size.frag Shader version: 450 gl_FragCoord origin is upper left 0:? Sequence -0:26 Function Definition: main(struct-PS_OUTPUT-vf41; (global void) +0:3 Sequence +0:3 move second child to first child (temp 5-element array of float) +0:3 'g_array' (global 5-element array of float) +0:3 Constant: +0:3 1.000000 +0:3 2.000000 +0:3 3.000000 +0:3 4.000000 +0:3 5.000000 +0:6 Sequence +0:6 move second child to first child (temp 7-element array of float) +0:6 'g_array_unused' (global 7-element array of float) +0:6 Constant: +0:6 1.000000 +0:6 2.000000 +0:6 3.000000 +0:6 4.000000 +0:6 5.000000 +0:6 6.000000 +0:6 7.000000 +0:12 Sequence +0:12 move second child to first child (temp 2-element array of structure{temp int i, temp float f}) +0:12 'g_mystruct' (global 2-element array of structure{temp int i, temp float f}) +0:12 Constant: +0:12 1 (const int) +0:12 2.000000 +0:12 3 (const int) +0:12 4.000000 +0:26 Function Definition: main(struct-PS_OUTPUT-vf41; (temp void) 0:26 Function Parameters: 0:26 'ps_output' (out structure{temp 4-component vector of float color}) 0:? Sequence @@ -24,21 +52,11 @@ gl_FragCoord origin is upper left 0:30 add (temp float) 0:30 add (temp float) 0:30 direct index (temp float) -0:30 'g_array' (uniform 5-element array of float) -0:30 1.000000 -0:30 2.000000 -0:30 3.000000 -0:30 4.000000 -0:30 5.000000 +0:30 'g_array' (global 5-element array of float) 0:30 Constant: 0:30 0 (const int) 0:30 direct index (temp float) -0:30 'g_array' (uniform 5-element array of float) -0:30 1.000000 -0:30 2.000000 -0:30 3.000000 -0:30 4.000000 -0:30 5.000000 +0:30 'g_array' (global 5-element array of float) 0:30 Constant: 0:30 4 (const int) 0:30 direct index (temp float) @@ -47,43 +65,18 @@ gl_FragCoord origin is upper left 0:30 1 (const int) 0:30 f: direct index for structure (temp float) 0:30 direct index (temp structure{temp int i, temp float f}) -0:30 'g_mystruct' (uniform 2-element array of structure{temp int i, temp float f}) -0:30 1 (const int) -0:30 2.000000 -0:30 3 (const int) -0:30 4.000000 +0:30 'g_mystruct' (global 2-element array of structure{temp int i, temp float f}) 0:30 Constant: 0:30 0 (const int) 0:30 Constant: 0:30 1 (const int) 0:30 indirect index (temp float) -0:30 'g_array' (uniform 5-element array of float) -0:30 1.000000 -0:30 2.000000 -0:30 3.000000 -0:30 4.000000 -0:30 5.000000 +0:30 'g_array' (global 5-element array of float) 0:30 'idx' (temp void) 0:? Linker Objects -0:? 'g_array' (uniform 5-element array of float) -0:? 1.000000 -0:? 2.000000 -0:? 3.000000 -0:? 4.000000 -0:? 5.000000 -0:? 'g_array_unused' (uniform 7-element array of float) -0:? 1.000000 -0:? 2.000000 -0:? 3.000000 -0:? 4.000000 -0:? 5.000000 -0:? 6.000000 -0:? 7.000000 -0:? 'g_mystruct' (uniform 2-element array of structure{temp int i, temp float f}) -0:? 1 (const int) -0:? 2.000000 -0:? 3 (const int) -0:? 4.000000 +0:? 'g_array' (global 5-element array of float) +0:? 'g_array_unused' (global 7-element array of float) +0:? 'g_mystruct' (global 2-element array of structure{temp int i, temp float f}) Linked fragment stage: @@ -92,7 +85,35 @@ Linked fragment stage: Shader version: 450 gl_FragCoord origin is upper left 0:? Sequence -0:26 Function Definition: main(struct-PS_OUTPUT-vf41; (global void) +0:3 Sequence +0:3 move second child to first child (temp 5-element array of float) +0:3 'g_array' (global 5-element array of float) +0:3 Constant: +0:3 1.000000 +0:3 2.000000 +0:3 3.000000 +0:3 4.000000 +0:3 5.000000 +0:6 Sequence +0:6 move second child to first child (temp 7-element array of float) +0:6 'g_array_unused' (global 7-element array of float) +0:6 Constant: +0:6 1.000000 +0:6 2.000000 +0:6 3.000000 +0:6 4.000000 +0:6 5.000000 +0:6 6.000000 +0:6 7.000000 +0:12 Sequence +0:12 move second child to first child (temp 2-element array of structure{temp int i, temp float f}) +0:12 'g_mystruct' (global 2-element array of structure{temp int i, temp float f}) +0:12 Constant: +0:12 1 (const int) +0:12 2.000000 +0:12 3 (const int) +0:12 4.000000 +0:26 Function Definition: main(struct-PS_OUTPUT-vf41; (temp void) 0:26 Function Parameters: 0:26 'ps_output' (out structure{temp 4-component vector of float color}) 0:? Sequence @@ -114,21 +135,11 @@ gl_FragCoord origin is upper left 0:30 add (temp float) 0:30 add (temp float) 0:30 direct index (temp float) -0:30 'g_array' (uniform 5-element array of float) -0:30 1.000000 -0:30 2.000000 -0:30 3.000000 -0:30 4.000000 -0:30 5.000000 +0:30 'g_array' (global 5-element array of float) 0:30 Constant: 0:30 0 (const int) 0:30 direct index (temp float) -0:30 'g_array' (uniform 5-element array of float) -0:30 1.000000 -0:30 2.000000 -0:30 3.000000 -0:30 4.000000 -0:30 5.000000 +0:30 'g_array' (global 5-element array of float) 0:30 Constant: 0:30 4 (const int) 0:30 direct index (temp float) @@ -137,47 +148,22 @@ gl_FragCoord origin is upper left 0:30 1 (const int) 0:30 f: direct index for structure (temp float) 0:30 direct index (temp structure{temp int i, temp float f}) -0:30 'g_mystruct' (uniform 2-element array of structure{temp int i, temp float f}) -0:30 1 (const int) -0:30 2.000000 -0:30 3 (const int) -0:30 4.000000 +0:30 'g_mystruct' (global 2-element array of structure{temp int i, temp float f}) 0:30 Constant: 0:30 0 (const int) 0:30 Constant: 0:30 1 (const int) 0:30 indirect index (temp float) -0:30 'g_array' (uniform 5-element array of float) -0:30 1.000000 -0:30 2.000000 -0:30 3.000000 -0:30 4.000000 -0:30 5.000000 +0:30 'g_array' (global 5-element array of float) 0:30 'idx' (temp void) 0:? Linker Objects -0:? 'g_array' (uniform 5-element array of float) -0:? 1.000000 -0:? 2.000000 -0:? 3.000000 -0:? 4.000000 -0:? 5.000000 -0:? 'g_array_unused' (uniform 7-element array of float) -0:? 1.000000 -0:? 2.000000 -0:? 3.000000 -0:? 4.000000 -0:? 5.000000 -0:? 6.000000 -0:? 7.000000 -0:? 'g_mystruct' (uniform 2-element array of structure{temp int i, temp float f}) -0:? 1 (const int) -0:? 2.000000 -0:? 3 (const int) -0:? 4.000000 +0:? 'g_array' (global 5-element array of float) +0:? 'g_array_unused' (global 7-element array of float) +0:? 'g_mystruct' (global 2-element array of structure{temp int i, temp float f}) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 62 +// Id's are bound by 72 Capability Shader 1: ExtInstImport "GLSL.std.450" @@ -189,14 +175,14 @@ gl_FragCoord origin is upper left MemberName 8(PS_OUTPUT) 0 "color" Name 12 "main(struct-PS_OUTPUT-vf41;" Name 11 "ps_output" - Name 18 "l_array" - Name 28 "g_array" - Name 41 "mystruct" - MemberName 41(mystruct) 0 "i" - MemberName 41(mystruct) 1 "f" - Name 45 "g_mystruct" - Name 50 "idx" - Name 61 "g_array_unused" + Name 18 "g_array" + Name 28 "g_array_unused" + Name 33 "mystruct" + MemberName 33(mystruct) 0 "i" + MemberName 33(mystruct) 1 "f" + Name 37 "g_mystruct" + Name 46 "l_array" + Name 64 "idx" 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -205,60 +191,73 @@ gl_FragCoord origin is upper left 9: TypePointer Function 8(PS_OUTPUT) 10: TypeFunction 2 9(ptr) 14: TypeInt 32 0 - 15: 14(int) Constant 3 + 15: 14(int) Constant 5 16: TypeArray 6(float) 15 - 17: TypePointer Function 16 + 17: TypePointer Private 16 + 18(g_array): 17(ptr) Variable Private 19: 6(float) Constant 1065353216 20: 6(float) Constant 1073741824 21: 6(float) Constant 1077936128 - 22: 16 ConstantComposite 19 20 21 - 23: TypeInt 32 1 - 24: 23(int) Constant 0 - 25: 14(int) Constant 5 + 22: 6(float) Constant 1082130432 + 23: 6(float) Constant 1084227584 + 24: 16 ConstantComposite 19 20 21 22 23 + 25: 14(int) Constant 7 26: TypeArray 6(float) 25 - 27: TypePointer UniformConstant 26 - 28(g_array): 27(ptr) Variable UniformConstant - 29: TypePointer UniformConstant 6(float) - 32: 23(int) Constant 4 - 36: 23(int) Constant 1 - 37: TypePointer Function 6(float) - 41(mystruct): TypeStruct 23(int) 6(float) - 42: 14(int) Constant 2 - 43: TypeArray 41(mystruct) 42 - 44: TypePointer UniformConstant 43 - 45(g_mystruct): 44(ptr) Variable UniformConstant - 49: TypePointer Function 2 - 56: TypePointer Function 7(fvec4) - 58: 14(int) Constant 7 - 59: TypeArray 6(float) 58 - 60: TypePointer UniformConstant 59 -61(g_array_unused): 60(ptr) Variable UniformConstant + 27: TypePointer Private 26 +28(g_array_unused): 27(ptr) Variable Private + 29: 6(float) Constant 1086324736 + 30: 6(float) Constant 1088421888 + 31: 26 ConstantComposite 19 20 21 22 23 29 30 + 32: TypeInt 32 1 + 33(mystruct): TypeStruct 32(int) 6(float) + 34: 14(int) Constant 2 + 35: TypeArray 33(mystruct) 34 + 36: TypePointer Private 35 + 37(g_mystruct): 36(ptr) Variable Private + 38: 32(int) Constant 1 + 39:33(mystruct) ConstantComposite 38 20 + 40: 32(int) Constant 3 + 41:33(mystruct) ConstantComposite 40 22 + 42: 35 ConstantComposite 39 41 + 43: 14(int) Constant 3 + 44: TypeArray 6(float) 43 + 45: TypePointer Function 44 + 47: 44 ConstantComposite 19 20 21 + 48: 32(int) Constant 0 + 49: TypePointer Private 6(float) + 52: 32(int) Constant 4 + 56: TypePointer Function 6(float) + 63: TypePointer Function 2 + 70: TypePointer Function 7(fvec4) 4(PixelShaderFunction): 2 Function None 3 5: Label + Store 18(g_array) 24 + Store 28(g_array_unused) 31 + Store 37(g_mystruct) 42 FunctionEnd 12(main(struct-PS_OUTPUT-vf41;): 2 Function None 10 11(ps_output): 9(ptr) FunctionParameter 13: Label - 18(l_array): 17(ptr) Variable Function - 50(idx): 49(ptr) Variable Function - Store 18(l_array) 22 - 30: 29(ptr) AccessChain 28(g_array) 24 - 31: 6(float) Load 30 - 33: 29(ptr) AccessChain 28(g_array) 32 - 34: 6(float) Load 33 - 35: 6(float) FAdd 31 34 - 38: 37(ptr) AccessChain 18(l_array) 36 - 39: 6(float) Load 38 - 40: 6(float) FAdd 35 39 - 46: 29(ptr) AccessChain 45(g_mystruct) 24 36 - 47: 6(float) Load 46 - 48: 6(float) FAdd 40 47 - 51: 2 Load 50(idx) - 52: 29(ptr) AccessChain 28(g_array) 51 - 53: 6(float) Load 52 - 54: 6(float) FAdd 48 53 - 55: 7(fvec4) CompositeConstruct 54 54 54 54 - 57: 56(ptr) AccessChain 11(ps_output) 24 - Store 57 55 + 46(l_array): 45(ptr) Variable Function + 64(idx): 63(ptr) Variable Function + Store 46(l_array) 47 + 50: 49(ptr) AccessChain 18(g_array) 48 + 51: 6(float) Load 50 + 53: 49(ptr) AccessChain 18(g_array) 52 + 54: 6(float) Load 53 + 55: 6(float) FAdd 51 54 + 57: 56(ptr) AccessChain 46(l_array) 38 + 58: 6(float) Load 57 + 59: 6(float) FAdd 55 58 + 60: 49(ptr) AccessChain 37(g_mystruct) 48 38 + 61: 6(float) Load 60 + 62: 6(float) FAdd 59 61 + 65: 2 Load 64(idx) + 66: 49(ptr) AccessChain 18(g_array) 65 + 67: 6(float) Load 66 + 68: 6(float) FAdd 62 67 + 69: 7(fvec4) CompositeConstruct 68 68 68 68 + 71: 70(ptr) AccessChain 11(ps_output) 48 + Store 71 69 Return FunctionEnd diff --git a/Test/hlsl.array.implicit-size.frag b/Test/hlsl.array.implicit-size.frag index 11f93b5..29e2c1b 100644 --- a/Test/hlsl.array.implicit-size.frag +++ b/Test/hlsl.array.implicit-size.frag @@ -1,12 +1,12 @@ // implicit sized array -uniform float g_array [ ] = { 1, 2, 3, 4, 5 }; +static float g_array [ ] = { 1, 2, 3, 4, 5 }; // Unused implicit sized array -uniform float g_array_unused [ ] = { 1, 2, 3, 4, 5, 6, 7 }; +static float g_array_unused [ ] = { 1, 2, 3, 4, 5, 6, 7 }; // Test implicit size arrayed structs -uniform struct mystruct { +static struct mystruct { int i; float f; } g_mystruct[] = { diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 7c9a47a..2400255 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.1525" -#define GLSLANG_DATE "27-Sep-2016" +#define GLSLANG_REVISION "Overload400-PrecQual.1527" +#define GLSLANG_DATE "29-Sep-2016" -- 2.7.4