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

HLSL: Support empty {} initializers for arrays and scalars.

Browse Source
This commit is contained in:
John Kessenich 2016-12-30 15:59:28 -07:00
parent 807a0d9e2f
commit 53864846a9
4 changed files with 185 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
Test/baseResults/hlsl.partialInit.frag.out
View File

@ -109,32 +109,64 @@ gl_FragCoord origin is upper left
0:26 0.000000 0:26 0.000000
0:26 false (const bool) 0:26 false (const bool)
0:28 Sequence 0:28 Sequence
0:28 Sequence 0:28 move second child to first child (temp 4-element array of 2-component vector of float)
0:28 move second child to first child (temp int) 0:28 'gf2a' (temp 4-element array of 2-component vector of float)
0:28 Constant:
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:29 Sequence
0:29 move second child to first child (temp int)
0:29 'cgi' (temp int)
0:29 Constant:
0:29 0 (const int)
0:30 move second child to first child (temp float)
0:30 b: direct index for structure (temp float)
0:30 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:30 Constant:
0:30 1 (const int)
0:30 component-wise multiply (temp float)
0:30 direct index (temp float)
0:30 direct index (temp 2-component vector of float)
0:30 'gf2a' (temp 4-element array of 2-component vector of float)
0:30 Constant:
0:30 2 (const int)
0:30 Constant:
0:30 1 (const int)
0:30 Convert int to float (temp float)
0:30 'cgi' (temp int)
0:32 Sequence
0:32 Sequence
0:32 move second child to first child (temp int)
0:? 'a' (layout(location=0 ) out int) 0:? 'a' (layout(location=0 ) out int)
0:28 a: direct index for structure (temp int) 0:32 a: direct index for structure (temp int)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 0 (const int) 0:32 0 (const int)
0:28 move second child to first child (temp float) 0:32 move second child to first child (temp float)
0:? 'b' (layout(location=1 ) out float) 0:? 'b' (layout(location=1 ) out float)
0:28 b: direct index for structure (temp float) 0:32 b: direct index for structure (temp float)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 1 (const int) 0:32 1 (const int)
0:28 move second child to first child (temp bool) 0:32 move second child to first child (temp bool)
0:? 'c' (layout(location=2 ) out bool) 0:? 'c' (layout(location=2 ) out bool)
0:28 c: direct index for structure (temp bool) 0:32 c: direct index for structure (temp bool)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 2 (const int) 0:32 2 (const int)
0:28 move second child to first child (temp 4-component vector of float) 0:32 move second child to first child (temp 4-component vector of float)
0:? 'v' (layout(location=3 ) out 4-component vector of float) 0:? 'v' (layout(location=3 ) out 4-component vector of float)
0:28 v: direct index for structure (temp 4-component vector of float) 0:32 v: direct index for structure (temp 4-component vector of float)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 3 (const int) 0:32 3 (const int)
0:28 Branch: Return 0:32 Branch: Return
0:? Linker Objects 0:? Linker Objects
0:? 'a' (layout(location=0 ) out int) 0:? 'a' (layout(location=0 ) out int)
0:? 'b' (layout(location=1 ) out float) 0:? 'b' (layout(location=1 ) out float)
@ -258,32 +290,64 @@ gl_FragCoord origin is upper left
0:26 0.000000 0:26 0.000000
0:26 false (const bool) 0:26 false (const bool)
0:28 Sequence 0:28 Sequence
0:28 Sequence 0:28 move second child to first child (temp 4-element array of 2-component vector of float)
0:28 move second child to first child (temp int) 0:28 'gf2a' (temp 4-element array of 2-component vector of float)
0:28 Constant:
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:28 0.000000
0:29 Sequence
0:29 move second child to first child (temp int)
0:29 'cgi' (temp int)
0:29 Constant:
0:29 0 (const int)
0:30 move second child to first child (temp float)
0:30 b: direct index for structure (temp float)
0:30 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:30 Constant:
0:30 1 (const int)
0:30 component-wise multiply (temp float)
0:30 direct index (temp float)
0:30 direct index (temp 2-component vector of float)
0:30 'gf2a' (temp 4-element array of 2-component vector of float)
0:30 Constant:
0:30 2 (const int)
0:30 Constant:
0:30 1 (const int)
0:30 Convert int to float (temp float)
0:30 'cgi' (temp int)
0:32 Sequence
0:32 Sequence
0:32 move second child to first child (temp int)
0:? 'a' (layout(location=0 ) out int) 0:? 'a' (layout(location=0 ) out int)
0:28 a: direct index for structure (temp int) 0:32 a: direct index for structure (temp int)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 0 (const int) 0:32 0 (const int)
0:28 move second child to first child (temp float) 0:32 move second child to first child (temp float)
0:? 'b' (layout(location=1 ) out float) 0:? 'b' (layout(location=1 ) out float)
0:28 b: direct index for structure (temp float) 0:32 b: direct index for structure (temp float)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 1 (const int) 0:32 1 (const int)
0:28 move second child to first child (temp bool) 0:32 move second child to first child (temp bool)
0:? 'c' (layout(location=2 ) out bool) 0:? 'c' (layout(location=2 ) out bool)
0:28 c: direct index for structure (temp bool) 0:32 c: direct index for structure (temp bool)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 2 (const int) 0:32 2 (const int)
0:28 move second child to first child (temp 4-component vector of float) 0:32 move second child to first child (temp 4-component vector of float)
0:? 'v' (layout(location=3 ) out 4-component vector of float) 0:? 'v' (layout(location=3 ) out 4-component vector of float)
0:28 v: direct index for structure (temp 4-component vector of float) 0:32 v: direct index for structure (temp 4-component vector of float)
0:28 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:32 'o4' (temp structure{temp int a, temp float b, temp bool c, temp 4-component vector of float v})
0:28 Constant: 0:32 Constant:
0:28 3 (const int) 0:32 3 (const int)
0:28 Branch: Return 0:32 Branch: Return
0:? Linker Objects 0:? Linker Objects
0:? 'a' (layout(location=0 ) out int) 0:? 'a' (layout(location=0 ) out int)
0:? 'b' (layout(location=1 ) out float) 0:? 'b' (layout(location=1 ) out float)
@ -295,12 +359,12 @@ gl_FragCoord origin is upper left
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 75 // Id's are bound by 90
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction" 54 59 65 69 74 EntryPoint Fragment 4 "PixelShaderFunction" 72 76 80 84 89
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "PixelShaderFunction" Name 4 "PixelShaderFunction"
Name 9 "gv" Name 9 "gv"
@ -319,16 +383,18 @@ gl_FragCoord origin is upper left
MemberName 47(Nest) 1 "os" MemberName 47(Nest) 1 "os"
MemberName 47(Nest) 2 "b" MemberName 47(Nest) 2 "b"
Name 49 "nest" Name 49 "nest"
Name 54 "a" Name 57 "gf2a"
Name 59 "b" Name 61 "cgi"
Name 65 "c" Name 72 "a"
Name 69 "v" Name 76 "b"
Name 74 "input" Name 80 "c"
Decorate 54(a) Location 0 Name 84 "v"
Decorate 59(b) Location 1 Name 89 "input"
Decorate 65(c) Location 2 Decorate 72(a) Location 0
Decorate 69(v) Location 3 Decorate 76(b) Location 1
Decorate 74(input) Location 0 Decorate 80(c) Location 2
Decorate 84(v) Location 3
Decorate 89(input) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
@ -365,19 +431,26 @@ gl_FragCoord origin is upper left
50: 45(fvec3) ConstantComposite 10 10 10 50: 45(fvec3) ConstantComposite 10 10 10
51: 46 ConstantComposite 50 50 50 50 51: 46 ConstantComposite 50 50 50 50
52: 47(Nest) ConstantComposite 51 39 25 52: 47(Nest) ConstantComposite 51 39 25
53: TypePointer Output 19(int) 53: TypeVector 6(float) 2
54(a): 53(ptr) Variable Output 54: 13(int) Constant 4
55: TypePointer Function 19(int) 55: TypeArray 53(fvec2) 54
58: TypePointer Output 6(float) 56: TypePointer Function 55
59(b): 58(ptr) Variable Output 58: 53(fvec2) ConstantComposite 10 10
60: 19(int) Constant 1 59: 55 ConstantComposite 58 58 58 58
61: TypePointer Function 6(float) 60: TypePointer Function 19(int)
64: TypePointer Output 20(bool) 62: 19(int) Constant 1
65(c): 64(ptr) Variable Output 63: 13(int) Constant 1
68: TypePointer Output 7(fvec4) 64: TypePointer Function 6(float)
69(v): 68(ptr) Variable Output 71: TypePointer Output 19(int)
73: TypePointer Input 7(fvec4) 72(a): 71(ptr) Variable Output
74(input): 73(ptr) Variable Input 75: TypePointer Output 6(float)
76(b): 75(ptr) Variable Output
79: TypePointer Output 20(bool)
80(c): 79(ptr) Variable Output
83: TypePointer Output 7(fvec4)
84(v): 83(ptr) Variable Output
88: TypePointer Input 7(fvec4)
89(input): 88(ptr) Variable Input
4(PixelShaderFunction): 2 Function None 3 4(PixelShaderFunction): 2 Function None 3
5: Label 5: Label
23(o2): 22(ptr) Variable Function 23(o2): 22(ptr) Variable Function
@ -385,6 +458,8 @@ gl_FragCoord origin is upper left
37(o1): 22(ptr) Variable Function 37(o1): 22(ptr) Variable Function
40(o3): 22(ptr) Variable Function 40(o3): 22(ptr) Variable Function
49(nest): 48(ptr) Variable Function 49(nest): 48(ptr) Variable Function
57(gf2a): 56(ptr) Variable Function
61(cgi): 60(ptr) Variable Function
Store 9(gv) 12 Store 9(gv) 12
Store 17(gfa) 18 Store 17(gfa) 18
Store 23(o2) 27 Store 23(o2) 27
@ -402,17 +477,26 @@ gl_FragCoord origin is upper left
44: 41(ptr) AccessChain 28(o4) 30 44: 41(ptr) AccessChain 28(o4) 30
Store 44 43 Store 44 43
Store 49(nest) 52 Store 49(nest) 52
56: 55(ptr) AccessChain 28(o4) 38 Store 57(gf2a) 59
57: 19(int) Load 56 Store 61(cgi) 38
Store 54(a) 57 65: 64(ptr) AccessChain 57(gf2a) 30 63
62: 61(ptr) AccessChain 28(o4) 60 66: 6(float) Load 65
63: 6(float) Load 62 67: 19(int) Load 61(cgi)
Store 59(b) 63 68: 6(float) ConvertSToF 67
66: 41(ptr) AccessChain 28(o4) 30 69: 6(float) FMul 66 68
67: 20(bool) Load 66 70: 64(ptr) AccessChain 28(o4) 62
Store 65(c) 67 Store 70 69
70: 35(ptr) AccessChain 28(o4) 24 73: 60(ptr) AccessChain 28(o4) 38
71: 7(fvec4) Load 70 74: 19(int) Load 73
Store 69(v) 71 Store 72(a) 74
77: 64(ptr) AccessChain 28(o4) 62
78: 6(float) Load 77
Store 76(b) 78
81: 41(ptr) AccessChain 28(o4) 30
82: 20(bool) Load 81
Store 80(c) 82
85: 35(ptr) AccessChain 28(o4) 24
86: 7(fvec4) Load 85
Store 84(v) 86
Return Return
FunctionEnd FunctionEnd

4
Test/hlsl.partialInit.frag
View File

@ -25,5 +25,9 @@ outs PixelShaderFunction(float4 input) : COLOR0
o4.c = o1.c; o4.c = o1.c;
Nest nest = (Nest)0; Nest nest = (Nest)0;
float2 gf2a[4] = { };
int cgi = { };
o4.b = gf2a[2].y * cgi;
return o4; return o4;
} }

4
glslang/Include/revision.h
View File

@ -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.1721" #define GLSLANG_REVISION "Overload400-PrecQual.1725"
#define GLSLANG_DATE "21-Dec-2016" #define GLSLANG_DATE "30-Dec-2016"

9
hlsl/hlslParseHelper.cpp
View File

@ -4960,14 +4960,18 @@ TIntermTyped* HlslParseContext::convertInitializerList(const TSourceLoc& loc, co
// edit array sizes to fill in unsized dimensions // edit array sizes to fill in unsized dimensions
if (type.isImplicitlySizedArray()) if (type.isImplicitlySizedArray())
arrayType.changeOuterArraySize((int)initList->getSequence().size()); arrayType.changeOuterArraySize((int)initList->getSequence().size());
// set unsized array dimensions that can be derived from the initializer's first element
if (arrayType.isArrayOfArrays() && initList->getSequence().size() > 0) {
TIntermTyped* firstInit = initList->getSequence()[0]->getAsTyped(); TIntermTyped* firstInit = initList->getSequence()[0]->getAsTyped();
if (arrayType.isArrayOfArrays() && firstInit->getType().isArray() && if (firstInit->getType().isArray() &&
arrayType.getArraySizes().getNumDims() == firstInit->getType().getArraySizes()->getNumDims() + 1) { arrayType.getArraySizes().getNumDims() == firstInit->getType().getArraySizes()->getNumDims() + 1) {
for (int d = 1; d < arrayType.getArraySizes().getNumDims(); ++d) { for (int d = 1; d < arrayType.getArraySizes().getNumDims(); ++d) {
if (arrayType.getArraySizes().getDimSize(d) == UnsizedArraySize) if (arrayType.getArraySizes().getDimSize(d) == UnsizedArraySize)
arrayType.getArraySizes().setDimSize(d, firstInit->getType().getArraySizes()->getDimSize(d - 1)); arrayType.getArraySizes().setDimSize(d, firstInit->getType().getArraySizes()->getDimSize(d - 1));
} }
} }
}
// lengthen list to be long enough // lengthen list to be long enough
lengthenList(loc, initList->getSequence(), arrayType.getOuterArraySize()); lengthenList(loc, initList->getSequence(), arrayType.getOuterArraySize());
@ -5024,6 +5028,9 @@ TIntermTyped* HlslParseContext::convertInitializerList(const TSourceLoc& loc, co
return nullptr; return nullptr;
} }
} else if (type.isScalar()) { } else if (type.isScalar()) {
// lengthen list to be long enough
lengthenList(loc, initList->getSequence(), 1);
if ((int)initList->getSequence().size() != 1) { if ((int)initList->getSequence().size() != 1) {
error(loc, "scalar expected one element:", "initializer list", type.getCompleteString().c_str()); error(loc, "scalar expected one element:", "initializer list", type.getCompleteString().c_str());
return nullptr; return nullptr;