Skip to content

G
glslang
Commit 7497e7c9 by John Kessenich Committed by GitHub
Options

Merge pull request #1010 from LoopDawg/mat-rowcol-fix-1

HLSL: fix qualifier propagation from user struct types to block defin…
parents 2b4f77f2 898f5fbe
Showing with 43 additions and 25 deletions
Test/baseResults/hlsl.structIoFourWay.frag.out
......@@ -68,7 +68,7 @@ using depth_greater
0:15 3 (const int)
0:? Linker Objects
0:? 'anon@0' (layout( row_major std140) uniform block{ uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} s})
0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal} t})
0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} t})
0:? 'f' (layout( location=0) out float)
0:? 'g' (layout( location=1) out float)
0:? 'd' ( out float FragDepth)
......@@ -151,7 +151,7 @@ using depth_greater
0:15 3 (const int)
0:? Linker Objects
0:? 'anon@0' (layout( row_major std140) uniform block{ uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} s})
0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal} t})
0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} t})
0:? 'f' (layout( location=0) out float)
0:? 'g' (layout( location=1) out float)
0:? 'd' ( out float FragDepth)
......@@ -163,7 +163,7 @@ using depth_greater
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 66
// Id's are bound by 65
Capability Shader
1: ExtInstImport "GLSL.std.450"
......@@ -200,14 +200,9 @@ using depth_greater
Name 59 "$Global"
MemberName 59($Global) 0 "s"
Name 61 ""
Name 62 "T"
MemberName 62(T) 0 "f"
MemberName 62(T) 1 "g"
MemberName 62(T) 2 "d"
MemberName 62(T) 3 "normal"
Name 63 "buff"
MemberName 63(buff) 0 "t"
Name 65 ""
Name 62 "buff"
MemberName 62(buff) 0 "t"
Name 64 ""
Decorate 22(f) Location 0
Decorate 27(g) Centroid
Decorate 27(g) Location 1
......@@ -224,13 +219,9 @@ using depth_greater
MemberDecorate 59($Global) 0 Offset 0
Decorate 59($Global) Block
Decorate 61 DescriptorSet 0
MemberDecorate 62(T) 0 Offset 0
MemberDecorate 62(T) 1 Offset 4
MemberDecorate 62(T) 2 Offset 8
MemberDecorate 62(T) 3 Offset 16
MemberDecorate 63(buff) 0 Offset 96
Decorate 63(buff) Block
Decorate 65 DescriptorSet 0
MemberDecorate 62(buff) 0 Offset 96
Decorate 62(buff) Block
Decorate 64 DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
......@@ -261,10 +252,9 @@ using depth_greater
59($Global): TypeStruct 58(T)
60: TypePointer Uniform 59($Global)
61: 60(ptr) Variable Uniform
62(T): TypeStruct 6(float) 6(float) 6(float) 7(fvec4)
63(buff): TypeStruct 62(T)
64: TypePointer Uniform 63(buff)
65: 64(ptr) Variable Uniform
62(buff): TypeStruct 58(T)
63: TypePointer Uniform 62(buff)
64: 63(ptr) Variable Uniform
4(main): 2 Function None 3
5: Label
18(t): 9(ptr) Variable Function
......
Test/hlsl.matpack-1.frag 0 → 100644
struct MyBuffer1
{
column_major float4x4 mat1;
row_major float4x4 mat2;
float4 vec1;
float foo;
};
struct MyBuffer2
{
row_major float4x4 mat1;
float4 vec1;
};
cbuffer Example
{
MyBuffer1 g_MyBuffer1;
MyBuffer2 g_MyBuffer2;
column_major float4x4 mat1a;
};
float4 main() : SV_Target0
{
return mul(g_MyBuffer1.mat1, g_MyBuffer1.vec1) +
mul(g_MyBuffer2.mat1, g_MyBuffer2.vec1);
}
gtests/Hlsl.FromFile.cpp
......@@ -201,6 +201,7 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.namespace.frag", "main"},
{"hlsl.nonint-index.frag", "main"},
{"hlsl.matNx1.frag", "main"},
{"hlsl.matpack-1.frag", "main"},
{"hlsl.matrixSwizzle.vert", "ShaderFunction"},
{"hlsl.memberFunCall.frag", "main"},
{"hlsl.mintypes.frag", "main"},
......
hlsl/hlslParseHelper.cpp
......@@ -8010,17 +8010,17 @@ void HlslParseContext::declareBlock(const TSourceLoc& loc, TType& type, const TS
case EvqBuffer:
correctUniform(type.getQualifier());
if (it != ioTypeMap.end() && it->second.uniform)
type.setStruct(it->second.uniform);
memberType.setStruct(it->second.uniform);
break;
case EvqVaryingIn:
correctInput(type.getQualifier());
if (it != ioTypeMap.end() && it->second.input)
type.setStruct(it->second.input);
memberType.setStruct(it->second.input);
break;
case EvqVaryingOut:
correctOutput(type.getQualifier());
if (it != ioTypeMap.end() && it->second.output)
type.setStruct(it->second.output);
memberType.setStruct(it->second.output);
break;
default:
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment