Skip to content

G
glslang
Commit f2b7f335 by John Kessenich
Options

SPV: Tighten up number of struct-types declared based on decoration.

Takes some pressure off of issue #304. Structures don't inherit locations and then explicitly decorate members with them, so removed this reason to have another instance of a structure type.
parent 5e564230
Showing with 921 additions and 1103 deletions
SPIRV/GlslangToSpv.cpp
...@@ -683,13 +683,17 @@ void InheritQualifiers(glslang::TQualifier& child, const glslang::TQualifier& pa ...@@ -683,13 +683,17 @@ void InheritQualifiers(glslang::TQualifier& child, const glslang::TQualifier& pa
child.writeonly = true; child.writeonly = true;
} }
bool HasNonLayoutQualifiers(const glslang::TQualifier& qualifier) bool HasNonLayoutQualifiers(const glslang::TType& type, const glslang::TQualifier& qualifier)
{ {
// This should list qualifiers that simultaneous satisfy: // This should list qualifiers that simultaneous satisfy:
// - struct members can inherit from a struct declaration // - struct members might inherit from a struct declaration
// - affect decorations on the struct members (note smooth does not, and expecting something like volatile to effect the whole object) // (note that non-block structs don't explicitly inherit,
// only implicitly, meaning no decoration involved)
// - affect decorations on the struct members
// (note smooth does not, and expecting something like volatile
// to effect the whole object)
// - are not part of the offset/st430/etc or row/column-major layout // - are not part of the offset/st430/etc or row/column-major layout
return qualifier.invariant || qualifier.hasLocation(); return qualifier.invariant || (qualifier.hasLocation() && type.getBasicType() == glslang::EbtBlock);
} }
// //
...@@ -961,7 +965,16 @@ bool TGlslangToSpvTraverser::visitBinary(glslang::TVisit /* visit */, glslang::T ...@@ -961,7 +965,16 @@ bool TGlslangToSpvTraverser::visitBinary(glslang::TVisit /* visit */, glslang::T
// store the result // store the result
builder.setAccessChain(lValue); builder.setAccessChain(lValue);
accessChainStore(node->getType(), rValue); if (builder.isStructType(builder.getTypeId(rValue))) {
//spv::Id lType = builder.getContainedTypeId(builder.getTypeId(builder.accessChainGetLValue()));
//spv::Id rType = builder.getTypeId(rValue);
//if (lType != rType) {
// TODO: do member-wise copy instead, this is current issue
// https://github.com/KhronosGroup/glslang/issues/304
//} else
accessChainStore(node->getType(), rValue);
} else
accessChainStore(node->getType(), rValue);
// assignments are expressions having an rValue after they are evaluated... // assignments are expressions having an rValue after they are evaluated...
builder.clearAccessChain(); builder.clearAccessChain();
...@@ -1958,7 +1971,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty ...@@ -1958,7 +1971,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
// Try to share structs for different layouts, but not yet for other // Try to share structs for different layouts, but not yet for other
// kinds of qualification (primarily not yet including interpolant qualification). // kinds of qualification (primarily not yet including interpolant qualification).
if (! HasNonLayoutQualifiers(qualifier)) if (! HasNonLayoutQualifiers(type, qualifier))
spvType = structMap[explicitLayout][qualifier.layoutMatrix][glslangMembers]; spvType = structMap[explicitLayout][qualifier.layoutMatrix][glslangMembers];
if (spvType != spv::NoResult) if (spvType != spv::NoResult)
break; break;
...@@ -2068,7 +2081,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangStructToSpvType(const glslang::TTy ...@@ -2068,7 +2081,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangStructToSpvType(const glslang::TTy
// Make the SPIR-V type // Make the SPIR-V type
spv::Id spvType = builder.makeStructType(spvMembers, type.getTypeName().c_str()); spv::Id spvType = builder.makeStructType(spvMembers, type.getTypeName().c_str());
if (! HasNonLayoutQualifiers(qualifier)) if (! HasNonLayoutQualifiers(type, qualifier))
structMap[explicitLayout][qualifier.layoutMatrix][glslangMembers] = spvType; structMap[explicitLayout][qualifier.layoutMatrix][glslangMembers] = spvType;
// Decorate it // Decorate it
......
SPIRV/SpvBuilder.h
...@@ -467,7 +467,7 @@ public: ...@@ -467,7 +467,7 @@ public:
// //
// the SPIR-V builder maintains a single active chain that // the SPIR-V builder maintains a single active chain that
// the following methods operated on // the following methods operate on
// //
// for external save and restore // for external save and restore
......
Test/baseResults/hlsl.calculatelod.dx10.frag.out
...@@ -321,7 +321,7 @@ gl_FragCoord origin is upper left ...@@ -321,7 +321,7 @@ 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 146 // Id's are bound by 145
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
...@@ -329,7 +329,7 @@ gl_FragCoord origin is upper left ...@@ -329,7 +329,7 @@ gl_FragCoord origin is upper left
Capability ImageQuery Capability ImageQuery
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 142 EntryPoint Fragment 4 "main" 141
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 8 "txval10" Name 8 "txval10"
...@@ -355,11 +355,8 @@ gl_FragCoord origin is upper left ...@@ -355,11 +355,8 @@ gl_FragCoord origin is upper left
MemberName 131(PS_OUTPUT) 0 "Color" MemberName 131(PS_OUTPUT) 0 "Color"
MemberName 131(PS_OUTPUT) 1 "Depth" MemberName 131(PS_OUTPUT) 1 "Depth"
Name 133 "psout" Name 133 "psout"
Name 140 "PS_OUTPUT" Name 141 "@entryPointOutput"
MemberName 140(PS_OUTPUT) 0 "Color" Name 144 "g_tTex1df4"
MemberName 140(PS_OUTPUT) 1 "Depth"
Name 142 "@entryPointOutput"
Name 145 "g_tTex1df4"
Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 11(g_tTex1df4a) DescriptorSet 0
Decorate 11(g_tTex1df4a) Binding 1 Decorate 11(g_tTex1df4a) Binding 1
Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0
...@@ -373,10 +370,9 @@ gl_FragCoord origin is upper left ...@@ -373,10 +370,9 @@ gl_FragCoord origin is upper left
Decorate 106(g_tTexcdi4a) DescriptorSet 0 Decorate 106(g_tTexcdi4a) DescriptorSet 0
Decorate 118(g_tTexcdu4a) DescriptorSet 0 Decorate 118(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 131(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 131(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 141(@entryPointOutput) Location 0
Decorate 142(@entryPointOutput) Location 0 Decorate 144(g_tTex1df4) DescriptorSet 0
Decorate 145(g_tTex1df4) DescriptorSet 0 Decorate 144(g_tTex1df4) Binding 0
Decorate 145(g_tTex1df4) Binding 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -447,10 +443,9 @@ gl_FragCoord origin is upper left ...@@ -447,10 +443,9 @@ gl_FragCoord origin is upper left
135: 130(fvec4) ConstantComposite 134 134 134 134 135: 130(fvec4) ConstantComposite 134 134 134 134
136: TypePointer Function 130(fvec4) 136: TypePointer Function 130(fvec4)
138: 23(int) Constant 1 138: 23(int) Constant 1
140(PS_OUTPUT): TypeStruct 130(fvec4) 6(float) 140: TypePointer Output 131(PS_OUTPUT)
141: TypePointer Output 140(PS_OUTPUT) 141(@entryPointOutput): 140(ptr) Variable Output
142(@entryPointOutput): 141(ptr) Variable Output 144(g_tTex1df4): 10(ptr) Variable UniformConstant
145(g_tTex1df4): 10(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(txval10): 7(ptr) Variable Function 8(txval10): 7(ptr) Variable Function
...@@ -530,7 +525,7 @@ gl_FragCoord origin is upper left ...@@ -530,7 +525,7 @@ gl_FragCoord origin is upper left
Store 137 135 Store 137 135
139: 7(ptr) AccessChain 133(psout) 138 139: 7(ptr) AccessChain 133(psout) 138
Store 139 134 Store 139 134
143:131(PS_OUTPUT) Load 133(psout) 142:131(PS_OUTPUT) Load 133(psout)
Store 142(@entryPointOutput) 143 Store 141(@entryPointOutput) 142
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.constructexpr.frag.out
...@@ -89,21 +89,19 @@ gl_FragCoord origin is upper left ...@@ -89,21 +89,19 @@ 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 35 // Id's are bound by 34
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 32 EntryPoint Fragment 4 "main" 31
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 22 "PS_OUTPUT" Name 22 "PS_OUTPUT"
MemberName 22(PS_OUTPUT) 0 "color" MemberName 22(PS_OUTPUT) 0 "color"
Name 24 "ps_output" Name 24 "ps_output"
Name 30 "PS_OUTPUT" Name 31 "@entryPointOutput"
MemberName 30(PS_OUTPUT) 0 "color" Decorate 31(@entryPointOutput) Location 0
Name 32 "@entryPointOutput"
Decorate 32(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 1 6: TypeInt 32 1
...@@ -128,15 +126,14 @@ gl_FragCoord origin is upper left ...@@ -128,15 +126,14 @@ gl_FragCoord origin is upper left
26: 13(float) Constant 1065353216 26: 13(float) Constant 1065353216
27: 21(fvec4) ConstantComposite 26 26 26 26 27: 21(fvec4) ConstantComposite 26 26 26 26
28: TypePointer Function 21(fvec4) 28: TypePointer Function 21(fvec4)
30(PS_OUTPUT): TypeStruct 21(fvec4) 30: TypePointer Output 22(PS_OUTPUT)
31: TypePointer Output 30(PS_OUTPUT) 31(@entryPointOutput): 30(ptr) Variable Output
32(@entryPointOutput): 31(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
24(ps_output): 23(ptr) Variable Function 24(ps_output): 23(ptr) Variable Function
29: 28(ptr) AccessChain 24(ps_output) 25 29: 28(ptr) AccessChain 24(ps_output) 25
Store 29 27 Store 29 27
33:22(PS_OUTPUT) Load 24(ps_output) 32:22(PS_OUTPUT) Load 24(ps_output)
Store 32(@entryPointOutput) 33 Store 31(@entryPointOutput) 32
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gather.array.dx10.frag.out
...@@ -225,14 +225,14 @@ gl_FragCoord origin is upper left ...@@ -225,14 +225,14 @@ 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 113 // Id's are bound by 112
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 100 EntryPoint Fragment 4 "main" 99
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval20" Name 9 "txval20"
...@@ -252,14 +252,11 @@ gl_FragCoord origin is upper left ...@@ -252,14 +252,11 @@ gl_FragCoord origin is upper left
MemberName 90(PS_OUTPUT) 0 "Color" MemberName 90(PS_OUTPUT) 0 "Color"
MemberName 90(PS_OUTPUT) 1 "Depth" MemberName 90(PS_OUTPUT) 1 "Depth"
Name 92 "psout" Name 92 "psout"
Name 98 "PS_OUTPUT" Name 99 "@entryPointOutput"
MemberName 98(PS_OUTPUT) 0 "Color" Name 104 "g_tTex1df4a"
MemberName 98(PS_OUTPUT) 1 "Depth" Name 105 "g_tTex1df4"
Name 100 "@entryPointOutput" Name 108 "g_tTex1di4a"
Name 105 "g_tTex1df4a" Name 111 "g_tTex1du4a"
Name 106 "g_tTex1df4"
Name 109 "g_tTex1di4a"
Name 112 "g_tTex1du4a"
Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 12(g_tTex2df4a) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
...@@ -269,14 +266,13 @@ gl_FragCoord origin is upper left ...@@ -269,14 +266,13 @@ gl_FragCoord origin is upper left
Decorate 70(g_tTexcdi4a) DescriptorSet 0 Decorate 70(g_tTexcdi4a) DescriptorSet 0
Decorate 80(g_tTexcdu4a) DescriptorSet 0 Decorate 80(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 98(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 99(@entryPointOutput) Location 0
Decorate 100(@entryPointOutput) Location 0 Decorate 104(g_tTex1df4a) DescriptorSet 0
Decorate 105(g_tTex1df4a) DescriptorSet 0 Decorate 104(g_tTex1df4a) Binding 1
Decorate 105(g_tTex1df4a) Binding 1 Decorate 105(g_tTex1df4) DescriptorSet 0
Decorate 106(g_tTex1df4) DescriptorSet 0 Decorate 105(g_tTex1df4) Binding 0
Decorate 106(g_tTex1df4) Binding 0 Decorate 108(g_tTex1di4a) DescriptorSet 0
Decorate 109(g_tTex1di4a) DescriptorSet 0 Decorate 111(g_tTex1du4a) DescriptorSet 0
Decorate 112(g_tTex1du4a) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -338,19 +334,18 @@ gl_FragCoord origin is upper left ...@@ -338,19 +334,18 @@ gl_FragCoord origin is upper left
93: 7(fvec4) ConstantComposite 87 87 87 87 93: 7(fvec4) ConstantComposite 87 87 87 87
95: 25(int) Constant 1 95: 25(int) Constant 1
96: TypePointer Function 6(float) 96: TypePointer Function 6(float)
98(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 98: TypePointer Output 90(PS_OUTPUT)
99: TypePointer Output 98(PS_OUTPUT) 99(@entryPointOutput): 98(ptr) Variable Output
100(@entryPointOutput): 99(ptr) Variable Output 102: TypeImage 6(float) 1D array sampled format:Unknown
103: TypeImage 6(float) 1D array sampled format:Unknown 103: TypePointer UniformConstant 102
104: TypePointer UniformConstant 103 104(g_tTex1df4a): 103(ptr) Variable UniformConstant
105(g_tTex1df4a): 104(ptr) Variable UniformConstant 105(g_tTex1df4): 103(ptr) Variable UniformConstant
106(g_tTex1df4): 104(ptr) Variable UniformConstant 106: TypeImage 25(int) 1D array sampled format:Unknown
107: TypeImage 25(int) 1D array sampled format:Unknown 107: TypePointer UniformConstant 106
108: TypePointer UniformConstant 107 108(g_tTex1di4a): 107(ptr) Variable UniformConstant
109(g_tTex1di4a): 108(ptr) Variable UniformConstant 109: TypeImage 42(int) 1D array sampled format:Unknown
110: TypeImage 42(int) 1D array sampled format:Unknown 110: TypePointer UniformConstant 109
111: TypePointer UniformConstant 110 111(g_tTex1du4a): 110(ptr) Variable UniformConstant
112(g_tTex1du4a): 111(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval20): 8(ptr) Variable Function 9(txval20): 8(ptr) Variable Function
...@@ -394,7 +389,7 @@ gl_FragCoord origin is upper left ...@@ -394,7 +389,7 @@ gl_FragCoord origin is upper left
Store 94 93 Store 94 93
97: 96(ptr) AccessChain 92(psout) 95 97: 96(ptr) AccessChain 92(psout) 95
Store 97 87 Store 97 87
101:90(PS_OUTPUT) Load 92(psout) 100:90(PS_OUTPUT) Load 92(psout)
Store 100(@entryPointOutput) 101 Store 99(@entryPointOutput) 100
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gather.basic.dx10.frag.out
...@@ -221,13 +221,13 @@ gl_FragCoord origin is upper left ...@@ -221,13 +221,13 @@ 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 124 // Id's are bound by 123
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 101 EntryPoint Fragment 4 "main" 100
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval20" Name 9 "txval20"
...@@ -247,18 +247,15 @@ gl_FragCoord origin is upper left ...@@ -247,18 +247,15 @@ gl_FragCoord origin is upper left
MemberName 90(PS_OUTPUT) 0 "Color" MemberName 90(PS_OUTPUT) 0 "Color"
MemberName 90(PS_OUTPUT) 1 "Depth" MemberName 90(PS_OUTPUT) 1 "Depth"
Name 92 "psout" Name 92 "psout"
Name 99 "PS_OUTPUT" Name 100 "@entryPointOutput"
MemberName 99(PS_OUTPUT) 0 "Color" Name 103 "g_sSamp2d"
MemberName 99(PS_OUTPUT) 1 "Depth" Name 106 "g_tTex1df4a"
Name 101 "@entryPointOutput" Name 107 "g_tTex1df4"
Name 104 "g_sSamp2d" Name 110 "g_tTex1di4"
Name 107 "g_tTex1df4a" Name 113 "g_tTex1du4"
Name 108 "g_tTex1df4" Name 116 "g_tTex3df4"
Name 111 "g_tTex1di4" Name 119 "g_tTex3di4"
Name 114 "g_tTex1du4" Name 122 "g_tTex3du4"
Name 117 "g_tTex3df4"
Name 120 "g_tTex3di4"
Name 123 "g_tTex3du4"
Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
...@@ -268,18 +265,17 @@ gl_FragCoord origin is upper left ...@@ -268,18 +265,17 @@ gl_FragCoord origin is upper left
Decorate 70(g_tTexcdi4) DescriptorSet 0 Decorate 70(g_tTexcdi4) DescriptorSet 0
Decorate 80(g_tTexcdu4) DescriptorSet 0 Decorate 80(g_tTexcdu4) DescriptorSet 0
MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 99(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 100(@entryPointOutput) Location 0
Decorate 101(@entryPointOutput) Location 0 Decorate 103(g_sSamp2d) DescriptorSet 0
Decorate 104(g_sSamp2d) DescriptorSet 0 Decorate 106(g_tTex1df4a) DescriptorSet 0
Decorate 107(g_tTex1df4a) DescriptorSet 0 Decorate 106(g_tTex1df4a) Binding 1
Decorate 107(g_tTex1df4a) Binding 1 Decorate 107(g_tTex1df4) DescriptorSet 0
Decorate 108(g_tTex1df4) DescriptorSet 0 Decorate 107(g_tTex1df4) Binding 0
Decorate 108(g_tTex1df4) Binding 0 Decorate 110(g_tTex1di4) DescriptorSet 0
Decorate 111(g_tTex1di4) DescriptorSet 0 Decorate 113(g_tTex1du4) DescriptorSet 0
Decorate 114(g_tTex1du4) DescriptorSet 0 Decorate 116(g_tTex3df4) DescriptorSet 0
Decorate 117(g_tTex3df4) DescriptorSet 0 Decorate 119(g_tTex3di4) DescriptorSet 0
Decorate 120(g_tTex3di4) DescriptorSet 0 Decorate 122(g_tTex3du4) DescriptorSet 0
Decorate 123(g_tTex3du4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -342,29 +338,28 @@ gl_FragCoord origin is upper left ...@@ -342,29 +338,28 @@ gl_FragCoord origin is upper left
94: 7(fvec4) ConstantComposite 93 93 93 93 94: 7(fvec4) ConstantComposite 93 93 93 93
96: 24(int) Constant 1 96: 24(int) Constant 1
97: TypePointer Function 6(float) 97: TypePointer Function 6(float)
99(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 99: TypePointer Output 90(PS_OUTPUT)
100: TypePointer Output 99(PS_OUTPUT) 100(@entryPointOutput): 99(ptr) Variable Output
101(@entryPointOutput): 100(ptr) Variable Output 103(g_sSamp2d): 15(ptr) Variable UniformConstant
104(g_sSamp2d): 15(ptr) Variable UniformConstant 104: TypeImage 6(float) 1D sampled format:Unknown
105: TypeImage 6(float) 1D sampled format:Unknown 105: TypePointer UniformConstant 104
106: TypePointer UniformConstant 105 106(g_tTex1df4a): 105(ptr) Variable UniformConstant
107(g_tTex1df4a): 106(ptr) Variable UniformConstant 107(g_tTex1df4): 105(ptr) Variable UniformConstant
108(g_tTex1df4): 106(ptr) Variable UniformConstant 108: TypeImage 24(int) 1D sampled format:Unknown
109: TypeImage 24(int) 1D sampled format:Unknown 109: TypePointer UniformConstant 108
110: TypePointer UniformConstant 109 110(g_tTex1di4): 109(ptr) Variable UniformConstant
111(g_tTex1di4): 110(ptr) Variable UniformConstant 111: TypeImage 41(int) 1D sampled format:Unknown
112: TypeImage 41(int) 1D sampled format:Unknown 112: TypePointer UniformConstant 111
113: TypePointer UniformConstant 112 113(g_tTex1du4): 112(ptr) Variable UniformConstant
114(g_tTex1du4): 113(ptr) Variable UniformConstant 114: TypeImage 6(float) 3D sampled format:Unknown
115: TypeImage 6(float) 3D sampled format:Unknown 115: TypePointer UniformConstant 114
116: TypePointer UniformConstant 115 116(g_tTex3df4): 115(ptr) Variable UniformConstant
117(g_tTex3df4): 116(ptr) Variable UniformConstant 117: TypeImage 24(int) 3D sampled format:Unknown
118: TypeImage 24(int) 3D sampled format:Unknown 118: TypePointer UniformConstant 117
119: TypePointer UniformConstant 118 119(g_tTex3di4): 118(ptr) Variable UniformConstant
120(g_tTex3di4): 119(ptr) Variable UniformConstant 120: TypeImage 41(int) 3D sampled format:Unknown
121: TypeImage 41(int) 3D sampled format:Unknown 121: TypePointer UniformConstant 120
122: TypePointer UniformConstant 121 122(g_tTex3du4): 121(ptr) Variable UniformConstant
123(g_tTex3du4): 122(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval20): 8(ptr) Variable Function 9(txval20): 8(ptr) Variable Function
...@@ -408,7 +403,7 @@ gl_FragCoord origin is upper left ...@@ -408,7 +403,7 @@ gl_FragCoord origin is upper left
Store 95 94 Store 95 94
98: 97(ptr) AccessChain 92(psout) 96 98: 97(ptr) AccessChain 92(psout) 96
Store 98 93 Store 98 93
102:90(PS_OUTPUT) Load 92(psout) 101:90(PS_OUTPUT) Load 92(psout)
Store 101(@entryPointOutput) 102 Store 100(@entryPointOutput) 101
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gather.basic.dx10.vert.out
...@@ -205,13 +205,13 @@ Shader version: 450 ...@@ -205,13 +205,13 @@ Shader version: 450
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 121 // Id's are bound by 120
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 98 EntryPoint Vertex 4 "main" 97
Name 4 "main" Name 4 "main"
Name 9 "txval20" Name 9 "txval20"
Name 12 "g_tTex2df4" Name 12 "g_tTex2df4"
...@@ -229,17 +229,15 @@ Shader version: 450 ...@@ -229,17 +229,15 @@ Shader version: 450
Name 90 "VS_OUTPUT" Name 90 "VS_OUTPUT"
MemberName 90(VS_OUTPUT) 0 "Pos" MemberName 90(VS_OUTPUT) 0 "Pos"
Name 92 "vsout" Name 92 "vsout"
Name 96 "VS_OUTPUT" Name 97 "@entryPointOutput"
MemberName 96(VS_OUTPUT) 0 "Pos" Name 100 "g_sSamp2d"
Name 98 "@entryPointOutput" Name 103 "g_tTex1df4a"
Name 101 "g_sSamp2d" Name 104 "g_tTex1df4"
Name 104 "g_tTex1df4a" Name 107 "g_tTex1di4"
Name 105 "g_tTex1df4" Name 110 "g_tTex1du4"
Name 108 "g_tTex1di4" Name 113 "g_tTex3df4"
Name 111 "g_tTex1du4" Name 116 "g_tTex3di4"
Name 114 "g_tTex3df4" Name 119 "g_tTex3du4"
Name 117 "g_tTex3di4"
Name 120 "g_tTex3du4"
Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
...@@ -249,18 +247,17 @@ Shader version: 450 ...@@ -249,18 +247,17 @@ Shader version: 450
Decorate 70(g_tTexcdi4) DescriptorSet 0 Decorate 70(g_tTexcdi4) DescriptorSet 0
Decorate 80(g_tTexcdu4) DescriptorSet 0 Decorate 80(g_tTexcdu4) DescriptorSet 0
MemberDecorate 90(VS_OUTPUT) 0 BuiltIn Position MemberDecorate 90(VS_OUTPUT) 0 BuiltIn Position
MemberDecorate 96(VS_OUTPUT) 0 BuiltIn Position Decorate 97(@entryPointOutput) Location 0
Decorate 98(@entryPointOutput) Location 0 Decorate 100(g_sSamp2d) DescriptorSet 0
Decorate 101(g_sSamp2d) DescriptorSet 0 Decorate 103(g_tTex1df4a) DescriptorSet 0
Decorate 104(g_tTex1df4a) DescriptorSet 0 Decorate 103(g_tTex1df4a) Binding 1
Decorate 104(g_tTex1df4a) Binding 1 Decorate 104(g_tTex1df4) DescriptorSet 0
Decorate 105(g_tTex1df4) DescriptorSet 0 Decorate 104(g_tTex1df4) Binding 0
Decorate 105(g_tTex1df4) Binding 0 Decorate 107(g_tTex1di4) DescriptorSet 0
Decorate 108(g_tTex1di4) DescriptorSet 0 Decorate 110(g_tTex1du4) DescriptorSet 0
Decorate 111(g_tTex1du4) DescriptorSet 0 Decorate 113(g_tTex3df4) DescriptorSet 0
Decorate 114(g_tTex3df4) DescriptorSet 0 Decorate 116(g_tTex3di4) DescriptorSet 0
Decorate 117(g_tTex3di4) DescriptorSet 0 Decorate 119(g_tTex3du4) DescriptorSet 0
Decorate 120(g_tTex3du4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -321,29 +318,28 @@ Shader version: 450 ...@@ -321,29 +318,28 @@ Shader version: 450
91: TypePointer Function 90(VS_OUTPUT) 91: TypePointer Function 90(VS_OUTPUT)
93: 6(float) Constant 0 93: 6(float) Constant 0
94: 7(fvec4) ConstantComposite 93 93 93 93 94: 7(fvec4) ConstantComposite 93 93 93 93
96(VS_OUTPUT): TypeStruct 7(fvec4) 96: TypePointer Output 90(VS_OUTPUT)
97: TypePointer Output 96(VS_OUTPUT) 97(@entryPointOutput): 96(ptr) Variable Output
98(@entryPointOutput): 97(ptr) Variable Output 100(g_sSamp2d): 15(ptr) Variable UniformConstant
101(g_sSamp2d): 15(ptr) Variable UniformConstant 101: TypeImage 6(float) 1D sampled format:Unknown
102: TypeImage 6(float) 1D sampled format:Unknown 102: TypePointer UniformConstant 101
103: TypePointer UniformConstant 102 103(g_tTex1df4a): 102(ptr) Variable UniformConstant
104(g_tTex1df4a): 103(ptr) Variable UniformConstant 104(g_tTex1df4): 102(ptr) Variable UniformConstant
105(g_tTex1df4): 103(ptr) Variable UniformConstant 105: TypeImage 24(int) 1D sampled format:Unknown
106: TypeImage 24(int) 1D sampled format:Unknown 106: TypePointer UniformConstant 105
107: TypePointer UniformConstant 106 107(g_tTex1di4): 106(ptr) Variable UniformConstant
108(g_tTex1di4): 107(ptr) Variable UniformConstant 108: TypeImage 41(int) 1D sampled format:Unknown
109: TypeImage 41(int) 1D sampled format:Unknown 109: TypePointer UniformConstant 108
110: TypePointer UniformConstant 109 110(g_tTex1du4): 109(ptr) Variable UniformConstant
111(g_tTex1du4): 110(ptr) Variable UniformConstant 111: TypeImage 6(float) 3D sampled format:Unknown
112: TypeImage 6(float) 3D sampled format:Unknown 112: TypePointer UniformConstant 111
113: TypePointer UniformConstant 112 113(g_tTex3df4): 112(ptr) Variable UniformConstant
114(g_tTex3df4): 113(ptr) Variable UniformConstant 114: TypeImage 24(int) 3D sampled format:Unknown
115: TypeImage 24(int) 3D sampled format:Unknown 115: TypePointer UniformConstant 114
116: TypePointer UniformConstant 115 116(g_tTex3di4): 115(ptr) Variable UniformConstant
117(g_tTex3di4): 116(ptr) Variable UniformConstant 117: TypeImage 41(int) 3D sampled format:Unknown
118: TypeImage 41(int) 3D sampled format:Unknown 118: TypePointer UniformConstant 117
119: TypePointer UniformConstant 118 119(g_tTex3du4): 118(ptr) Variable UniformConstant
120(g_tTex3du4): 119(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval20): 8(ptr) Variable Function 9(txval20): 8(ptr) Variable Function
...@@ -385,7 +381,7 @@ Shader version: 450 ...@@ -385,7 +381,7 @@ Shader version: 450
Store 77(txval42) 89 Store 77(txval42) 89
95: 8(ptr) AccessChain 92(vsout) 25 95: 8(ptr) AccessChain 92(vsout) 25
Store 95 94 Store 95 94
99:90(VS_OUTPUT) Load 92(vsout) 98:90(VS_OUTPUT) Load 92(vsout)
Store 98(@entryPointOutput) 99 Store 97(@entryPointOutput) 98
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gather.offset.dx10.frag.out
...@@ -171,13 +171,13 @@ gl_FragCoord origin is upper left ...@@ -171,13 +171,13 @@ 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 103 // Id's are bound by 102
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 72 EntryPoint Fragment 4 "main" 71
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval20" Name 9 "txval20"
...@@ -191,40 +191,36 @@ gl_FragCoord origin is upper left ...@@ -191,40 +191,36 @@ gl_FragCoord origin is upper left
MemberName 62(PS_OUTPUT) 0 "Color" MemberName 62(PS_OUTPUT) 0 "Color"
MemberName 62(PS_OUTPUT) 1 "Depth" MemberName 62(PS_OUTPUT) 1 "Depth"
Name 64 "psout" Name 64 "psout"
Name 70 "PS_OUTPUT" Name 71 "@entryPointOutput"
MemberName 70(PS_OUTPUT) 0 "Color" Name 76 "g_tTex1df4a"
MemberName 70(PS_OUTPUT) 1 "Depth" Name 77 "g_tTex1df4"
Name 72 "@entryPointOutput" Name 80 "g_tTex1di4"
Name 77 "g_tTex1df4a" Name 83 "g_tTex1du4"
Name 78 "g_tTex1df4" Name 86 "g_tTex3df4"
Name 81 "g_tTex1di4" Name 89 "g_tTex3di4"
Name 84 "g_tTex1du4" Name 92 "g_tTex3du4"
Name 87 "g_tTex3df4" Name 95 "g_tTexcdf4"
Name 90 "g_tTex3di4" Name 98 "g_tTexcdi4"
Name 93 "g_tTex3du4" Name 101 "g_tTexcdu4"
Name 96 "g_tTexcdf4"
Name 99 "g_tTexcdi4"
Name 102 "g_tTexcdu4"
Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
Decorate 35(g_tTex2di4) DescriptorSet 0 Decorate 35(g_tTex2di4) DescriptorSet 0
Decorate 51(g_tTex2du4) DescriptorSet 0 Decorate 51(g_tTex2du4) DescriptorSet 0
MemberDecorate 62(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 62(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 70(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 71(@entryPointOutput) Location 0
Decorate 72(@entryPointOutput) Location 0 Decorate 76(g_tTex1df4a) DescriptorSet 0
Decorate 77(g_tTex1df4a) DescriptorSet 0 Decorate 76(g_tTex1df4a) Binding 1
Decorate 77(g_tTex1df4a) Binding 1 Decorate 77(g_tTex1df4) DescriptorSet 0
Decorate 78(g_tTex1df4) DescriptorSet 0 Decorate 77(g_tTex1df4) Binding 0
Decorate 78(g_tTex1df4) Binding 0 Decorate 80(g_tTex1di4) DescriptorSet 0
Decorate 81(g_tTex1di4) DescriptorSet 0 Decorate 83(g_tTex1du4) DescriptorSet 0
Decorate 84(g_tTex1du4) DescriptorSet 0 Decorate 86(g_tTex3df4) DescriptorSet 0
Decorate 87(g_tTex3df4) DescriptorSet 0 Decorate 89(g_tTex3di4) DescriptorSet 0
Decorate 90(g_tTex3di4) DescriptorSet 0 Decorate 92(g_tTex3du4) DescriptorSet 0
Decorate 93(g_tTex3du4) DescriptorSet 0 Decorate 95(g_tTexcdf4) DescriptorSet 0
Decorate 96(g_tTexcdf4) DescriptorSet 0 Decorate 98(g_tTexcdi4) DescriptorSet 0
Decorate 99(g_tTexcdi4) DescriptorSet 0 Decorate 101(g_tTexcdu4) DescriptorSet 0
Decorate 102(g_tTexcdu4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -273,37 +269,36 @@ gl_FragCoord origin is upper left ...@@ -273,37 +269,36 @@ gl_FragCoord origin is upper left
65: 6(float) Constant 1065353216 65: 6(float) Constant 1065353216
66: 7(fvec4) ConstantComposite 65 65 65 65 66: 7(fvec4) ConstantComposite 65 65 65 65
68: TypePointer Function 6(float) 68: TypePointer Function 6(float)
70(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 70: TypePointer Output 62(PS_OUTPUT)
71: TypePointer Output 70(PS_OUTPUT) 71(@entryPointOutput): 70(ptr) Variable Output
72(@entryPointOutput): 71(ptr) Variable Output 74: TypeImage 6(float) 1D sampled format:Unknown
75: TypeImage 6(float) 1D sampled format:Unknown 75: TypePointer UniformConstant 74
76: TypePointer UniformConstant 75 76(g_tTex1df4a): 75(ptr) Variable UniformConstant
77(g_tTex1df4a): 76(ptr) Variable UniformConstant 77(g_tTex1df4): 75(ptr) Variable UniformConstant
78(g_tTex1df4): 76(ptr) Variable UniformConstant 78: TypeImage 24(int) 1D sampled format:Unknown
79: TypeImage 24(int) 1D sampled format:Unknown 79: TypePointer UniformConstant 78
80: TypePointer UniformConstant 79 80(g_tTex1di4): 79(ptr) Variable UniformConstant
81(g_tTex1di4): 80(ptr) Variable UniformConstant 81: TypeImage 45(int) 1D sampled format:Unknown
82: TypeImage 45(int) 1D sampled format:Unknown 82: TypePointer UniformConstant 81
83: TypePointer UniformConstant 82 83(g_tTex1du4): 82(ptr) Variable UniformConstant
84(g_tTex1du4): 83(ptr) Variable UniformConstant 84: TypeImage 6(float) 3D sampled format:Unknown
85: TypeImage 6(float) 3D sampled format:Unknown 85: TypePointer UniformConstant 84
86: TypePointer UniformConstant 85 86(g_tTex3df4): 85(ptr) Variable UniformConstant
87(g_tTex3df4): 86(ptr) Variable UniformConstant 87: TypeImage 24(int) 3D sampled format:Unknown
88: TypeImage 24(int) 3D sampled format:Unknown 88: TypePointer UniformConstant 87
89: TypePointer UniformConstant 88 89(g_tTex3di4): 88(ptr) Variable UniformConstant
90(g_tTex3di4): 89(ptr) Variable UniformConstant 90: TypeImage 45(int) 3D sampled format:Unknown
91: TypeImage 45(int) 3D sampled format:Unknown 91: TypePointer UniformConstant 90
92: TypePointer UniformConstant 91 92(g_tTex3du4): 91(ptr) Variable UniformConstant
93(g_tTex3du4): 92(ptr) Variable UniformConstant 93: TypeImage 6(float) Cube sampled format:Unknown
94: TypeImage 6(float) Cube sampled format:Unknown 94: TypePointer UniformConstant 93
95: TypePointer UniformConstant 94 95(g_tTexcdf4): 94(ptr) Variable UniformConstant
96(g_tTexcdf4): 95(ptr) Variable UniformConstant 96: TypeImage 24(int) Cube sampled format:Unknown
97: TypeImage 24(int) Cube sampled format:Unknown 97: TypePointer UniformConstant 96
98: TypePointer UniformConstant 97 98(g_tTexcdi4): 97(ptr) Variable UniformConstant
99(g_tTexcdi4): 98(ptr) Variable UniformConstant 99: TypeImage 45(int) Cube sampled format:Unknown
100: TypeImage 45(int) Cube sampled format:Unknown 100: TypePointer UniformConstant 99
101: TypePointer UniformConstant 100 101(g_tTexcdu4): 100(ptr) Variable UniformConstant
102(g_tTexcdu4): 101(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval20): 8(ptr) Variable Function 9(txval20): 8(ptr) Variable Function
...@@ -329,7 +324,7 @@ gl_FragCoord origin is upper left ...@@ -329,7 +324,7 @@ gl_FragCoord origin is upper left
Store 67 66 Store 67 66
69: 68(ptr) AccessChain 64(psout) 26 69: 68(ptr) AccessChain 64(psout) 26
Store 69 65 Store 69 65
73:62(PS_OUTPUT) Load 64(psout) 72:62(PS_OUTPUT) Load 64(psout)
Store 72(@entryPointOutput) 73 Store 71(@entryPointOutput) 72
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
...@@ -165,13 +165,13 @@ gl_FragCoord origin is upper left ...@@ -165,13 +165,13 @@ 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 86 // Id's are bound by 85
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 73 EntryPoint Fragment 4 "main" 72
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval20" Name 9 "txval20"
...@@ -185,28 +185,24 @@ gl_FragCoord origin is upper left ...@@ -185,28 +185,24 @@ gl_FragCoord origin is upper left
MemberName 63(PS_OUTPUT) 0 "Color" MemberName 63(PS_OUTPUT) 0 "Color"
MemberName 63(PS_OUTPUT) 1 "Depth" MemberName 63(PS_OUTPUT) 1 "Depth"
Name 65 "psout" Name 65 "psout"
Name 71 "PS_OUTPUT" Name 72 "@entryPointOutput"
MemberName 71(PS_OUTPUT) 0 "Color" Name 77 "g_tTex1df4a"
MemberName 71(PS_OUTPUT) 1 "Depth" Name 78 "g_tTex1df4"
Name 73 "@entryPointOutput" Name 81 "g_tTex1di4"
Name 78 "g_tTex1df4a" Name 84 "g_tTex1du4"
Name 79 "g_tTex1df4"
Name 82 "g_tTex1di4"
Name 85 "g_tTex1du4"
Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
Decorate 36(g_tTex2di4) DescriptorSet 0 Decorate 36(g_tTex2di4) DescriptorSet 0
Decorate 51(g_tTex2du4) DescriptorSet 0 Decorate 51(g_tTex2du4) DescriptorSet 0
MemberDecorate 63(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 63(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 71(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 72(@entryPointOutput) Location 0
Decorate 73(@entryPointOutput) Location 0 Decorate 77(g_tTex1df4a) DescriptorSet 0
Decorate 78(g_tTex1df4a) DescriptorSet 0 Decorate 77(g_tTex1df4a) Binding 1
Decorate 78(g_tTex1df4a) Binding 1 Decorate 78(g_tTex1df4) DescriptorSet 0
Decorate 79(g_tTex1df4) DescriptorSet 0 Decorate 78(g_tTex1df4) Binding 0
Decorate 79(g_tTex1df4) Binding 0 Decorate 81(g_tTex1di4) DescriptorSet 0
Decorate 82(g_tTex1di4) DescriptorSet 0 Decorate 84(g_tTex1du4) DescriptorSet 0
Decorate 85(g_tTex1du4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -256,19 +252,18 @@ gl_FragCoord origin is upper left ...@@ -256,19 +252,18 @@ gl_FragCoord origin is upper left
66: 6(float) Constant 1065353216 66: 6(float) Constant 1065353216
67: 7(fvec4) ConstantComposite 66 66 66 66 67: 7(fvec4) ConstantComposite 66 66 66 66
69: TypePointer Function 6(float) 69: TypePointer Function 6(float)
71(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 71: TypePointer Output 63(PS_OUTPUT)
72: TypePointer Output 71(PS_OUTPUT) 72(@entryPointOutput): 71(ptr) Variable Output
73(@entryPointOutput): 72(ptr) Variable Output 75: TypeImage 6(float) 1D array sampled format:Unknown
76: TypeImage 6(float) 1D array sampled format:Unknown 76: TypePointer UniformConstant 75
77: TypePointer UniformConstant 76 77(g_tTex1df4a): 76(ptr) Variable UniformConstant
78(g_tTex1df4a): 77(ptr) Variable UniformConstant 78(g_tTex1df4): 76(ptr) Variable UniformConstant
79(g_tTex1df4): 77(ptr) Variable UniformConstant 79: TypeImage 25(int) 1D array sampled format:Unknown
80: TypeImage 25(int) 1D array sampled format:Unknown 80: TypePointer UniformConstant 79
81: TypePointer UniformConstant 80 81(g_tTex1di4): 80(ptr) Variable UniformConstant
82(g_tTex1di4): 81(ptr) Variable UniformConstant 82: TypeImage 45(int) 1D array sampled format:Unknown
83: TypeImage 45(int) 1D array sampled format:Unknown 83: TypePointer UniformConstant 82
84: TypePointer UniformConstant 83 84(g_tTex1du4): 83(ptr) Variable UniformConstant
85(g_tTex1du4): 84(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval20): 8(ptr) Variable Function 9(txval20): 8(ptr) Variable Function
...@@ -294,7 +289,7 @@ gl_FragCoord origin is upper left ...@@ -294,7 +289,7 @@ gl_FragCoord origin is upper left
Store 68 67 Store 68 67
70: 69(ptr) AccessChain 65(psout) 27 70: 69(ptr) AccessChain 65(psout) 27
Store 70 66 Store 70 66
74:63(PS_OUTPUT) Load 65(psout) 73:63(PS_OUTPUT) Load 65(psout)
Store 73(@entryPointOutput) 74 Store 72(@entryPointOutput) 73
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
...@@ -575,14 +575,14 @@ gl_FragCoord origin is upper left ...@@ -575,14 +575,14 @@ 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 223 // Id's are bound by 222
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 205 EntryPoint Fragment 4 "main" 204
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval00" Name 9 "txval00"
...@@ -622,16 +622,13 @@ gl_FragCoord origin is upper left ...@@ -622,16 +622,13 @@ gl_FragCoord origin is upper left
MemberName 195(PS_OUTPUT) 0 "Color" MemberName 195(PS_OUTPUT) 0 "Color"
MemberName 195(PS_OUTPUT) 1 "Depth" MemberName 195(PS_OUTPUT) 1 "Depth"
Name 197 "psout" Name 197 "psout"
Name 203 "PS_OUTPUT" Name 204 "@entryPointOutput"
MemberName 203(PS_OUTPUT) 0 "Color" Name 207 "g_sSamp2d"
MemberName 203(PS_OUTPUT) 1 "Depth" Name 210 "g_tTex1df4a"
Name 205 "@entryPointOutput" Name 213 "g_tTex1di4a"
Name 208 "g_sSamp2d" Name 216 "g_tTex1du4a"
Name 211 "g_tTex1df4a" Name 218 "c1"
Name 214 "g_tTex1di4a" Name 221 "c2"
Name 217 "g_tTex1du4a"
Name 219 "c1"
Name 222 "c2"
Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 12(g_tTex2df4a) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
...@@ -641,13 +638,12 @@ gl_FragCoord origin is upper left ...@@ -641,13 +638,12 @@ gl_FragCoord origin is upper left
Decorate 124(g_tTexcdi4a) DescriptorSet 0 Decorate 124(g_tTexcdi4a) DescriptorSet 0
Decorate 134(g_tTexcdu4a) DescriptorSet 0 Decorate 134(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 195(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 195(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 203(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 204(@entryPointOutput) Location 0
Decorate 205(@entryPointOutput) Location 0 Decorate 207(g_sSamp2d) DescriptorSet 0
Decorate 208(g_sSamp2d) DescriptorSet 0 Decorate 210(g_tTex1df4a) DescriptorSet 0
Decorate 211(g_tTex1df4a) DescriptorSet 0 Decorate 210(g_tTex1df4a) Binding 0
Decorate 211(g_tTex1df4a) Binding 0 Decorate 213(g_tTex1di4a) DescriptorSet 0
Decorate 214(g_tTex1di4a) DescriptorSet 0 Decorate 216(g_tTex1du4a) DescriptorSet 0
Decorate 217(g_tTex1du4a) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -700,24 +696,23 @@ gl_FragCoord origin is upper left ...@@ -700,24 +696,23 @@ gl_FragCoord origin is upper left
198: 6(float) Constant 1065353216 198: 6(float) Constant 1065353216
199: 7(fvec4) ConstantComposite 198 198 198 198 199: 7(fvec4) ConstantComposite 198 198 198 198
201: TypePointer Function 6(float) 201: TypePointer Function 6(float)
203(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 203: TypePointer Output 195(PS_OUTPUT)
204: TypePointer Output 203(PS_OUTPUT) 204(@entryPointOutput): 203(ptr) Variable Output
205(@entryPointOutput): 204(ptr) Variable Output 207(g_sSamp2d): 15(ptr) Variable UniformConstant
208(g_sSamp2d): 15(ptr) Variable UniformConstant 208: TypeImage 6(float) 1D array sampled format:Unknown
209: TypeImage 6(float) 1D array sampled format:Unknown 209: TypePointer UniformConstant 208
210: TypePointer UniformConstant 209 210(g_tTex1df4a): 209(ptr) Variable UniformConstant
211(g_tTex1df4a): 210(ptr) Variable UniformConstant 211: TypeImage 24(int) 1D array sampled format:Unknown
212: TypeImage 24(int) 1D array sampled format:Unknown 212: TypePointer UniformConstant 211
213: TypePointer UniformConstant 212 213(g_tTex1di4a): 212(ptr) Variable UniformConstant
214(g_tTex1di4a): 213(ptr) Variable UniformConstant 214: TypeImage 39(int) 1D array sampled format:Unknown
215: TypeImage 39(int) 1D array sampled format:Unknown 215: TypePointer UniformConstant 214
216: TypePointer UniformConstant 215 216(g_tTex1du4a): 215(ptr) Variable UniformConstant
217(g_tTex1du4a): 216(ptr) Variable UniformConstant 217: TypePointer UniformConstant 6(float)
218: TypePointer UniformConstant 6(float) 218(c1): 217(ptr) Variable UniformConstant
219(c1): 218(ptr) Variable UniformConstant 219: TypeVector 6(float) 2
220: TypeVector 6(float) 2 220: TypePointer UniformConstant 219(fvec2)
221: TypePointer UniformConstant 220(fvec2) 221(c2): 220(ptr) Variable UniformConstant
222(c2): 221(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval00): 8(ptr) Variable Function 9(txval00): 8(ptr) Variable Function
...@@ -893,7 +888,7 @@ gl_FragCoord origin is upper left ...@@ -893,7 +888,7 @@ gl_FragCoord origin is upper left
Store 200 199 Store 200 199
202: 201(ptr) AccessChain 197(psout) 57 202: 201(ptr) AccessChain 197(psout) 57
Store 202 198 Store 202 198
206:195(PS_OUTPUT) Load 197(psout) 205:195(PS_OUTPUT) Load 197(psout)
Store 205(@entryPointOutput) 206 Store 204(@entryPointOutput) 205
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
...@@ -583,13 +583,13 @@ gl_FragCoord origin is upper left ...@@ -583,13 +583,13 @@ 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 233 // Id's are bound by 232
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 206 EntryPoint Fragment 4 "main" 205
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval00" Name 9 "txval00"
...@@ -629,20 +629,17 @@ gl_FragCoord origin is upper left ...@@ -629,20 +629,17 @@ gl_FragCoord origin is upper left
MemberName 196(PS_OUTPUT) 0 "Color" MemberName 196(PS_OUTPUT) 0 "Color"
MemberName 196(PS_OUTPUT) 1 "Depth" MemberName 196(PS_OUTPUT) 1 "Depth"
Name 198 "psout" Name 198 "psout"
Name 204 "PS_OUTPUT" Name 205 "@entryPointOutput"
MemberName 204(PS_OUTPUT) 0 "Color" Name 208 "g_sSamp2d"
MemberName 204(PS_OUTPUT) 1 "Depth" Name 211 "g_tTex1df4a"
Name 206 "@entryPointOutput" Name 212 "g_tTex1df4"
Name 209 "g_sSamp2d" Name 215 "g_tTex1di4"
Name 212 "g_tTex1df4a" Name 218 "g_tTex1du4"
Name 213 "g_tTex1df4" Name 221 "g_tTex3df4"
Name 216 "g_tTex1di4" Name 224 "g_tTex3di4"
Name 219 "g_tTex1du4" Name 227 "g_tTex3du4"
Name 222 "g_tTex3df4" Name 229 "c1"
Name 225 "g_tTex3di4" Name 231 "c4"
Name 228 "g_tTex3du4"
Name 230 "c1"
Name 232 "c4"
Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
...@@ -652,18 +649,17 @@ gl_FragCoord origin is upper left ...@@ -652,18 +649,17 @@ gl_FragCoord origin is upper left
Decorate 125(g_tTexcdi4) DescriptorSet 0 Decorate 125(g_tTexcdi4) DescriptorSet 0
Decorate 135(g_tTexcdu4) DescriptorSet 0 Decorate 135(g_tTexcdu4) DescriptorSet 0
MemberDecorate 196(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 196(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 204(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 205(@entryPointOutput) Location 0
Decorate 206(@entryPointOutput) Location 0 Decorate 208(g_sSamp2d) DescriptorSet 0
Decorate 209(g_sSamp2d) DescriptorSet 0 Decorate 211(g_tTex1df4a) DescriptorSet 0
Decorate 212(g_tTex1df4a) DescriptorSet 0 Decorate 211(g_tTex1df4a) Binding 1
Decorate 212(g_tTex1df4a) Binding 1 Decorate 212(g_tTex1df4) DescriptorSet 0
Decorate 213(g_tTex1df4) DescriptorSet 0 Decorate 212(g_tTex1df4) Binding 0
Decorate 213(g_tTex1df4) Binding 0 Decorate 215(g_tTex1di4) DescriptorSet 0
Decorate 216(g_tTex1di4) DescriptorSet 0 Decorate 218(g_tTex1du4) DescriptorSet 0
Decorate 219(g_tTex1du4) DescriptorSet 0 Decorate 221(g_tTex3df4) DescriptorSet 0
Decorate 222(g_tTex3df4) DescriptorSet 0 Decorate 224(g_tTex3di4) DescriptorSet 0
Decorate 225(g_tTex3di4) DescriptorSet 0 Decorate 227(g_tTex3du4) DescriptorSet 0
Decorate 228(g_tTex3du4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -717,33 +713,32 @@ gl_FragCoord origin is upper left ...@@ -717,33 +713,32 @@ gl_FragCoord origin is upper left
199: 6(float) Constant 1065353216 199: 6(float) Constant 1065353216
200: 7(fvec4) ConstantComposite 199 199 199 199 200: 7(fvec4) ConstantComposite 199 199 199 199
202: TypePointer Function 6(float) 202: TypePointer Function 6(float)
204(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 204: TypePointer Output 196(PS_OUTPUT)
205: TypePointer Output 204(PS_OUTPUT) 205(@entryPointOutput): 204(ptr) Variable Output
206(@entryPointOutput): 205(ptr) Variable Output 208(g_sSamp2d): 15(ptr) Variable UniformConstant
209(g_sSamp2d): 15(ptr) Variable UniformConstant 209: TypeImage 6(float) 1D sampled format:Unknown
210: TypeImage 6(float) 1D sampled format:Unknown 210: TypePointer UniformConstant 209
211: TypePointer UniformConstant 210 211(g_tTex1df4a): 210(ptr) Variable UniformConstant
212(g_tTex1df4a): 211(ptr) Variable UniformConstant 212(g_tTex1df4): 210(ptr) Variable UniformConstant
213(g_tTex1df4): 211(ptr) Variable UniformConstant 213: TypeImage 24(int) 1D sampled format:Unknown
214: TypeImage 24(int) 1D sampled format:Unknown 214: TypePointer UniformConstant 213
215: TypePointer UniformConstant 214 215(g_tTex1di4): 214(ptr) Variable UniformConstant
216(g_tTex1di4): 215(ptr) Variable UniformConstant 216: TypeImage 39(int) 1D sampled format:Unknown
217: TypeImage 39(int) 1D sampled format:Unknown 217: TypePointer UniformConstant 216
218: TypePointer UniformConstant 217 218(g_tTex1du4): 217(ptr) Variable UniformConstant
219(g_tTex1du4): 218(ptr) Variable UniformConstant 219: TypeImage 6(float) 3D sampled format:Unknown
220: TypeImage 6(float) 3D sampled format:Unknown 220: TypePointer UniformConstant 219
221: TypePointer UniformConstant 220 221(g_tTex3df4): 220(ptr) Variable UniformConstant
222(g_tTex3df4): 221(ptr) Variable UniformConstant 222: TypeImage 24(int) 3D sampled format:Unknown
223: TypeImage 24(int) 3D sampled format:Unknown 223: TypePointer UniformConstant 222
224: TypePointer UniformConstant 223 224(g_tTex3di4): 223(ptr) Variable UniformConstant
225(g_tTex3di4): 224(ptr) Variable UniformConstant 225: TypeImage 39(int) 3D sampled format:Unknown
226: TypeImage 39(int) 3D sampled format:Unknown 226: TypePointer UniformConstant 225
227: TypePointer UniformConstant 226 227(g_tTex3du4): 226(ptr) Variable UniformConstant
228(g_tTex3du4): 227(ptr) Variable UniformConstant 228: TypePointer UniformConstant 6(float)
229: TypePointer UniformConstant 6(float) 229(c1): 228(ptr) Variable UniformConstant
230(c1): 229(ptr) Variable UniformConstant 230: TypePointer UniformConstant 7(fvec4)
231: TypePointer UniformConstant 7(fvec4) 231(c4): 230(ptr) Variable UniformConstant
232(c4): 231(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval00): 8(ptr) Variable Function 9(txval00): 8(ptr) Variable Function
...@@ -919,7 +914,7 @@ gl_FragCoord origin is upper left ...@@ -919,7 +914,7 @@ gl_FragCoord origin is upper left
Store 201 200 Store 201 200
203: 202(ptr) AccessChain 198(psout) 57 203: 202(ptr) AccessChain 198(psout) 57
Store 203 199 Store 203 199
207:196(PS_OUTPUT) Load 198(psout) 206:196(PS_OUTPUT) Load 198(psout)
Store 206(@entryPointOutput) 207 Store 205(@entryPointOutput) 206
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
...@@ -727,7 +727,7 @@ gl_FragCoord origin is upper left ...@@ -727,7 +727,7 @@ 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 304 // Id's are bound by 303
Capability Shader Capability Shader
Capability ImageGatherExtended Capability ImageGatherExtended
...@@ -735,7 +735,7 @@ gl_FragCoord origin is upper left ...@@ -735,7 +735,7 @@ gl_FragCoord origin is upper left
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 268 EntryPoint Fragment 4 "main" 267
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval001" Name 9 "txval001"
...@@ -772,39 +772,35 @@ gl_FragCoord origin is upper left ...@@ -772,39 +772,35 @@ gl_FragCoord origin is upper left
MemberName 258(PS_OUTPUT) 0 "Color" MemberName 258(PS_OUTPUT) 0 "Color"
MemberName 258(PS_OUTPUT) 1 "Depth" MemberName 258(PS_OUTPUT) 1 "Depth"
Name 260 "psout" Name 260 "psout"
Name 266 "PS_OUTPUT" Name 267 "@entryPointOutput"
MemberName 266(PS_OUTPUT) 0 "Color" Name 270 "g_sSamp2d"
MemberName 266(PS_OUTPUT) 1 "Depth" Name 273 "g_tTex1df4a"
Name 268 "@entryPointOutput" Name 276 "g_tTex1di4a"
Name 271 "g_sSamp2d" Name 279 "g_tTex1du4a"
Name 274 "g_tTex1df4a" Name 282 "g_tTexcdf4a"
Name 277 "g_tTex1di4a" Name 285 "g_tTexcdi4a"
Name 280 "g_tTex1du4a" Name 288 "g_tTexcdu4a"
Name 283 "g_tTexcdf4a" Name 290 "c1"
Name 286 "g_tTexcdi4a" Name 293 "c2"
Name 289 "g_tTexcdu4a" Name 295 "c4"
Name 291 "c1" Name 297 "o1"
Name 294 "c2" Name 300 "o3"
Name 296 "c4" Name 302 "o4"
Name 298 "o1"
Name 301 "o3"
Name 303 "o4"
Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 12(g_tTex2df4a) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0 Decorate 16(g_sSamp) Binding 0
Decorate 36(g_tTex2di4a) DescriptorSet 0 Decorate 36(g_tTex2di4a) DescriptorSet 0
Decorate 50(g_tTex2du4a) DescriptorSet 0 Decorate 50(g_tTex2du4a) DescriptorSet 0
MemberDecorate 258(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 258(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 266(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 267(@entryPointOutput) Location 0
Decorate 268(@entryPointOutput) Location 0 Decorate 270(g_sSamp2d) DescriptorSet 0
Decorate 271(g_sSamp2d) DescriptorSet 0 Decorate 273(g_tTex1df4a) DescriptorSet 0
Decorate 274(g_tTex1df4a) DescriptorSet 0 Decorate 273(g_tTex1df4a) Binding 0
Decorate 274(g_tTex1df4a) Binding 0 Decorate 276(g_tTex1di4a) DescriptorSet 0
Decorate 277(g_tTex1di4a) DescriptorSet 0 Decorate 279(g_tTex1du4a) DescriptorSet 0
Decorate 280(g_tTex1du4a) DescriptorSet 0 Decorate 282(g_tTexcdf4a) DescriptorSet 0
Decorate 283(g_tTexcdf4a) DescriptorSet 0 Decorate 285(g_tTexcdi4a) DescriptorSet 0
Decorate 286(g_tTexcdi4a) DescriptorSet 0 Decorate 288(g_tTexcdu4a) DescriptorSet 0
Decorate 289(g_tTexcdu4a) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -848,42 +844,41 @@ gl_FragCoord origin is upper left ...@@ -848,42 +844,41 @@ gl_FragCoord origin is upper left
261: 6(float) Constant 1065353216 261: 6(float) Constant 1065353216
262: 7(fvec4) ConstantComposite 261 261 261 261 262: 7(fvec4) ConstantComposite 261 261 261 261
264: TypePointer Function 6(float) 264: TypePointer Function 6(float)
266(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 266: TypePointer Output 258(PS_OUTPUT)
267: TypePointer Output 266(PS_OUTPUT) 267(@entryPointOutput): 266(ptr) Variable Output
268(@entryPointOutput): 267(ptr) Variable Output 270(g_sSamp2d): 15(ptr) Variable UniformConstant
271(g_sSamp2d): 15(ptr) Variable UniformConstant 271: TypeImage 6(float) 1D array sampled format:Unknown
272: TypeImage 6(float) 1D array sampled format:Unknown 272: TypePointer UniformConstant 271
273: TypePointer UniformConstant 272 273(g_tTex1df4a): 272(ptr) Variable UniformConstant
274(g_tTex1df4a): 273(ptr) Variable UniformConstant 274: TypeImage 24(int) 1D array sampled format:Unknown
275: TypeImage 24(int) 1D array sampled format:Unknown 275: TypePointer UniformConstant 274
276: TypePointer UniformConstant 275 276(g_tTex1di4a): 275(ptr) Variable UniformConstant
277(g_tTex1di4a): 276(ptr) Variable UniformConstant 277: TypeImage 44(int) 1D array sampled format:Unknown
278: TypeImage 44(int) 1D array sampled format:Unknown 278: TypePointer UniformConstant 277
279: TypePointer UniformConstant 278 279(g_tTex1du4a): 278(ptr) Variable UniformConstant
280(g_tTex1du4a): 279(ptr) Variable UniformConstant 280: TypeImage 6(float) Cube array sampled format:Unknown
281: TypeImage 6(float) Cube array sampled format:Unknown 281: TypePointer UniformConstant 280
282: TypePointer UniformConstant 281 282(g_tTexcdf4a): 281(ptr) Variable UniformConstant
283(g_tTexcdf4a): 282(ptr) Variable UniformConstant 283: TypeImage 24(int) Cube array sampled format:Unknown
284: TypeImage 24(int) Cube array sampled format:Unknown 284: TypePointer UniformConstant 283
285: TypePointer UniformConstant 284 285(g_tTexcdi4a): 284(ptr) Variable UniformConstant
286(g_tTexcdi4a): 285(ptr) Variable UniformConstant 286: TypeImage 44(int) Cube array sampled format:Unknown
287: TypeImage 44(int) Cube array sampled format:Unknown 287: TypePointer UniformConstant 286
288: TypePointer UniformConstant 287 288(g_tTexcdu4a): 287(ptr) Variable UniformConstant
289(g_tTexcdu4a): 288(ptr) Variable UniformConstant 289: TypePointer UniformConstant 6(float)
290: TypePointer UniformConstant 6(float) 290(c1): 289(ptr) Variable UniformConstant
291(c1): 290(ptr) Variable UniformConstant 291: TypeVector 6(float) 2
292: TypeVector 6(float) 2 292: TypePointer UniformConstant 291(fvec2)
293: TypePointer UniformConstant 292(fvec2) 293(c2): 292(ptr) Variable UniformConstant
294(c2): 293(ptr) Variable UniformConstant 294: TypePointer UniformConstant 7(fvec4)
295: TypePointer UniformConstant 7(fvec4) 295(c4): 294(ptr) Variable UniformConstant
296(c4): 295(ptr) Variable UniformConstant 296: TypePointer UniformConstant 24(int)
297: TypePointer UniformConstant 24(int) 297(o1): 296(ptr) Variable UniformConstant
298(o1): 297(ptr) Variable UniformConstant 298: TypeVector 24(int) 3
299: TypeVector 24(int) 3 299: TypePointer UniformConstant 298(ivec3)
300: TypePointer UniformConstant 299(ivec3) 300(o3): 299(ptr) Variable UniformConstant
301(o3): 300(ptr) Variable UniformConstant 301: TypePointer UniformConstant 31(ivec4)
302: TypePointer UniformConstant 31(ivec4) 302(o4): 301(ptr) Variable UniformConstant
303(o4): 302(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval001): 8(ptr) Variable Function 9(txval001): 8(ptr) Variable Function
...@@ -1131,7 +1126,7 @@ gl_FragCoord origin is upper left ...@@ -1131,7 +1126,7 @@ gl_FragCoord origin is upper left
Store 263 262 Store 263 262
265: 264(ptr) AccessChain 260(psout) 99 265: 264(ptr) AccessChain 260(psout) 99
Store 265 261 Store 265 261
269:258(PS_OUTPUT) Load 260(psout) 268:258(PS_OUTPUT) Load 260(psout)
Store 268(@entryPointOutput) 269 Store 267(@entryPointOutput) 268
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.getdimensions.dx10.frag.out
...@@ -2197,7 +2197,7 @@ gl_FragCoord origin is upper left ...@@ -2197,7 +2197,7 @@ 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 541 // Id's are bound by 540
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
...@@ -2206,7 +2206,7 @@ gl_FragCoord origin is upper left ...@@ -2206,7 +2206,7 @@ gl_FragCoord origin is upper left
Capability ImageQuery Capability ImageQuery
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 535 EntryPoint Fragment 4 "main" 534
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 8 "sizeQueryTemp" Name 8 "sizeQueryTemp"
...@@ -2294,11 +2294,8 @@ gl_FragCoord origin is upper left ...@@ -2294,11 +2294,8 @@ gl_FragCoord origin is upper left
MemberName 522(PS_OUTPUT) 0 "Color" MemberName 522(PS_OUTPUT) 0 "Color"
MemberName 522(PS_OUTPUT) 1 "Depth" MemberName 522(PS_OUTPUT) 1 "Depth"
Name 524 "psout" Name 524 "psout"
Name 533 "PS_OUTPUT" Name 534 "@entryPointOutput"
MemberName 533(PS_OUTPUT) 0 "Color" Name 539 "g_sSamp"
MemberName 533(PS_OUTPUT) 1 "Depth"
Name 535 "@entryPointOutput"
Name 540 "g_sSamp"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 29(g_tTex1di4) DescriptorSet 0
...@@ -2328,10 +2325,9 @@ gl_FragCoord origin is upper left ...@@ -2328,10 +2325,9 @@ gl_FragCoord origin is upper left
Decorate 496(g_tTex2dmsi4a) DescriptorSet 0 Decorate 496(g_tTex2dmsi4a) DescriptorSet 0
Decorate 510(g_tTex2dmsu4a) DescriptorSet 0 Decorate 510(g_tTex2dmsu4a) DescriptorSet 0
MemberDecorate 522(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 522(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 533(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 534(@entryPointOutput) Location 0
Decorate 535(@entryPointOutput) Location 0 Decorate 539(g_sSamp) DescriptorSet 0
Decorate 540(g_sSamp) DescriptorSet 0 Decorate 539(g_sSamp) Binding 0
Decorate 540(g_sSamp) Binding 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 0 6: TypeInt 32 0
...@@ -2438,12 +2434,11 @@ gl_FragCoord origin is upper left ...@@ -2438,12 +2434,11 @@ gl_FragCoord origin is upper left
528: TypePointer Function 521(fvec4) 528: TypePointer Function 521(fvec4)
530: 14(int) Constant 1 530: 14(int) Constant 1
531: TypePointer Function 9(float) 531: TypePointer Function 9(float)
533(PS_OUTPUT): TypeStruct 521(fvec4) 9(float) 533: TypePointer Output 522(PS_OUTPUT)
534: TypePointer Output 533(PS_OUTPUT) 534(@entryPointOutput): 533(ptr) Variable Output
535(@entryPointOutput): 534(ptr) Variable Output 537: TypeSampler
538: TypeSampler 538: TypePointer UniformConstant 537
539: TypePointer UniformConstant 538 539(g_sSamp): 538(ptr) Variable UniformConstant
540(g_sSamp): 539(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(sizeQueryTemp): 7(ptr) Variable Function 8(sizeQueryTemp): 7(ptr) Variable Function
...@@ -3057,7 +3052,7 @@ gl_FragCoord origin is upper left ...@@ -3057,7 +3052,7 @@ gl_FragCoord origin is upper left
Store 529 527 Store 529 527
532: 531(ptr) AccessChain 524(psout) 530 532: 531(ptr) AccessChain 524(psout) 530
Store 532 526 Store 532 526
536:522(PS_OUTPUT) Load 524(psout) 535:522(PS_OUTPUT) Load 524(psout)
Store 535(@entryPointOutput) 536 Store 534(@entryPointOutput) 535
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.getdimensions.dx10.vert.out
...@@ -97,14 +97,14 @@ Shader version: 450 ...@@ -97,14 +97,14 @@ Shader version: 450
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 43 // Id's are bound by 42
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability ImageQuery Capability ImageQuery
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 37 EntryPoint Vertex 4 "main" 36
Name 4 "main" Name 4 "main"
Name 8 "sizeQueryTemp" Name 8 "sizeQueryTemp"
Name 12 "g_tTex1df4" Name 12 "g_tTex1df4"
...@@ -114,17 +114,14 @@ Shader version: 450 ...@@ -114,17 +114,14 @@ Shader version: 450
Name 27 "VS_OUTPUT" Name 27 "VS_OUTPUT"
MemberName 27(VS_OUTPUT) 0 "Pos" MemberName 27(VS_OUTPUT) 0 "Pos"
Name 29 "vsout" Name 29 "vsout"
Name 35 "VS_OUTPUT" Name 36 "@entryPointOutput"
MemberName 35(VS_OUTPUT) 0 "Pos" Name 41 "g_sSamp"
Name 37 "@entryPointOutput"
Name 42 "g_sSamp"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
MemberDecorate 27(VS_OUTPUT) 0 BuiltIn Position MemberDecorate 27(VS_OUTPUT) 0 BuiltIn Position
MemberDecorate 35(VS_OUTPUT) 0 BuiltIn Position Decorate 36(@entryPointOutput) Location 0
Decorate 37(@entryPointOutput) Location 0 Decorate 41(g_sSamp) DescriptorSet 0
Decorate 42(g_sSamp) DescriptorSet 0 Decorate 41(g_sSamp) Binding 0
Decorate 42(g_sSamp) Binding 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 0 6: TypeInt 32 0
...@@ -142,12 +139,11 @@ Shader version: 450 ...@@ -142,12 +139,11 @@ Shader version: 450
31: 9(float) Constant 0 31: 9(float) Constant 0
32: 26(fvec4) ConstantComposite 31 31 31 31 32: 26(fvec4) ConstantComposite 31 31 31 31
33: TypePointer Function 26(fvec4) 33: TypePointer Function 26(fvec4)
35(VS_OUTPUT): TypeStruct 26(fvec4) 35: TypePointer Output 27(VS_OUTPUT)
36: TypePointer Output 35(VS_OUTPUT) 36(@entryPointOutput): 35(ptr) Variable Output
37(@entryPointOutput): 36(ptr) Variable Output 39: TypeSampler
40: TypeSampler 40: TypePointer UniformConstant 39
41: TypePointer UniformConstant 40 41(g_sSamp): 40(ptr) Variable UniformConstant
42(g_sSamp): 41(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(sizeQueryTemp): 7(ptr) Variable Function 8(sizeQueryTemp): 7(ptr) Variable Function
...@@ -170,7 +166,7 @@ Shader version: 450 ...@@ -170,7 +166,7 @@ Shader version: 450
Store 23(NumberOfLevelsU) 25 Store 23(NumberOfLevelsU) 25
34: 33(ptr) AccessChain 29(vsout) 30 34: 33(ptr) AccessChain 29(vsout) 30
Store 34 32 Store 34 32
38:27(VS_OUTPUT) Load 29(vsout) 37:27(VS_OUTPUT) Load 29(vsout)
Store 37(@entryPointOutput) 38 Store 36(@entryPointOutput) 37
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.init2.frag.out
...@@ -107,12 +107,12 @@ gl_FragCoord origin is upper left ...@@ -107,12 +107,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 47 // Id's are bound by 46
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 44 EntryPoint Fragment 4 "main" 43
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 6 "Test1(" Name 6 "Test1("
...@@ -129,10 +129,8 @@ gl_FragCoord origin is upper left ...@@ -129,10 +129,8 @@ gl_FragCoord origin is upper left
Name 34 "PS_OUTPUT" Name 34 "PS_OUTPUT"
MemberName 34(PS_OUTPUT) 0 "color" MemberName 34(PS_OUTPUT) 0 "color"
Name 36 "ps_output" Name 36 "ps_output"
Name 42 "PS_OUTPUT" Name 43 "@entryPointOutput"
MemberName 42(PS_OUTPUT) 0 "color" Decorate 43(@entryPointOutput) Location 0
Name 44 "@entryPointOutput"
Decorate 44(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
8: TypeFloat 32 8: TypeFloat 32
...@@ -162,17 +160,16 @@ gl_FragCoord origin is upper left ...@@ -162,17 +160,16 @@ gl_FragCoord origin is upper left
38: 37(int) Constant 0 38: 37(int) Constant 0
39: 33(fvec4) ConstantComposite 13 13 13 13 39: 33(fvec4) ConstantComposite 13 13 13 13
40: TypePointer Function 33(fvec4) 40: TypePointer Function 33(fvec4)
42(PS_OUTPUT): TypeStruct 33(fvec4) 42: TypePointer Output 34(PS_OUTPUT)
43: TypePointer Output 42(PS_OUTPUT) 43(@entryPointOutput): 42(ptr) Variable Output
44(@entryPointOutput): 43(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
36(ps_output): 35(ptr) Variable Function 36(ps_output): 35(ptr) Variable Function
32: 2 FunctionCall 6(Test1() 32: 2 FunctionCall 6(Test1()
41: 40(ptr) AccessChain 36(ps_output) 38 41: 40(ptr) AccessChain 36(ps_output) 38
Store 41 39 Store 41 39
45:34(PS_OUTPUT) Load 36(ps_output) 44:34(PS_OUTPUT) Load 36(ps_output)
Store 44(@entryPointOutput) 45 Store 43(@entryPointOutput) 44
Return Return
FunctionEnd FunctionEnd
6(Test1(): 2 Function None 3 6(Test1(): 2 Function None 3
......
Test/baseResults/hlsl.inoutquals.frag.out
...@@ -131,12 +131,12 @@ gl_FragCoord origin is upper left ...@@ -131,12 +131,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 57 // Id's are bound by 56
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 45 54 EntryPoint Fragment 4 "main" 45 53
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 12 "MyFunc(f1;f1;f1;" Name 12 "MyFunc(f1;f1;f1;"
...@@ -154,15 +154,11 @@ gl_FragCoord origin is upper left ...@@ -154,15 +154,11 @@ gl_FragCoord origin is upper left
MemberName 31(PS_OUTPUT) 1 "Depth" MemberName 31(PS_OUTPUT) 1 "Depth"
Name 33 "psout" Name 33 "psout"
Name 45 "inpos" Name 45 "inpos"
Name 52 "PS_OUTPUT" Name 53 "@entryPointOutput"
MemberName 52(PS_OUTPUT) 0 "Color"
MemberName 52(PS_OUTPUT) 1 "Depth"
Name 54 "@entryPointOutput"
MemberDecorate 31(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 31(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 45(inpos) NoPerspective Decorate 45(inpos) NoPerspective
Decorate 45(inpos) BuiltIn FragCoord Decorate 45(inpos) BuiltIn FragCoord
MemberDecorate 52(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 53(@entryPointOutput) Location 0
Decorate 54(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -184,9 +180,8 @@ gl_FragCoord origin is upper left ...@@ -184,9 +180,8 @@ gl_FragCoord origin is upper left
46: TypeInt 32 0 46: TypeInt 32 0
47: 46(int) Constant 3 47: 46(int) Constant 3
48: TypePointer Input 6(float) 48: TypePointer Input 6(float)
52(PS_OUTPUT): TypeStruct 30(fvec4) 6(float) 52: TypePointer Output 31(PS_OUTPUT)
53: TypePointer Output 52(PS_OUTPUT) 53(@entryPointOutput): 52(ptr) Variable Output
54(@entryPointOutput): 53(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
17(x): 7(ptr) Variable Function 17(x): 7(ptr) Variable Function
...@@ -217,8 +212,8 @@ gl_FragCoord origin is upper left ...@@ -217,8 +212,8 @@ gl_FragCoord origin is upper left
50: 6(float) Load 49 50: 6(float) Load 49
51: 7(ptr) AccessChain 33(psout) 43 51: 7(ptr) AccessChain 33(psout) 43
Store 51 50 Store 51 50
55:31(PS_OUTPUT) Load 33(psout) 54:31(PS_OUTPUT) Load 33(psout)
Store 54(@entryPointOutput) 55 Store 53(@entryPointOutput) 54
Return Return
FunctionEnd FunctionEnd
12(MyFunc(f1;f1;f1;): 2 Function None 8 12(MyFunc(f1;f1;f1;): 2 Function None 8
......
Test/baseResults/hlsl.load.2dms.dx10.frag.out
...@@ -227,14 +227,14 @@ gl_FragCoord origin is upper left ...@@ -227,14 +227,14 @@ 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 106 // Id's are bound by 105
Capability Shader Capability Shader
Capability ImageGatherExtended Capability ImageGatherExtended
Capability ImageMSArray Capability ImageMSArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 93 EntryPoint Fragment 4 "main" 92
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "g_tTex2dmsf4" Name 9 "g_tTex2dmsf4"
...@@ -250,16 +250,13 @@ gl_FragCoord origin is upper left ...@@ -250,16 +250,13 @@ gl_FragCoord origin is upper left
MemberName 80(PS_OUTPUT) 0 "Color" MemberName 80(PS_OUTPUT) 0 "Color"
MemberName 80(PS_OUTPUT) 1 "Depth" MemberName 80(PS_OUTPUT) 1 "Depth"
Name 82 "psout" Name 82 "psout"
Name 91 "PS_OUTPUT" Name 92 "@entryPointOutput"
MemberName 91(PS_OUTPUT) 0 "Color" Name 97 "g_sSamp"
MemberName 91(PS_OUTPUT) 1 "Depth" Name 99 "c1"
Name 93 "@entryPointOutput" Name 101 "c4"
Name 98 "g_sSamp" Name 102 "o1"
Name 100 "c1" Name 103 "o3"
Name 102 "c4" Name 104 "o4"
Name 103 "o1"
Name 104 "o3"
Name 105 "o4"
Decorate 9(g_tTex2dmsf4) DescriptorSet 0 Decorate 9(g_tTex2dmsf4) DescriptorSet 0
Decorate 21(g_tTex2dmsi4) DescriptorSet 0 Decorate 21(g_tTex2dmsi4) DescriptorSet 0
Decorate 29(g_tTex2dmsu4) DescriptorSet 0 Decorate 29(g_tTex2dmsu4) DescriptorSet 0
...@@ -267,10 +264,9 @@ gl_FragCoord origin is upper left ...@@ -267,10 +264,9 @@ gl_FragCoord origin is upper left
Decorate 58(g_tTex2dmsi4a) DescriptorSet 0 Decorate 58(g_tTex2dmsi4a) DescriptorSet 0
Decorate 64(g_tTex2dmsu4a) DescriptorSet 0 Decorate 64(g_tTex2dmsu4a) DescriptorSet 0
MemberDecorate 80(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 80(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 91(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 92(@entryPointOutput) Location 0
Decorate 93(@entryPointOutput) Location 0 Decorate 97(g_sSamp) DescriptorSet 0
Decorate 98(g_sSamp) DescriptorSet 0 Decorate 97(g_sSamp) Binding 0
Decorate 98(g_sSamp) Binding 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -313,19 +309,18 @@ gl_FragCoord origin is upper left ...@@ -313,19 +309,18 @@ gl_FragCoord origin is upper left
86: TypePointer Function 17(fvec4) 86: TypePointer Function 17(fvec4)
88: 11(int) Constant 1 88: 11(int) Constant 1
89: TypePointer Function 6(float) 89: TypePointer Function 6(float)
91(PS_OUTPUT): TypeStruct 17(fvec4) 6(float) 91: TypePointer Output 80(PS_OUTPUT)
92: TypePointer Output 91(PS_OUTPUT) 92(@entryPointOutput): 91(ptr) Variable Output
93(@entryPointOutput): 92(ptr) Variable Output 95: TypeSampler
96: TypeSampler 96: TypePointer UniformConstant 95
97: TypePointer UniformConstant 96 97(g_sSamp): 96(ptr) Variable UniformConstant
98(g_sSamp): 97(ptr) Variable UniformConstant 98: TypePointer UniformConstant 11(int)
99: TypePointer UniformConstant 11(int) 99(c1): 98(ptr) Variable UniformConstant
100(c1): 99(ptr) Variable UniformConstant 100: TypePointer UniformConstant 24(ivec4)
101: TypePointer UniformConstant 24(ivec4) 101(c4): 100(ptr) Variable UniformConstant
102(c4): 101(ptr) Variable UniformConstant 102(o1): 98(ptr) Variable UniformConstant
103(o1): 99(ptr) Variable UniformConstant 103(o3): 52(ptr) Variable UniformConstant
104(o3): 52(ptr) Variable UniformConstant 104(o4): 100(ptr) Variable UniformConstant
105(o4): 101(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
82(psout): 81(ptr) Variable Function 82(psout): 81(ptr) Variable Function
...@@ -375,7 +370,7 @@ gl_FragCoord origin is upper left ...@@ -375,7 +370,7 @@ gl_FragCoord origin is upper left
Store 87 85 Store 87 85
90: 89(ptr) AccessChain 82(psout) 88 90: 89(ptr) AccessChain 82(psout) 88
Store 90 84 Store 90 84
94:80(PS_OUTPUT) Load 82(psout) 93:80(PS_OUTPUT) Load 82(psout)
Store 93(@entryPointOutput) 94 Store 92(@entryPointOutput) 93
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.load.buffer.dx10.frag.out
...@@ -125,13 +125,13 @@ gl_FragCoord origin is upper left ...@@ -125,13 +125,13 @@ 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 72 // Id's are bound by 71
Capability Shader Capability Shader
Capability SampledBuffer Capability SampledBuffer
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 56 EntryPoint Fragment 4 "main" 55
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "r00" Name 9 "r00"
...@@ -145,26 +145,22 @@ gl_FragCoord origin is upper left ...@@ -145,26 +145,22 @@ gl_FragCoord origin is upper left
MemberName 44(PS_OUTPUT) 0 "Color" MemberName 44(PS_OUTPUT) 0 "Color"
MemberName 44(PS_OUTPUT) 1 "Depth" MemberName 44(PS_OUTPUT) 1 "Depth"
Name 46 "psout" Name 46 "psout"
Name 54 "PS_OUTPUT" Name 55 "@entryPointOutput"
MemberName 54(PS_OUTPUT) 0 "Color" Name 58 "g_tTexbf4_test"
MemberName 54(PS_OUTPUT) 1 "Depth" Name 61 "c2"
Name 56 "@entryPointOutput" Name 64 "c3"
Name 59 "g_tTexbf4_test" Name 66 "c4"
Name 62 "c2" Name 67 "o1"
Name 65 "c3" Name 68 "o2"
Name 67 "c4" Name 69 "o3"
Name 68 "o1" Name 70 "o4"
Name 69 "o2"
Name 70 "o3"
Name 71 "o4"
Decorate 13(g_tTexbf4) DescriptorSet 0 Decorate 13(g_tTexbf4) DescriptorSet 0
Decorate 27(g_tTexbi4) DescriptorSet 0 Decorate 27(g_tTexbi4) DescriptorSet 0
Decorate 39(g_tTexbu4) DescriptorSet 0 Decorate 39(g_tTexbu4) DescriptorSet 0
MemberDecorate 44(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 44(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 54(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 55(@entryPointOutput) Location 0
Decorate 56(@entryPointOutput) Location 0 Decorate 58(g_tTexbf4_test) DescriptorSet 0
Decorate 59(g_tTexbf4_test) DescriptorSet 0 Decorate 58(g_tTexbf4_test) Binding 0
Decorate 59(g_tTexbf4_test) Binding 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -197,22 +193,21 @@ gl_FragCoord origin is upper left ...@@ -197,22 +193,21 @@ gl_FragCoord origin is upper left
49: 7(fvec4) ConstantComposite 48 48 48 48 49: 7(fvec4) ConstantComposite 48 48 48 48
51: 15(int) Constant 1 51: 15(int) Constant 1
52: TypePointer Function 6(float) 52: TypePointer Function 6(float)
54(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 54: TypePointer Output 44(PS_OUTPUT)
55: TypePointer Output 54(PS_OUTPUT) 55(@entryPointOutput): 54(ptr) Variable Output
56(@entryPointOutput): 55(ptr) Variable Output 58(g_tTexbf4_test): 12(ptr) Variable UniformConstant
59(g_tTexbf4_test): 12(ptr) Variable UniformConstant 59: TypeVector 15(int) 2
60: TypeVector 15(int) 2 60: TypePointer UniformConstant 59(ivec2)
61: TypePointer UniformConstant 60(ivec2) 61(c2): 60(ptr) Variable UniformConstant
62(c2): 61(ptr) Variable UniformConstant 62: TypeVector 15(int) 3
63: TypeVector 15(int) 3 63: TypePointer UniformConstant 62(ivec3)
64: TypePointer UniformConstant 63(ivec3) 64(c3): 63(ptr) Variable UniformConstant
65(c3): 64(ptr) Variable UniformConstant 65: TypePointer UniformConstant 21(ivec4)
66: TypePointer UniformConstant 21(ivec4) 66(c4): 65(ptr) Variable UniformConstant
67(c4): 66(ptr) Variable UniformConstant 67(o1): 16(ptr) Variable UniformConstant
68(o1): 16(ptr) Variable UniformConstant 68(o2): 60(ptr) Variable UniformConstant
69(o2): 61(ptr) Variable UniformConstant 69(o3): 63(ptr) Variable UniformConstant
70(o3): 64(ptr) Variable UniformConstant 70(o4): 65(ptr) Variable UniformConstant
71(o4): 66(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(r00): 8(ptr) Variable Function 9(r00): 8(ptr) Variable Function
...@@ -238,7 +233,7 @@ gl_FragCoord origin is upper left ...@@ -238,7 +233,7 @@ gl_FragCoord origin is upper left
Store 50 49 Store 50 49
53: 52(ptr) AccessChain 46(psout) 51 53: 52(ptr) AccessChain 46(psout) 51
Store 53 48 Store 53 48
57:44(PS_OUTPUT) Load 46(psout) 56:44(PS_OUTPUT) Load 46(psout)
Store 56(@entryPointOutput) 57 Store 55(@entryPointOutput) 56
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.numericsuffixes.frag.out
...@@ -137,12 +137,12 @@ gl_FragCoord origin is upper left ...@@ -137,12 +137,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 44 // Id's are bound by 43
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 41 EntryPoint Fragment 4 "main" 40
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 8 "r00" Name 8 "r00"
...@@ -157,10 +157,8 @@ gl_FragCoord origin is upper left ...@@ -157,10 +157,8 @@ gl_FragCoord origin is upper left
Name 30 "PS_OUTPUT" Name 30 "PS_OUTPUT"
MemberName 30(PS_OUTPUT) 0 "color" MemberName 30(PS_OUTPUT) 0 "color"
Name 32 "ps_output" Name 32 "ps_output"
Name 39 "PS_OUTPUT" Name 40 "@entryPointOutput"
MemberName 39(PS_OUTPUT) 0 "color" Decorate 40(@entryPointOutput) Location 0
Name 41 "@entryPointOutput"
Decorate 41(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -182,9 +180,8 @@ gl_FragCoord origin is upper left ...@@ -182,9 +180,8 @@ gl_FragCoord origin is upper left
31: TypePointer Function 30(PS_OUTPUT) 31: TypePointer Function 30(PS_OUTPUT)
33: 19(int) Constant 0 33: 19(int) Constant 0
37: TypePointer Function 29(fvec4) 37: TypePointer Function 29(fvec4)
39(PS_OUTPUT): TypeStruct 29(fvec4) 39: TypePointer Output 30(PS_OUTPUT)
40: TypePointer Output 39(PS_OUTPUT) 40(@entryPointOutput): 39(ptr) Variable Output
41(@entryPointOutput): 40(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(r00): 7(ptr) Variable Function 8(r00): 7(ptr) Variable Function
...@@ -211,7 +208,7 @@ gl_FragCoord origin is upper left ...@@ -211,7 +208,7 @@ gl_FragCoord origin is upper left
36: 29(fvec4) CompositeConstruct 35 35 35 35 36: 29(fvec4) CompositeConstruct 35 35 35 35
38: 37(ptr) AccessChain 32(ps_output) 33 38: 37(ptr) AccessChain 32(ps_output) 33
Store 38 36 Store 38 36
42:30(PS_OUTPUT) Load 32(ps_output) 41:30(PS_OUTPUT) Load 32(ps_output)
Store 41(@entryPointOutput) 42 Store 40(@entryPointOutput) 41
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.pp.line.frag.out
...@@ -83,12 +83,12 @@ gl_FragCoord origin is upper left ...@@ -83,12 +83,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 31 // Id's are bound by 30
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 28 EntryPoint Fragment 4 "main" 27
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 8 "thisLineIs" Name 8 "thisLineIs"
...@@ -96,13 +96,9 @@ gl_FragCoord origin is upper left ...@@ -96,13 +96,9 @@ gl_FragCoord origin is upper left
MemberName 12(PS_OUTPUT) 0 "Color" MemberName 12(PS_OUTPUT) 0 "Color"
MemberName 12(PS_OUTPUT) 1 "Depth" MemberName 12(PS_OUTPUT) 1 "Depth"
Name 14 "psout" Name 14 "psout"
Name 26 "PS_OUTPUT" Name 27 "@entryPointOutput"
MemberName 26(PS_OUTPUT) 0 "Color"
MemberName 26(PS_OUTPUT) 1 "Depth"
Name 28 "@entryPointOutput"
MemberDecorate 12(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 12(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 26(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 27(@entryPointOutput) Location 0
Decorate 28(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 1 6: TypeInt 32 1
...@@ -118,9 +114,8 @@ gl_FragCoord origin is upper left ...@@ -118,9 +114,8 @@ gl_FragCoord origin is upper left
21: TypePointer Function 11(fvec4) 21: TypePointer Function 11(fvec4)
23: 6(int) Constant 1 23: 6(int) Constant 1
24: TypePointer Function 10(float) 24: TypePointer Function 10(float)
26(PS_OUTPUT): TypeStruct 11(fvec4) 10(float) 26: TypePointer Output 12(PS_OUTPUT)
27: TypePointer Output 26(PS_OUTPUT) 27(@entryPointOutput): 26(ptr) Variable Output
28(@entryPointOutput): 27(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(thisLineIs): 7(ptr) Variable Function 8(thisLineIs): 7(ptr) Variable Function
...@@ -133,7 +128,7 @@ gl_FragCoord origin is upper left ...@@ -133,7 +128,7 @@ gl_FragCoord origin is upper left
Store 22 20 Store 22 20
25: 24(ptr) AccessChain 14(psout) 23 25: 24(ptr) AccessChain 14(psout) 23
Store 25 19 Store 25 19
29:12(PS_OUTPUT) Load 14(psout) 28:12(PS_OUTPUT) Load 14(psout)
Store 28(@entryPointOutput) 29 Store 27(@entryPointOutput) 28
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.precise.frag.out
...@@ -61,12 +61,12 @@ gl_FragCoord origin is upper left ...@@ -61,12 +61,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 32 // Id's are bound by 31
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 27 EntryPoint Fragment 4 "main" 26
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 13 "MyFunction(f1;vf3;" Name 13 "MyFunction(f1;vf3;"
...@@ -75,11 +75,9 @@ gl_FragCoord origin is upper left ...@@ -75,11 +75,9 @@ gl_FragCoord origin is upper left
Name 16 "PS_OUTPUT" Name 16 "PS_OUTPUT"
MemberName 16(PS_OUTPUT) 0 "color" MemberName 16(PS_OUTPUT) 0 "color"
Name 18 "ps_output" Name 18 "ps_output"
Name 25 "PS_OUTPUT" Name 26 "@entryPointOutput"
MemberName 25(PS_OUTPUT) 0 "color" Name 30 "precisefloat"
Name 27 "@entryPointOutput" Decorate 26(@entryPointOutput) Location 0
Name 31 "precisefloat"
Decorate 27(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -95,18 +93,17 @@ gl_FragCoord origin is upper left ...@@ -95,18 +93,17 @@ gl_FragCoord origin is upper left
21: 6(float) Constant 1065353216 21: 6(float) Constant 1065353216
22: 15(fvec4) ConstantComposite 21 21 21 21 22: 15(fvec4) ConstantComposite 21 21 21 21
23: TypePointer Function 15(fvec4) 23: TypePointer Function 15(fvec4)
25(PS_OUTPUT): TypeStruct 15(fvec4) 25: TypePointer Output 16(PS_OUTPUT)
26: TypePointer Output 25(PS_OUTPUT) 26(@entryPointOutput): 25(ptr) Variable Output
27(@entryPointOutput): 26(ptr) Variable Output 29: TypePointer Private 6(float)
30: TypePointer Private 6(float) 30(precisefloat): 29(ptr) Variable Private
31(precisefloat): 30(ptr) Variable Private
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
18(ps_output): 17(ptr) Variable Function 18(ps_output): 17(ptr) Variable Function
24: 23(ptr) AccessChain 18(ps_output) 20 24: 23(ptr) AccessChain 18(ps_output) 20
Store 24 22 Store 24 22
28:16(PS_OUTPUT) Load 18(ps_output) 27:16(PS_OUTPUT) Load 18(ps_output)
Store 27(@entryPointOutput) 28 Store 26(@entryPointOutput) 27
Return Return
FunctionEnd FunctionEnd
13(MyFunction(f1;vf3;): 2 Function None 10 13(MyFunction(f1;vf3;): 2 Function None 10
......
Test/baseResults/hlsl.promotions.frag.out
...@@ -1033,13 +1033,13 @@ gl_FragCoord origin is upper left ...@@ -1033,13 +1033,13 @@ 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 481 // Id's are bound by 480
Capability Shader Capability Shader
Capability Float64 Capability Float64
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 478 EntryPoint Fragment 4 "main" 477
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 11 "Fn_F3(vf3;" Name 11 "Fn_F3(vf3;"
...@@ -1128,10 +1128,8 @@ gl_FragCoord origin is upper left ...@@ -1128,10 +1128,8 @@ gl_FragCoord origin is upper left
Name 471 "PS_OUTPUT" Name 471 "PS_OUTPUT"
MemberName 471(PS_OUTPUT) 0 "Color" MemberName 471(PS_OUTPUT) 0 "Color"
Name 473 "psout" Name 473 "psout"
Name 476 "PS_OUTPUT" Name 477 "@entryPointOutput"
MemberName 476(PS_OUTPUT) 0 "Color" Decorate 477(@entryPointOutput) Location 0
Name 478 "@entryPointOutput"
Decorate 478(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -1202,9 +1200,8 @@ gl_FragCoord origin is upper left ...@@ -1202,9 +1200,8 @@ gl_FragCoord origin is upper left
465: 6(float) Constant 1080452710 465: 6(float) Constant 1080452710
471(PS_OUTPUT): TypeStruct 462(fvec4) 471(PS_OUTPUT): TypeStruct 462(fvec4)
472: TypePointer Function 471(PS_OUTPUT) 472: TypePointer Function 471(PS_OUTPUT)
476(PS_OUTPUT): TypeStruct 462(fvec4) 476: TypePointer Output 471(PS_OUTPUT)
477: TypePointer Output 476(PS_OUTPUT) 477(@entryPointOutput): 476(ptr) Variable Output
478(@entryPointOutput): 477(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
252(r00): 8(ptr) Variable Function 252(r00): 8(ptr) Variable Function
...@@ -1470,8 +1467,8 @@ gl_FragCoord origin is upper left ...@@ -1470,8 +1467,8 @@ gl_FragCoord origin is upper left
474: 462(fvec4) Load 464(outval) 474: 462(fvec4) Load 464(outval)
475: 463(ptr) AccessChain 473(psout) 149 475: 463(ptr) AccessChain 473(psout) 149
Store 475 474 Store 475 474
479:471(PS_OUTPUT) Load 473(psout) 478:471(PS_OUTPUT) Load 473(psout)
Store 478(@entryPointOutput) 479 Store 477(@entryPointOutput) 478
Return Return
FunctionEnd FunctionEnd
11(Fn_F3(vf3;): 2 Function None 9 11(Fn_F3(vf3;): 2 Function None 9
......
Test/baseResults/hlsl.sample.array.dx10.frag.out
...@@ -285,14 +285,14 @@ gl_FragCoord origin is upper left ...@@ -285,14 +285,14 @@ 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 135 // Id's are bound by 134
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 131 EntryPoint Fragment 4 "main" 130
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -318,11 +318,8 @@ gl_FragCoord origin is upper left ...@@ -318,11 +318,8 @@ gl_FragCoord origin is upper left
MemberName 120(PS_OUTPUT) 0 "Color" MemberName 120(PS_OUTPUT) 0 "Color"
MemberName 120(PS_OUTPUT) 1 "Depth" MemberName 120(PS_OUTPUT) 1 "Depth"
Name 122 "psout" Name 122 "psout"
Name 129 "PS_OUTPUT" Name 130 "@entryPointOutput"
MemberName 129(PS_OUTPUT) 0 "Color" Name 133 "g_tTex1df4a"
MemberName 129(PS_OUTPUT) 1 "Depth"
Name 131 "@entryPointOutput"
Name 134 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -336,10 +333,9 @@ gl_FragCoord origin is upper left ...@@ -336,10 +333,9 @@ gl_FragCoord origin is upper left
Decorate 100(g_tTexcdi4) DescriptorSet 0 Decorate 100(g_tTexcdi4) DescriptorSet 0
Decorate 110(g_tTexcdu4) DescriptorSet 0 Decorate 110(g_tTexcdu4) DescriptorSet 0
MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 130(@entryPointOutput) Location 0
Decorate 131(@entryPointOutput) Location 0 Decorate 133(g_tTex1df4a) DescriptorSet 0
Decorate 134(g_tTex1df4a) DescriptorSet 0 Decorate 133(g_tTex1df4a) Binding 1
Decorate 134(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -417,10 +413,9 @@ gl_FragCoord origin is upper left ...@@ -417,10 +413,9 @@ gl_FragCoord origin is upper left
124: 7(fvec4) ConstantComposite 117 117 117 117 124: 7(fvec4) ConstantComposite 117 117 117 117
126: 25(int) Constant 1 126: 25(int) Constant 1
127: TypePointer Function 6(float) 127: TypePointer Function 6(float)
129(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 129: TypePointer Output 120(PS_OUTPUT)
130: TypePointer Output 129(PS_OUTPUT) 130(@entryPointOutput): 129(ptr) Variable Output
131(@entryPointOutput): 130(ptr) Variable Output 133(g_tTex1df4a): 11(ptr) Variable UniformConstant
134(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -482,7 +477,7 @@ gl_FragCoord origin is upper left ...@@ -482,7 +477,7 @@ gl_FragCoord origin is upper left
Store 125 124 Store 125 124
128: 127(ptr) AccessChain 122(psout) 126 128: 127(ptr) AccessChain 122(psout) 126
Store 128 117 Store 128 117
132:120(PS_OUTPUT) Load 122(psout) 131:120(PS_OUTPUT) Load 122(psout)
Store 131(@entryPointOutput) 132 Store 130(@entryPointOutput) 131
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.sample.basic.dx10.frag.out
...@@ -513,13 +513,13 @@ gl_FragCoord origin is upper left ...@@ -513,13 +513,13 @@ 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 187 // Id's are bound by 186
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 181 EntryPoint Fragment 4 "main" 180
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 7 "MemberTest" Name 7 "MemberTest"
...@@ -565,13 +565,10 @@ gl_FragCoord origin is upper left ...@@ -565,13 +565,10 @@ gl_FragCoord origin is upper left
MemberName 171(PS_OUTPUT) 0 "Color" MemberName 171(PS_OUTPUT) 0 "Color"
MemberName 171(PS_OUTPUT) 1 "Depth" MemberName 171(PS_OUTPUT) 1 "Depth"
Name 173 "psout" Name 173 "psout"
Name 179 "PS_OUTPUT" Name 180 "@entryPointOutput"
MemberName 179(PS_OUTPUT) 0 "Color" Name 183 "g_sSamp2d"
MemberName 179(PS_OUTPUT) 1 "Depth" Name 184 "g_sSamp2D_b"
Name 181 "@entryPointOutput" Name 185 "g_tTex1df4a"
Name 184 "g_sSamp2d"
Name 185 "g_sSamp2D_b"
Name 186 "g_tTex1df4a"
Decorate 41(g_tTex1df4) DescriptorSet 0 Decorate 41(g_tTex1df4) DescriptorSet 0
Decorate 41(g_tTex1df4) Binding 0 Decorate 41(g_tTex1df4) Binding 0
Decorate 45(g_sSamp) DescriptorSet 0 Decorate 45(g_sSamp) DescriptorSet 0
...@@ -588,12 +585,11 @@ gl_FragCoord origin is upper left ...@@ -588,12 +585,11 @@ gl_FragCoord origin is upper left
Decorate 156(g_tTexcdi4) DescriptorSet 0 Decorate 156(g_tTexcdi4) DescriptorSet 0
Decorate 165(g_tTexcdu4) DescriptorSet 0 Decorate 165(g_tTexcdu4) DescriptorSet 0
MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 179(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 180(@entryPointOutput) Location 0
Decorate 181(@entryPointOutput) Location 0 Decorate 183(g_sSamp2d) DescriptorSet 0
Decorate 184(g_sSamp2d) DescriptorSet 0 Decorate 184(g_sSamp2D_b) DescriptorSet 0
Decorate 185(g_sSamp2D_b) DescriptorSet 0 Decorate 185(g_tTex1df4a) DescriptorSet 0
Decorate 186(g_tTex1df4a) DescriptorSet 0 Decorate 185(g_tTex1df4a) Binding 1
Decorate 186(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 1 6: TypeInt 32 1
...@@ -693,12 +689,11 @@ gl_FragCoord origin is upper left ...@@ -693,12 +689,11 @@ gl_FragCoord origin is upper left
174: 35(float) Constant 1065353216 174: 35(float) Constant 1065353216
175: 36(fvec4) ConstantComposite 174 174 174 174 175: 36(fvec4) ConstantComposite 174 174 174 174
177: TypePointer Function 35(float) 177: TypePointer Function 35(float)
179(PS_OUTPUT): TypeStruct 36(fvec4) 35(float) 179: TypePointer Output 171(PS_OUTPUT)
180: TypePointer Output 179(PS_OUTPUT) 180(@entryPointOutput): 179(ptr) Variable Output
181(@entryPointOutput): 180(ptr) Variable Output 183(g_sSamp2d): 44(ptr) Variable UniformConstant
184(g_sSamp2d): 44(ptr) Variable UniformConstant 184(g_sSamp2D_b): 44(ptr) Variable UniformConstant
185(g_sSamp2D_b): 44(ptr) Variable UniformConstant 185(g_tTex1df4a): 40(ptr) Variable UniformConstant
186(g_tTex1df4a): 40(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(mtest): 8(ptr) Variable Function 9(mtest): 8(ptr) Variable Function
...@@ -803,7 +798,7 @@ gl_FragCoord origin is upper left ...@@ -803,7 +798,7 @@ gl_FragCoord origin is upper left
Store 176 175 Store 176 175
178: 177(ptr) AccessChain 173(psout) 10 178: 177(ptr) AccessChain 173(psout) 10
Store 178 174 Store 178 174
182:171(PS_OUTPUT) Load 173(psout) 181:171(PS_OUTPUT) Load 173(psout)
Store 181(@entryPointOutput) 182 Store 180(@entryPointOutput) 181
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.sample.offset.dx10.frag.out
...@@ -327,13 +327,13 @@ gl_FragCoord origin is upper left ...@@ -327,13 +327,13 @@ 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 150 // Id's are bound by 149
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 137 EntryPoint Fragment 4 "main" 136
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -359,14 +359,11 @@ gl_FragCoord origin is upper left ...@@ -359,14 +359,11 @@ gl_FragCoord origin is upper left
MemberName 127(PS_OUTPUT) 0 "Color" MemberName 127(PS_OUTPUT) 0 "Color"
MemberName 127(PS_OUTPUT) 1 "Depth" MemberName 127(PS_OUTPUT) 1 "Depth"
Name 129 "psout" Name 129 "psout"
Name 135 "PS_OUTPUT" Name 136 "@entryPointOutput"
MemberName 135(PS_OUTPUT) 0 "Color" Name 139 "g_tTex1df4a"
MemberName 135(PS_OUTPUT) 1 "Depth" Name 142 "g_tTexcdf4"
Name 137 "@entryPointOutput" Name 145 "g_tTexcdi4"
Name 140 "g_tTex1df4a" Name 148 "g_tTexcdu4"
Name 143 "g_tTexcdf4"
Name 146 "g_tTexcdi4"
Name 149 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -380,13 +377,12 @@ gl_FragCoord origin is upper left ...@@ -380,13 +377,12 @@ gl_FragCoord origin is upper left
Decorate 105(g_tTex3di4) DescriptorSet 0 Decorate 105(g_tTex3di4) DescriptorSet 0
Decorate 116(g_tTex3du4) DescriptorSet 0 Decorate 116(g_tTex3du4) DescriptorSet 0
MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 135(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 136(@entryPointOutput) Location 0
Decorate 137(@entryPointOutput) Location 0 Decorate 139(g_tTex1df4a) DescriptorSet 0
Decorate 140(g_tTex1df4a) DescriptorSet 0 Decorate 139(g_tTex1df4a) Binding 1
Decorate 140(g_tTex1df4a) Binding 1 Decorate 142(g_tTexcdf4) DescriptorSet 0
Decorate 143(g_tTexcdf4) DescriptorSet 0 Decorate 145(g_tTexcdi4) DescriptorSet 0
Decorate 146(g_tTexcdi4) DescriptorSet 0 Decorate 148(g_tTexcdu4) DescriptorSet 0
Decorate 149(g_tTexcdu4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -470,19 +466,18 @@ gl_FragCoord origin is upper left ...@@ -470,19 +466,18 @@ gl_FragCoord origin is upper left
130: 6(float) Constant 1065353216 130: 6(float) Constant 1065353216
131: 7(fvec4) ConstantComposite 130 130 130 130 131: 7(fvec4) ConstantComposite 130 130 130 130
133: TypePointer Function 6(float) 133: TypePointer Function 6(float)
135(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 135: TypePointer Output 127(PS_OUTPUT)
136: TypePointer Output 135(PS_OUTPUT) 136(@entryPointOutput): 135(ptr) Variable Output
137(@entryPointOutput): 136(ptr) Variable Output 139(g_tTex1df4a): 11(ptr) Variable UniformConstant
140(g_tTex1df4a): 11(ptr) Variable UniformConstant 140: TypeImage 6(float) Cube sampled format:Unknown
141: TypeImage 6(float) Cube sampled format:Unknown 141: TypePointer UniformConstant 140
142: TypePointer UniformConstant 141 142(g_tTexcdf4): 141(ptr) Variable UniformConstant
143(g_tTexcdf4): 142(ptr) Variable UniformConstant 143: TypeImage 21(int) Cube sampled format:Unknown
144: TypeImage 21(int) Cube sampled format:Unknown 144: TypePointer UniformConstant 143
145: TypePointer UniformConstant 144 145(g_tTexcdi4): 144(ptr) Variable UniformConstant
146(g_tTexcdi4): 145(ptr) Variable UniformConstant 146: TypeImage 36(int) Cube sampled format:Unknown
147: TypeImage 36(int) Cube sampled format:Unknown 147: TypePointer UniformConstant 146
148: TypePointer UniformConstant 147 148(g_tTexcdu4): 147(ptr) Variable UniformConstant
149(g_tTexcdu4): 148(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -544,7 +539,7 @@ gl_FragCoord origin is upper left ...@@ -544,7 +539,7 @@ gl_FragCoord origin is upper left
Store 132 131 Store 132 131
134: 133(ptr) AccessChain 129(psout) 22 134: 133(ptr) AccessChain 129(psout) 22
Store 134 130 Store 134 130
138:127(PS_OUTPUT) Load 129(psout) 137:127(PS_OUTPUT) Load 129(psout)
Store 137(@entryPointOutput) 138 Store 136(@entryPointOutput) 137
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
...@@ -237,13 +237,13 @@ gl_FragCoord origin is upper left ...@@ -237,13 +237,13 @@ 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 107 // Id's are bound by 106
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 103 EntryPoint Fragment 4 "main" 102
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -263,11 +263,8 @@ gl_FragCoord origin is upper left ...@@ -263,11 +263,8 @@ gl_FragCoord origin is upper left
MemberName 93(PS_OUTPUT) 0 "Color" MemberName 93(PS_OUTPUT) 0 "Color"
MemberName 93(PS_OUTPUT) 1 "Depth" MemberName 93(PS_OUTPUT) 1 "Depth"
Name 95 "psout" Name 95 "psout"
Name 101 "PS_OUTPUT" Name 102 "@entryPointOutput"
MemberName 101(PS_OUTPUT) 0 "Color" Name 105 "g_tTex1df4a"
MemberName 101(PS_OUTPUT) 1 "Depth"
Name 103 "@entryPointOutput"
Name 106 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -278,10 +275,9 @@ gl_FragCoord origin is upper left ...@@ -278,10 +275,9 @@ gl_FragCoord origin is upper left
Decorate 72(g_tTex2di4) DescriptorSet 0 Decorate 72(g_tTex2di4) DescriptorSet 0
Decorate 83(g_tTex2du4) DescriptorSet 0 Decorate 83(g_tTex2du4) DescriptorSet 0
MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 101(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 102(@entryPointOutput) Location 0
Decorate 103(@entryPointOutput) Location 0 Decorate 105(g_tTex1df4a) DescriptorSet 0
Decorate 106(g_tTex1df4a) DescriptorSet 0 Decorate 105(g_tTex1df4a) Binding 1
Decorate 106(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -346,10 +342,9 @@ gl_FragCoord origin is upper left ...@@ -346,10 +342,9 @@ gl_FragCoord origin is upper left
96: 6(float) Constant 1065353216 96: 6(float) Constant 1065353216
97: 7(fvec4) ConstantComposite 96 96 96 96 97: 7(fvec4) ConstantComposite 96 96 96 96
99: TypePointer Function 6(float) 99: TypePointer Function 6(float)
101(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 101: TypePointer Output 93(PS_OUTPUT)
102: TypePointer Output 101(PS_OUTPUT) 102(@entryPointOutput): 101(ptr) Variable Output
103(@entryPointOutput): 102(ptr) Variable Output 105(g_tTex1df4a): 11(ptr) Variable UniformConstant
106(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -393,7 +388,7 @@ gl_FragCoord origin is upper left ...@@ -393,7 +388,7 @@ gl_FragCoord origin is upper left
Store 98 97 Store 98 97
100: 99(ptr) AccessChain 95(psout) 39 100: 99(ptr) AccessChain 95(psout) 39
Store 100 96 Store 100 96
104:93(PS_OUTPUT) Load 95(psout) 103:93(PS_OUTPUT) Load 95(psout)
Store 103(@entryPointOutput) 104 Store 102(@entryPointOutput) 103
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplebias.array.dx10.frag.out
...@@ -321,14 +321,14 @@ gl_FragCoord origin is upper left ...@@ -321,14 +321,14 @@ 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 135 // Id's are bound by 134
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 131 EntryPoint Fragment 4 "main" 130
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -354,11 +354,8 @@ gl_FragCoord origin is upper left ...@@ -354,11 +354,8 @@ gl_FragCoord origin is upper left
MemberName 120(PS_OUTPUT) 0 "Color" MemberName 120(PS_OUTPUT) 0 "Color"
MemberName 120(PS_OUTPUT) 1 "Depth" MemberName 120(PS_OUTPUT) 1 "Depth"
Name 122 "psout" Name 122 "psout"
Name 129 "PS_OUTPUT" Name 130 "@entryPointOutput"
MemberName 129(PS_OUTPUT) 0 "Color" Name 133 "g_tTex1df4a"
MemberName 129(PS_OUTPUT) 1 "Depth"
Name 131 "@entryPointOutput"
Name 134 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -372,10 +369,9 @@ gl_FragCoord origin is upper left ...@@ -372,10 +369,9 @@ gl_FragCoord origin is upper left
Decorate 100(g_tTexcdi4) DescriptorSet 0 Decorate 100(g_tTexcdi4) DescriptorSet 0
Decorate 110(g_tTexcdu4) DescriptorSet 0 Decorate 110(g_tTexcdu4) DescriptorSet 0
MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 130(@entryPointOutput) Location 0
Decorate 131(@entryPointOutput) Location 0 Decorate 133(g_tTex1df4a) DescriptorSet 0
Decorate 134(g_tTex1df4a) DescriptorSet 0 Decorate 133(g_tTex1df4a) Binding 1
Decorate 134(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -453,10 +449,9 @@ gl_FragCoord origin is upper left ...@@ -453,10 +449,9 @@ gl_FragCoord origin is upper left
124: 7(fvec4) ConstantComposite 117 117 117 117 124: 7(fvec4) ConstantComposite 117 117 117 117
126: 26(int) Constant 1 126: 26(int) Constant 1
127: TypePointer Function 6(float) 127: TypePointer Function 6(float)
129(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 129: TypePointer Output 120(PS_OUTPUT)
130: TypePointer Output 129(PS_OUTPUT) 130(@entryPointOutput): 129(ptr) Variable Output
131(@entryPointOutput): 130(ptr) Variable Output 133(g_tTex1df4a): 11(ptr) Variable UniformConstant
134(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -518,7 +513,7 @@ gl_FragCoord origin is upper left ...@@ -518,7 +513,7 @@ gl_FragCoord origin is upper left
Store 125 124 Store 125 124
128: 127(ptr) AccessChain 122(psout) 126 128: 127(ptr) AccessChain 122(psout) 126
Store 128 117 Store 128 117
132:120(PS_OUTPUT) Load 122(psout) 131:120(PS_OUTPUT) Load 122(psout)
Store 131(@entryPointOutput) 132 Store 130(@entryPointOutput) 131
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
...@@ -387,13 +387,13 @@ gl_FragCoord origin is upper left ...@@ -387,13 +387,13 @@ 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 159 // Id's are bound by 158
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 155 EntryPoint Fragment 4 "main" 154
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -425,11 +425,8 @@ gl_FragCoord origin is upper left ...@@ -425,11 +425,8 @@ gl_FragCoord origin is upper left
MemberName 143(PS_OUTPUT) 0 "Color" MemberName 143(PS_OUTPUT) 0 "Color"
MemberName 143(PS_OUTPUT) 1 "Depth" MemberName 143(PS_OUTPUT) 1 "Depth"
Name 145 "psout" Name 145 "psout"
Name 153 "PS_OUTPUT" Name 154 "@entryPointOutput"
MemberName 153(PS_OUTPUT) 0 "Color" Name 157 "g_tTex1df4a"
MemberName 153(PS_OUTPUT) 1 "Depth"
Name 155 "@entryPointOutput"
Name 158 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -446,10 +443,9 @@ gl_FragCoord origin is upper left ...@@ -446,10 +443,9 @@ gl_FragCoord origin is upper left
Decorate 128(g_tTexcdi4) DescriptorSet 0 Decorate 128(g_tTexcdi4) DescriptorSet 0
Decorate 137(g_tTexcdu4) DescriptorSet 0 Decorate 137(g_tTexcdu4) DescriptorSet 0
MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 153(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 154(@entryPointOutput) Location 0
Decorate 155(@entryPointOutput) Location 0 Decorate 157(g_tTex1df4a) DescriptorSet 0
Decorate 158(g_tTex1df4a) DescriptorSet 0 Decorate 157(g_tTex1df4a) Binding 1
Decorate 158(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -536,10 +532,9 @@ gl_FragCoord origin is upper left ...@@ -536,10 +532,9 @@ gl_FragCoord origin is upper left
148: 7(fvec4) ConstantComposite 147 147 147 147 148: 7(fvec4) ConstantComposite 147 147 147 147
150: 23(int) Constant 1 150: 23(int) Constant 1
151: TypePointer Function 6(float) 151: TypePointer Function 6(float)
153(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 153: TypePointer Output 143(PS_OUTPUT)
154: TypePointer Output 153(PS_OUTPUT) 154(@entryPointOutput): 153(ptr) Variable Output
155(@entryPointOutput): 154(ptr) Variable Output 157(g_tTex1df4a): 11(ptr) Variable UniformConstant
158(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -619,7 +614,7 @@ gl_FragCoord origin is upper left ...@@ -619,7 +614,7 @@ gl_FragCoord origin is upper left
Store 149 148 Store 149 148
152: 151(ptr) AccessChain 145(psout) 150 152: 151(ptr) AccessChain 145(psout) 150
Store 152 147 Store 152 147
156:143(PS_OUTPUT) Load 145(psout) 155:143(PS_OUTPUT) Load 145(psout)
Store 155(@entryPointOutput) 156 Store 154(@entryPointOutput) 155
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
...@@ -363,13 +363,13 @@ gl_FragCoord origin is upper left ...@@ -363,13 +363,13 @@ 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 150 // Id's are bound by 149
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 137 EntryPoint Fragment 4 "main" 136
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -395,14 +395,11 @@ gl_FragCoord origin is upper left ...@@ -395,14 +395,11 @@ gl_FragCoord origin is upper left
MemberName 127(PS_OUTPUT) 0 "Color" MemberName 127(PS_OUTPUT) 0 "Color"
MemberName 127(PS_OUTPUT) 1 "Depth" MemberName 127(PS_OUTPUT) 1 "Depth"
Name 129 "psout" Name 129 "psout"
Name 135 "PS_OUTPUT" Name 136 "@entryPointOutput"
MemberName 135(PS_OUTPUT) 0 "Color" Name 139 "g_tTex1df4a"
MemberName 135(PS_OUTPUT) 1 "Depth" Name 142 "g_tTexcdf4"
Name 137 "@entryPointOutput" Name 145 "g_tTexcdi4"
Name 140 "g_tTex1df4a" Name 148 "g_tTexcdu4"
Name 143 "g_tTexcdf4"
Name 146 "g_tTexcdi4"
Name 149 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -416,13 +413,12 @@ gl_FragCoord origin is upper left ...@@ -416,13 +413,12 @@ gl_FragCoord origin is upper left
Decorate 105(g_tTex3di4) DescriptorSet 0 Decorate 105(g_tTex3di4) DescriptorSet 0
Decorate 116(g_tTex3du4) DescriptorSet 0 Decorate 116(g_tTex3du4) DescriptorSet 0
MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 135(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 136(@entryPointOutput) Location 0
Decorate 137(@entryPointOutput) Location 0 Decorate 139(g_tTex1df4a) DescriptorSet 0
Decorate 140(g_tTex1df4a) DescriptorSet 0 Decorate 139(g_tTex1df4a) Binding 1
Decorate 140(g_tTex1df4a) Binding 1 Decorate 142(g_tTexcdf4) DescriptorSet 0
Decorate 143(g_tTexcdf4) DescriptorSet 0 Decorate 145(g_tTexcdi4) DescriptorSet 0
Decorate 146(g_tTexcdi4) DescriptorSet 0 Decorate 148(g_tTexcdu4) DescriptorSet 0
Decorate 149(g_tTexcdu4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -506,19 +502,18 @@ gl_FragCoord origin is upper left ...@@ -506,19 +502,18 @@ gl_FragCoord origin is upper left
130: 6(float) Constant 1065353216 130: 6(float) Constant 1065353216
131: 7(fvec4) ConstantComposite 130 130 130 130 131: 7(fvec4) ConstantComposite 130 130 130 130
133: TypePointer Function 6(float) 133: TypePointer Function 6(float)
135(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 135: TypePointer Output 127(PS_OUTPUT)
136: TypePointer Output 135(PS_OUTPUT) 136(@entryPointOutput): 135(ptr) Variable Output
137(@entryPointOutput): 136(ptr) Variable Output 139(g_tTex1df4a): 11(ptr) Variable UniformConstant
140(g_tTex1df4a): 11(ptr) Variable UniformConstant 140: TypeImage 6(float) Cube sampled format:Unknown
141: TypeImage 6(float) Cube sampled format:Unknown 141: TypePointer UniformConstant 140
142: TypePointer UniformConstant 141 142(g_tTexcdf4): 141(ptr) Variable UniformConstant
143(g_tTexcdf4): 142(ptr) Variable UniformConstant 143: TypeImage 22(int) Cube sampled format:Unknown
144: TypeImage 22(int) Cube sampled format:Unknown 144: TypePointer UniformConstant 143
145: TypePointer UniformConstant 144 145(g_tTexcdi4): 144(ptr) Variable UniformConstant
146(g_tTexcdi4): 145(ptr) Variable UniformConstant 146: TypeImage 37(int) Cube sampled format:Unknown
147: TypeImage 37(int) Cube sampled format:Unknown 147: TypePointer UniformConstant 146
148: TypePointer UniformConstant 147 148(g_tTexcdu4): 147(ptr) Variable UniformConstant
149(g_tTexcdu4): 148(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -580,7 +575,7 @@ gl_FragCoord origin is upper left ...@@ -580,7 +575,7 @@ gl_FragCoord origin is upper left
Store 132 131 Store 132 131
134: 133(ptr) AccessChain 129(psout) 23 134: 133(ptr) AccessChain 129(psout) 23
Store 134 130 Store 134 130
138:127(PS_OUTPUT) Load 129(psout) 137:127(PS_OUTPUT) Load 129(psout)
Store 137(@entryPointOutput) 138 Store 136(@entryPointOutput) 137
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
...@@ -261,13 +261,13 @@ gl_FragCoord origin is upper left ...@@ -261,13 +261,13 @@ 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 107 // Id's are bound by 106
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 103 EntryPoint Fragment 4 "main" 102
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -287,11 +287,8 @@ gl_FragCoord origin is upper left ...@@ -287,11 +287,8 @@ gl_FragCoord origin is upper left
MemberName 93(PS_OUTPUT) 0 "Color" MemberName 93(PS_OUTPUT) 0 "Color"
MemberName 93(PS_OUTPUT) 1 "Depth" MemberName 93(PS_OUTPUT) 1 "Depth"
Name 95 "psout" Name 95 "psout"
Name 101 "PS_OUTPUT" Name 102 "@entryPointOutput"
MemberName 101(PS_OUTPUT) 0 "Color" Name 105 "g_tTex1df4a"
MemberName 101(PS_OUTPUT) 1 "Depth"
Name 103 "@entryPointOutput"
Name 106 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -302,10 +299,9 @@ gl_FragCoord origin is upper left ...@@ -302,10 +299,9 @@ gl_FragCoord origin is upper left
Decorate 73(g_tTex2di4) DescriptorSet 0 Decorate 73(g_tTex2di4) DescriptorSet 0
Decorate 83(g_tTex2du4) DescriptorSet 0 Decorate 83(g_tTex2du4) DescriptorSet 0
MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 101(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 102(@entryPointOutput) Location 0
Decorate 103(@entryPointOutput) Location 0 Decorate 105(g_tTex1df4a) DescriptorSet 0
Decorate 106(g_tTex1df4a) DescriptorSet 0 Decorate 105(g_tTex1df4a) Binding 1
Decorate 106(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -370,10 +366,9 @@ gl_FragCoord origin is upper left ...@@ -370,10 +366,9 @@ gl_FragCoord origin is upper left
96: 6(float) Constant 1065353216 96: 6(float) Constant 1065353216
97: 7(fvec4) ConstantComposite 96 96 96 96 97: 7(fvec4) ConstantComposite 96 96 96 96
99: TypePointer Function 6(float) 99: TypePointer Function 6(float)
101(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 101: TypePointer Output 93(PS_OUTPUT)
102: TypePointer Output 101(PS_OUTPUT) 102(@entryPointOutput): 101(ptr) Variable Output
103(@entryPointOutput): 102(ptr) Variable Output 105(g_tTex1df4a): 11(ptr) Variable UniformConstant
106(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -417,7 +412,7 @@ gl_FragCoord origin is upper left ...@@ -417,7 +412,7 @@ gl_FragCoord origin is upper left
Store 98 97 Store 98 97
100: 99(ptr) AccessChain 95(psout) 40 100: 99(ptr) AccessChain 95(psout) 40
Store 100 96 Store 100 96
104:93(PS_OUTPUT) Load 95(psout) 103:93(PS_OUTPUT) Load 95(psout)
Store 103(@entryPointOutput) 104 Store 102(@entryPointOutput) 103
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
...@@ -393,14 +393,14 @@ gl_FragCoord origin is upper left ...@@ -393,14 +393,14 @@ 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 129 // Id's are bound by 128
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 125 EntryPoint Fragment 4 "main" 124
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -426,11 +426,8 @@ gl_FragCoord origin is upper left ...@@ -426,11 +426,8 @@ gl_FragCoord origin is upper left
MemberName 113(PS_OUTPUT) 0 "Color" MemberName 113(PS_OUTPUT) 0 "Color"
MemberName 113(PS_OUTPUT) 1 "Depth" MemberName 113(PS_OUTPUT) 1 "Depth"
Name 115 "psout" Name 115 "psout"
Name 123 "PS_OUTPUT" Name 124 "@entryPointOutput"
MemberName 123(PS_OUTPUT) 0 "Color" Name 127 "g_tTex1df4a"
MemberName 123(PS_OUTPUT) 1 "Depth"
Name 125 "@entryPointOutput"
Name 128 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -444,10 +441,9 @@ gl_FragCoord origin is upper left ...@@ -444,10 +441,9 @@ gl_FragCoord origin is upper left
Decorate 98(g_tTexcdi4) DescriptorSet 0 Decorate 98(g_tTexcdi4) DescriptorSet 0
Decorate 107(g_tTexcdu4) DescriptorSet 0 Decorate 107(g_tTexcdu4) DescriptorSet 0
MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 123(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 124(@entryPointOutput) Location 0
Decorate 125(@entryPointOutput) Location 0 Decorate 127(g_tTex1df4a) DescriptorSet 0
Decorate 128(g_tTex1df4a) DescriptorSet 0 Decorate 127(g_tTex1df4a) Binding 1
Decorate 128(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -519,10 +515,9 @@ gl_FragCoord origin is upper left ...@@ -519,10 +515,9 @@ gl_FragCoord origin is upper left
118: 7(fvec4) ConstantComposite 117 117 117 117 118: 7(fvec4) ConstantComposite 117 117 117 117
120: 27(int) Constant 1 120: 27(int) Constant 1
121: TypePointer Function 6(float) 121: TypePointer Function 6(float)
123(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 123: TypePointer Output 113(PS_OUTPUT)
124: TypePointer Output 123(PS_OUTPUT) 124(@entryPointOutput): 123(ptr) Variable Output
125(@entryPointOutput): 124(ptr) Variable Output 127(g_tTex1df4a): 11(ptr) Variable UniformConstant
128(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -584,7 +579,7 @@ gl_FragCoord origin is upper left ...@@ -584,7 +579,7 @@ gl_FragCoord origin is upper left
Store 119 118 Store 119 118
122: 121(ptr) AccessChain 115(psout) 120 122: 121(ptr) AccessChain 115(psout) 120
Store 122 117 Store 122 117
126:113(PS_OUTPUT) Load 115(psout) 125:113(PS_OUTPUT) Load 115(psout)
Store 125(@entryPointOutput) 126 Store 124(@entryPointOutput) 125
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
...@@ -495,13 +495,13 @@ gl_FragCoord origin is upper left ...@@ -495,13 +495,13 @@ 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 164 // Id's are bound by 163
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 160 EntryPoint Fragment 4 "main" 159
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -533,11 +533,8 @@ gl_FragCoord origin is upper left ...@@ -533,11 +533,8 @@ gl_FragCoord origin is upper left
MemberName 148(PS_OUTPUT) 0 "Color" MemberName 148(PS_OUTPUT) 0 "Color"
MemberName 148(PS_OUTPUT) 1 "Depth" MemberName 148(PS_OUTPUT) 1 "Depth"
Name 150 "psout" Name 150 "psout"
Name 158 "PS_OUTPUT" Name 159 "@entryPointOutput"
MemberName 158(PS_OUTPUT) 0 "Color" Name 162 "g_tTex1df4a"
MemberName 158(PS_OUTPUT) 1 "Depth"
Name 160 "@entryPointOutput"
Name 163 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -554,10 +551,9 @@ gl_FragCoord origin is upper left ...@@ -554,10 +551,9 @@ gl_FragCoord origin is upper left
Decorate 133(g_tTexcdi4) DescriptorSet 0 Decorate 133(g_tTexcdi4) DescriptorSet 0
Decorate 142(g_tTexcdu4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0
MemberDecorate 148(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 148(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 158(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 159(@entryPointOutput) Location 0
Decorate 160(@entryPointOutput) Location 0 Decorate 162(g_tTex1df4a) DescriptorSet 0
Decorate 163(g_tTex1df4a) DescriptorSet 0 Decorate 162(g_tTex1df4a) Binding 1
Decorate 163(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -649,10 +645,9 @@ gl_FragCoord origin is upper left ...@@ -649,10 +645,9 @@ gl_FragCoord origin is upper left
153: 7(fvec4) ConstantComposite 152 152 152 152 153: 7(fvec4) ConstantComposite 152 152 152 152
155: 24(int) Constant 1 155: 24(int) Constant 1
156: TypePointer Function 6(float) 156: TypePointer Function 6(float)
158(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 158: TypePointer Output 148(PS_OUTPUT)
159: TypePointer Output 158(PS_OUTPUT) 159(@entryPointOutput): 158(ptr) Variable Output
160(@entryPointOutput): 159(ptr) Variable Output 162(g_tTex1df4a): 11(ptr) Variable UniformConstant
163(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -732,7 +727,7 @@ gl_FragCoord origin is upper left ...@@ -732,7 +727,7 @@ gl_FragCoord origin is upper left
Store 154 153 Store 154 153
157: 156(ptr) AccessChain 150(psout) 155 157: 156(ptr) AccessChain 150(psout) 155
Store 157 152 Store 157 152
161:148(PS_OUTPUT) Load 150(psout) 160:148(PS_OUTPUT) Load 150(psout)
Store 160(@entryPointOutput) 161 Store 159(@entryPointOutput) 160
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
...@@ -479,13 +479,13 @@ Shader version: 450 ...@@ -479,13 +479,13 @@ Shader version: 450
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 161 // Id's are bound by 160
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 157 EntryPoint Vertex 4 "main" 156
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
Name 12 "g_tTex1df4" Name 12 "g_tTex1df4"
...@@ -515,10 +515,8 @@ Shader version: 450 ...@@ -515,10 +515,8 @@ Shader version: 450
Name 148 "VS_OUTPUT" Name 148 "VS_OUTPUT"
MemberName 148(VS_OUTPUT) 0 "Pos" MemberName 148(VS_OUTPUT) 0 "Pos"
Name 150 "vsout" Name 150 "vsout"
Name 155 "VS_OUTPUT" Name 156 "@entryPointOutput"
MemberName 155(VS_OUTPUT) 0 "Pos" Name 159 "g_tTex1df4a"
Name 157 "@entryPointOutput"
Name 160 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -535,10 +533,9 @@ Shader version: 450 ...@@ -535,10 +533,9 @@ Shader version: 450
Decorate 133(g_tTexcdi4) DescriptorSet 0 Decorate 133(g_tTexcdi4) DescriptorSet 0
Decorate 142(g_tTexcdu4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0
MemberDecorate 148(VS_OUTPUT) 0 BuiltIn Position MemberDecorate 148(VS_OUTPUT) 0 BuiltIn Position
MemberDecorate 155(VS_OUTPUT) 0 BuiltIn Position Decorate 156(@entryPointOutput) Location 0
Decorate 157(@entryPointOutput) Location 0 Decorate 159(g_tTex1df4a) DescriptorSet 0
Decorate 160(g_tTex1df4a) DescriptorSet 0 Decorate 159(g_tTex1df4a) Binding 1
Decorate 160(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -628,10 +625,9 @@ Shader version: 450 ...@@ -628,10 +625,9 @@ Shader version: 450
151: 24(int) Constant 0 151: 24(int) Constant 0
152: 6(float) Constant 0 152: 6(float) Constant 0
153: 7(fvec4) ConstantComposite 152 152 152 152 153: 7(fvec4) ConstantComposite 152 152 152 152
155(VS_OUTPUT): TypeStruct 7(fvec4) 155: TypePointer Output 148(VS_OUTPUT)
156: TypePointer Output 155(VS_OUTPUT) 156(@entryPointOutput): 155(ptr) Variable Output
157(@entryPointOutput): 156(ptr) Variable Output 159(g_tTex1df4a): 11(ptr) Variable UniformConstant
160(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -709,7 +705,7 @@ Shader version: 450 ...@@ -709,7 +705,7 @@ Shader version: 450
Store 139(txval42) 147 Store 139(txval42) 147
154: 8(ptr) AccessChain 150(vsout) 151 154: 8(ptr) AccessChain 150(vsout) 151
Store 154 153 Store 154 153
158:148(VS_OUTPUT) Load 150(vsout) 157:148(VS_OUTPUT) Load 150(vsout)
Store 157(@entryPointOutput) 158 Store 156(@entryPointOutput) 157
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
...@@ -435,13 +435,13 @@ gl_FragCoord origin is upper left ...@@ -435,13 +435,13 @@ 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 155 // Id's are bound by 154
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 142 EntryPoint Fragment 4 "main" 141
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -467,14 +467,11 @@ gl_FragCoord origin is upper left ...@@ -467,14 +467,11 @@ gl_FragCoord origin is upper left
MemberName 132(PS_OUTPUT) 0 "Color" MemberName 132(PS_OUTPUT) 0 "Color"
MemberName 132(PS_OUTPUT) 1 "Depth" MemberName 132(PS_OUTPUT) 1 "Depth"
Name 134 "psout" Name 134 "psout"
Name 140 "PS_OUTPUT" Name 141 "@entryPointOutput"
MemberName 140(PS_OUTPUT) 0 "Color" Name 144 "g_tTex1df4a"
MemberName 140(PS_OUTPUT) 1 "Depth" Name 147 "g_tTexcdf4"
Name 142 "@entryPointOutput" Name 150 "g_tTexcdi4"
Name 145 "g_tTex1df4a" Name 153 "g_tTexcdu4"
Name 148 "g_tTexcdf4"
Name 151 "g_tTexcdi4"
Name 154 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -488,13 +485,12 @@ gl_FragCoord origin is upper left ...@@ -488,13 +485,12 @@ gl_FragCoord origin is upper left
Decorate 110(g_tTex3di4) DescriptorSet 0 Decorate 110(g_tTex3di4) DescriptorSet 0
Decorate 121(g_tTex3du4) DescriptorSet 0 Decorate 121(g_tTex3du4) DescriptorSet 0
MemberDecorate 132(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 132(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 141(@entryPointOutput) Location 0
Decorate 142(@entryPointOutput) Location 0 Decorate 144(g_tTex1df4a) DescriptorSet 0
Decorate 145(g_tTex1df4a) DescriptorSet 0 Decorate 144(g_tTex1df4a) Binding 1
Decorate 145(g_tTex1df4a) Binding 1 Decorate 147(g_tTexcdf4) DescriptorSet 0
Decorate 148(g_tTexcdf4) DescriptorSet 0 Decorate 150(g_tTexcdi4) DescriptorSet 0
Decorate 151(g_tTexcdi4) DescriptorSet 0 Decorate 153(g_tTexcdu4) DescriptorSet 0
Decorate 154(g_tTexcdu4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -583,19 +579,18 @@ gl_FragCoord origin is upper left ...@@ -583,19 +579,18 @@ gl_FragCoord origin is upper left
135: 6(float) Constant 1065353216 135: 6(float) Constant 1065353216
136: 7(fvec4) ConstantComposite 135 135 135 135 136: 7(fvec4) ConstantComposite 135 135 135 135
138: TypePointer Function 6(float) 138: TypePointer Function 6(float)
140(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 140: TypePointer Output 132(PS_OUTPUT)
141: TypePointer Output 140(PS_OUTPUT) 141(@entryPointOutput): 140(ptr) Variable Output
142(@entryPointOutput): 141(ptr) Variable Output 144(g_tTex1df4a): 11(ptr) Variable UniformConstant
145(g_tTex1df4a): 11(ptr) Variable UniformConstant 145: TypeImage 6(float) Cube sampled format:Unknown
146: TypeImage 6(float) Cube sampled format:Unknown 146: TypePointer UniformConstant 145
147: TypePointer UniformConstant 146 147(g_tTexcdf4): 146(ptr) Variable UniformConstant
148(g_tTexcdf4): 147(ptr) Variable UniformConstant 148: TypeImage 23(int) Cube sampled format:Unknown
149: TypeImage 23(int) Cube sampled format:Unknown 149: TypePointer UniformConstant 148
150: TypePointer UniformConstant 149 150(g_tTexcdi4): 149(ptr) Variable UniformConstant
151(g_tTexcdi4): 150(ptr) Variable UniformConstant 151: TypeImage 38(int) Cube sampled format:Unknown
152: TypeImage 38(int) Cube sampled format:Unknown 152: TypePointer UniformConstant 151
153: TypePointer UniformConstant 152 153(g_tTexcdu4): 152(ptr) Variable UniformConstant
154(g_tTexcdu4): 153(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -657,7 +652,7 @@ gl_FragCoord origin is upper left ...@@ -657,7 +652,7 @@ gl_FragCoord origin is upper left
Store 137 136 Store 137 136
139: 138(ptr) AccessChain 134(psout) 24 139: 138(ptr) AccessChain 134(psout) 24
Store 139 135 Store 139 135
143:132(PS_OUTPUT) Load 134(psout) 142:132(PS_OUTPUT) Load 134(psout)
Store 142(@entryPointOutput) 143 Store 141(@entryPointOutput) 142
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
...@@ -303,14 +303,14 @@ gl_FragCoord origin is upper left ...@@ -303,14 +303,14 @@ 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 109 // Id's are bound by 108
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 96 EntryPoint Fragment 4 "main" 95
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -330,14 +330,11 @@ gl_FragCoord origin is upper left ...@@ -330,14 +330,11 @@ gl_FragCoord origin is upper left
MemberName 86(PS_OUTPUT) 0 "Color" MemberName 86(PS_OUTPUT) 0 "Color"
MemberName 86(PS_OUTPUT) 1 "Depth" MemberName 86(PS_OUTPUT) 1 "Depth"
Name 88 "psout" Name 88 "psout"
Name 94 "PS_OUTPUT" Name 95 "@entryPointOutput"
MemberName 94(PS_OUTPUT) 0 "Color" Name 98 "g_tTex1df4a"
MemberName 94(PS_OUTPUT) 1 "Depth" Name 101 "g_tTexcdf4"
Name 96 "@entryPointOutput" Name 104 "g_tTexcdi4"
Name 99 "g_tTex1df4a" Name 107 "g_tTexcdu4"
Name 102 "g_tTexcdf4"
Name 105 "g_tTexcdi4"
Name 108 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -348,13 +345,12 @@ gl_FragCoord origin is upper left ...@@ -348,13 +345,12 @@ gl_FragCoord origin is upper left
Decorate 71(g_tTex2di4) DescriptorSet 0 Decorate 71(g_tTex2di4) DescriptorSet 0
Decorate 80(g_tTex2du4) DescriptorSet 0 Decorate 80(g_tTex2du4) DescriptorSet 0
MemberDecorate 86(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 86(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 95(@entryPointOutput) Location 0
Decorate 96(@entryPointOutput) Location 0 Decorate 98(g_tTex1df4a) DescriptorSet 0
Decorate 99(g_tTex1df4a) DescriptorSet 0 Decorate 98(g_tTex1df4a) Binding 1
Decorate 99(g_tTex1df4a) Binding 1 Decorate 101(g_tTexcdf4) DescriptorSet 0
Decorate 102(g_tTexcdf4) DescriptorSet 0 Decorate 104(g_tTexcdi4) DescriptorSet 0
Decorate 105(g_tTexcdi4) DescriptorSet 0 Decorate 107(g_tTexcdu4) DescriptorSet 0
Decorate 108(g_tTexcdu4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -412,19 +408,18 @@ gl_FragCoord origin is upper left ...@@ -412,19 +408,18 @@ gl_FragCoord origin is upper left
89: 6(float) Constant 1065353216 89: 6(float) Constant 1065353216
90: 7(fvec4) ConstantComposite 89 89 89 89 90: 7(fvec4) ConstantComposite 89 89 89 89
92: TypePointer Function 6(float) 92: TypePointer Function 6(float)
94(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 94: TypePointer Output 86(PS_OUTPUT)
95: TypePointer Output 94(PS_OUTPUT) 95(@entryPointOutput): 94(ptr) Variable Output
96(@entryPointOutput): 95(ptr) Variable Output 98(g_tTex1df4a): 11(ptr) Variable UniformConstant
99(g_tTex1df4a): 11(ptr) Variable UniformConstant 99: TypeImage 6(float) Cube array sampled format:Unknown
100: TypeImage 6(float) Cube array sampled format:Unknown 100: TypePointer UniformConstant 99
101: TypePointer UniformConstant 100 101(g_tTexcdf4): 100(ptr) Variable UniformConstant
102(g_tTexcdf4): 101(ptr) Variable UniformConstant 102: TypeImage 26(int) Cube array sampled format:Unknown
103: TypeImage 26(int) Cube array sampled format:Unknown 103: TypePointer UniformConstant 102
104: TypePointer UniformConstant 103 104(g_tTexcdi4): 103(ptr) Variable UniformConstant
105(g_tTexcdi4): 104(ptr) Variable UniformConstant 105: TypeImage 40(int) Cube array sampled format:Unknown
106: TypeImage 40(int) Cube array sampled format:Unknown 106: TypePointer UniformConstant 105
107: TypePointer UniformConstant 106 107(g_tTexcdu4): 106(ptr) Variable UniformConstant
108(g_tTexcdu4): 107(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -468,7 +463,7 @@ gl_FragCoord origin is upper left ...@@ -468,7 +463,7 @@ gl_FragCoord origin is upper left
Store 91 90 Store 91 90
93: 92(ptr) AccessChain 88(psout) 27 93: 92(ptr) AccessChain 88(psout) 27
Store 93 89 Store 93 89
97:86(PS_OUTPUT) Load 88(psout) 96:86(PS_OUTPUT) Load 88(psout)
Store 96(@entryPointOutput) 97 Store 95(@entryPointOutput) 96
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
...@@ -321,14 +321,14 @@ gl_FragCoord origin is upper left ...@@ -321,14 +321,14 @@ 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 136 // Id's are bound by 135
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
Capability SampledCubeArray Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 132 EntryPoint Fragment 4 "main" 131
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -354,11 +354,8 @@ gl_FragCoord origin is upper left ...@@ -354,11 +354,8 @@ gl_FragCoord origin is upper left
MemberName 121(PS_OUTPUT) 0 "Color" MemberName 121(PS_OUTPUT) 0 "Color"
MemberName 121(PS_OUTPUT) 1 "Depth" MemberName 121(PS_OUTPUT) 1 "Depth"
Name 123 "psout" Name 123 "psout"
Name 130 "PS_OUTPUT" Name 131 "@entryPointOutput"
MemberName 130(PS_OUTPUT) 0 "Color" Name 134 "g_tTex1df4"
MemberName 130(PS_OUTPUT) 1 "Depth"
Name 132 "@entryPointOutput"
Name 135 "g_tTex1df4"
Decorate 12(g_tTex1df4a) DescriptorSet 0 Decorate 12(g_tTex1df4a) DescriptorSet 0
Decorate 12(g_tTex1df4a) Binding 1 Decorate 12(g_tTex1df4a) Binding 1
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -372,10 +369,9 @@ gl_FragCoord origin is upper left ...@@ -372,10 +369,9 @@ gl_FragCoord origin is upper left
Decorate 101(g_tTexcdi4a) DescriptorSet 0 Decorate 101(g_tTexcdi4a) DescriptorSet 0
Decorate 111(g_tTexcdu4a) DescriptorSet 0 Decorate 111(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 121(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 121(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 130(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 131(@entryPointOutput) Location 0
Decorate 132(@entryPointOutput) Location 0 Decorate 134(g_tTex1df4) DescriptorSet 0
Decorate 135(g_tTex1df4) DescriptorSet 0 Decorate 134(g_tTex1df4) Binding 0
Decorate 135(g_tTex1df4) Binding 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -454,10 +450,9 @@ gl_FragCoord origin is upper left ...@@ -454,10 +450,9 @@ gl_FragCoord origin is upper left
125: 7(fvec4) ConstantComposite 118 118 118 118 125: 7(fvec4) ConstantComposite 118 118 118 118
127: 26(int) Constant 1 127: 26(int) Constant 1
128: TypePointer Function 6(float) 128: TypePointer Function 6(float)
130(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 130: TypePointer Output 121(PS_OUTPUT)
131: TypePointer Output 130(PS_OUTPUT) 131(@entryPointOutput): 130(ptr) Variable Output
132(@entryPointOutput): 131(ptr) Variable Output 134(g_tTex1df4): 11(ptr) Variable UniformConstant
135(g_tTex1df4): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -519,7 +514,7 @@ gl_FragCoord origin is upper left ...@@ -519,7 +514,7 @@ gl_FragCoord origin is upper left
Store 126 125 Store 126 125
129: 128(ptr) AccessChain 123(psout) 127 129: 128(ptr) AccessChain 123(psout) 127
Store 129 118 Store 129 118
133:121(PS_OUTPUT) Load 123(psout) 132:121(PS_OUTPUT) Load 123(psout)
Store 132(@entryPointOutput) 133 Store 131(@entryPointOutput) 132
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
...@@ -389,13 +389,13 @@ gl_FragCoord origin is upper left ...@@ -389,13 +389,13 @@ 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 161 // Id's are bound by 160
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 156 EntryPoint Fragment 4 "main" 155
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -427,12 +427,9 @@ gl_FragCoord origin is upper left ...@@ -427,12 +427,9 @@ gl_FragCoord origin is upper left
MemberName 144(PS_OUTPUT) 0 "Color" MemberName 144(PS_OUTPUT) 0 "Color"
MemberName 144(PS_OUTPUT) 1 "Depth" MemberName 144(PS_OUTPUT) 1 "Depth"
Name 146 "psout" Name 146 "psout"
Name 154 "PS_OUTPUT" Name 155 "@entryPointOutput"
MemberName 154(PS_OUTPUT) 0 "Color" Name 158 "g_sSamp2d"
MemberName 154(PS_OUTPUT) 1 "Depth" Name 159 "g_tTex1df4a"
Name 156 "@entryPointOutput"
Name 159 "g_sSamp2d"
Name 160 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -449,11 +446,10 @@ gl_FragCoord origin is upper left ...@@ -449,11 +446,10 @@ gl_FragCoord origin is upper left
Decorate 129(g_tTexcdi4) DescriptorSet 0 Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0 Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 154(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 155(@entryPointOutput) Location 0
Decorate 156(@entryPointOutput) Location 0 Decorate 158(g_sSamp2d) DescriptorSet 0
Decorate 159(g_sSamp2d) DescriptorSet 0 Decorate 159(g_tTex1df4a) DescriptorSet 0
Decorate 160(g_tTex1df4a) DescriptorSet 0 Decorate 159(g_tTex1df4a) Binding 1
Decorate 160(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -541,11 +537,10 @@ gl_FragCoord origin is upper left ...@@ -541,11 +537,10 @@ gl_FragCoord origin is upper left
149: 7(fvec4) ConstantComposite 148 148 148 148 149: 7(fvec4) ConstantComposite 148 148 148 148
151: 23(int) Constant 1 151: 23(int) Constant 1
152: TypePointer Function 6(float) 152: TypePointer Function 6(float)
154(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 154: TypePointer Output 144(PS_OUTPUT)
155: TypePointer Output 154(PS_OUTPUT) 155(@entryPointOutput): 154(ptr) Variable Output
156(@entryPointOutput): 155(ptr) Variable Output 158(g_sSamp2d): 15(ptr) Variable UniformConstant
159(g_sSamp2d): 15(ptr) Variable UniformConstant 159(g_tTex1df4a): 11(ptr) Variable UniformConstant
160(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -625,7 +620,7 @@ gl_FragCoord origin is upper left ...@@ -625,7 +620,7 @@ gl_FragCoord origin is upper left
Store 150 149 Store 150 149
153: 152(ptr) AccessChain 146(psout) 151 153: 152(ptr) AccessChain 146(psout) 151
Store 153 148 Store 153 148
157:144(PS_OUTPUT) Load 146(psout) 156:144(PS_OUTPUT) Load 146(psout)
Store 156(@entryPointOutput) 157 Store 155(@entryPointOutput) 156
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
...@@ -371,13 +371,13 @@ Shader version: 450 ...@@ -371,13 +371,13 @@ Shader version: 450
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 157 // Id's are bound by 156
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 153 EntryPoint Vertex 4 "main" 152
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
Name 12 "g_tTex1df4" Name 12 "g_tTex1df4"
...@@ -407,10 +407,8 @@ Shader version: 450 ...@@ -407,10 +407,8 @@ Shader version: 450
Name 144 "VS_OUTPUT" Name 144 "VS_OUTPUT"
MemberName 144(VS_OUTPUT) 0 "Pos" MemberName 144(VS_OUTPUT) 0 "Pos"
Name 146 "vsout" Name 146 "vsout"
Name 151 "VS_OUTPUT" Name 152 "@entryPointOutput"
MemberName 151(VS_OUTPUT) 0 "Pos" Name 155 "g_tTex1df4a"
Name 153 "@entryPointOutput"
Name 156 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -427,10 +425,9 @@ Shader version: 450 ...@@ -427,10 +425,9 @@ Shader version: 450
Decorate 129(g_tTexcdi4) DescriptorSet 0 Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0 Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(VS_OUTPUT) 0 BuiltIn Position MemberDecorate 144(VS_OUTPUT) 0 BuiltIn Position
MemberDecorate 151(VS_OUTPUT) 0 BuiltIn Position Decorate 152(@entryPointOutput) Location 0
Decorate 153(@entryPointOutput) Location 0 Decorate 155(g_tTex1df4a) DescriptorSet 0
Decorate 156(g_tTex1df4a) DescriptorSet 0 Decorate 155(g_tTex1df4a) Binding 1
Decorate 156(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -516,10 +513,9 @@ Shader version: 450 ...@@ -516,10 +513,9 @@ Shader version: 450
147: 23(int) Constant 0 147: 23(int) Constant 0
148: 6(float) Constant 0 148: 6(float) Constant 0
149: 7(fvec4) ConstantComposite 148 148 148 148 149: 7(fvec4) ConstantComposite 148 148 148 148
151(VS_OUTPUT): TypeStruct 7(fvec4) 151: TypePointer Output 144(VS_OUTPUT)
152: TypePointer Output 151(VS_OUTPUT) 152(@entryPointOutput): 151(ptr) Variable Output
153(@entryPointOutput): 152(ptr) Variable Output 155(g_tTex1df4a): 11(ptr) Variable UniformConstant
156(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -597,7 +593,7 @@ Shader version: 450 ...@@ -597,7 +593,7 @@ Shader version: 450
Store 135(txval42) 143 Store 135(txval42) 143
150: 8(ptr) AccessChain 146(vsout) 147 150: 8(ptr) AccessChain 146(vsout) 147
Store 150 149 Store 150 149
154:144(VS_OUTPUT) Load 146(vsout) 153:144(VS_OUTPUT) Load 146(vsout)
Store 153(@entryPointOutput) 154 Store 152(@entryPointOutput) 153
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
...@@ -363,13 +363,13 @@ gl_FragCoord origin is upper left ...@@ -363,13 +363,13 @@ 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 151 // Id's are bound by 150
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 138 EntryPoint Fragment 4 "main" 137
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -395,14 +395,11 @@ gl_FragCoord origin is upper left ...@@ -395,14 +395,11 @@ gl_FragCoord origin is upper left
MemberName 128(PS_OUTPUT) 0 "Color" MemberName 128(PS_OUTPUT) 0 "Color"
MemberName 128(PS_OUTPUT) 1 "Depth" MemberName 128(PS_OUTPUT) 1 "Depth"
Name 130 "psout" Name 130 "psout"
Name 136 "PS_OUTPUT" Name 137 "@entryPointOutput"
MemberName 136(PS_OUTPUT) 0 "Color" Name 140 "g_tTex1df4a"
MemberName 136(PS_OUTPUT) 1 "Depth" Name 143 "g_tTexcdf4"
Name 138 "@entryPointOutput" Name 146 "g_tTexcdi4"
Name 141 "g_tTex1df4a" Name 149 "g_tTexcdu4"
Name 144 "g_tTexcdf4"
Name 147 "g_tTexcdi4"
Name 150 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -416,13 +413,12 @@ gl_FragCoord origin is upper left ...@@ -416,13 +413,12 @@ gl_FragCoord origin is upper left
Decorate 106(g_tTex3di4) DescriptorSet 0 Decorate 106(g_tTex3di4) DescriptorSet 0
Decorate 117(g_tTex3du4) DescriptorSet 0 Decorate 117(g_tTex3du4) DescriptorSet 0
MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 136(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 137(@entryPointOutput) Location 0
Decorate 138(@entryPointOutput) Location 0 Decorate 140(g_tTex1df4a) DescriptorSet 0
Decorate 141(g_tTex1df4a) DescriptorSet 0 Decorate 140(g_tTex1df4a) Binding 1
Decorate 141(g_tTex1df4a) Binding 1 Decorate 143(g_tTexcdf4) DescriptorSet 0
Decorate 144(g_tTexcdf4) DescriptorSet 0 Decorate 146(g_tTexcdi4) DescriptorSet 0
Decorate 147(g_tTexcdi4) DescriptorSet 0 Decorate 149(g_tTexcdu4) DescriptorSet 0
Decorate 150(g_tTexcdu4) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -507,19 +503,18 @@ gl_FragCoord origin is upper left ...@@ -507,19 +503,18 @@ gl_FragCoord origin is upper left
131: 6(float) Constant 1065353216 131: 6(float) Constant 1065353216
132: 7(fvec4) ConstantComposite 131 131 131 131 132: 7(fvec4) ConstantComposite 131 131 131 131
134: TypePointer Function 6(float) 134: TypePointer Function 6(float)
136(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 136: TypePointer Output 128(PS_OUTPUT)
137: TypePointer Output 136(PS_OUTPUT) 137(@entryPointOutput): 136(ptr) Variable Output
138(@entryPointOutput): 137(ptr) Variable Output 140(g_tTex1df4a): 11(ptr) Variable UniformConstant
141(g_tTex1df4a): 11(ptr) Variable UniformConstant 141: TypeImage 6(float) Cube sampled format:Unknown
142: TypeImage 6(float) Cube sampled format:Unknown 142: TypePointer UniformConstant 141
143: TypePointer UniformConstant 142 143(g_tTexcdf4): 142(ptr) Variable UniformConstant
144(g_tTexcdf4): 143(ptr) Variable UniformConstant 144: TypeImage 22(int) Cube sampled format:Unknown
145: TypeImage 22(int) Cube sampled format:Unknown 145: TypePointer UniformConstant 144
146: TypePointer UniformConstant 145 146(g_tTexcdi4): 145(ptr) Variable UniformConstant
147(g_tTexcdi4): 146(ptr) Variable UniformConstant 147: TypeImage 37(int) Cube sampled format:Unknown
148: TypeImage 37(int) Cube sampled format:Unknown 148: TypePointer UniformConstant 147
149: TypePointer UniformConstant 148 149(g_tTexcdu4): 148(ptr) Variable UniformConstant
150(g_tTexcdu4): 149(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -581,7 +576,7 @@ gl_FragCoord origin is upper left ...@@ -581,7 +576,7 @@ gl_FragCoord origin is upper left
Store 133 132 Store 133 132
135: 134(ptr) AccessChain 130(psout) 23 135: 134(ptr) AccessChain 130(psout) 23
Store 135 131 Store 135 131
139:128(PS_OUTPUT) Load 130(psout) 138:128(PS_OUTPUT) Load 130(psout)
Store 138(@entryPointOutput) 139 Store 137(@entryPointOutput) 138
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
...@@ -261,13 +261,13 @@ gl_FragCoord origin is upper left ...@@ -261,13 +261,13 @@ 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 108 // Id's are bound by 107
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 104 EntryPoint Fragment 4 "main" 103
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 9 "txval10" Name 9 "txval10"
...@@ -287,11 +287,8 @@ gl_FragCoord origin is upper left ...@@ -287,11 +287,8 @@ gl_FragCoord origin is upper left
MemberName 94(PS_OUTPUT) 0 "Color" MemberName 94(PS_OUTPUT) 0 "Color"
MemberName 94(PS_OUTPUT) 1 "Depth" MemberName 94(PS_OUTPUT) 1 "Depth"
Name 96 "psout" Name 96 "psout"
Name 102 "PS_OUTPUT" Name 103 "@entryPointOutput"
MemberName 102(PS_OUTPUT) 0 "Color" Name 106 "g_tTex1df4a"
MemberName 102(PS_OUTPUT) 1 "Depth"
Name 104 "@entryPointOutput"
Name 107 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0 Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0
...@@ -302,10 +299,9 @@ gl_FragCoord origin is upper left ...@@ -302,10 +299,9 @@ gl_FragCoord origin is upper left
Decorate 73(g_tTex2di4) DescriptorSet 0 Decorate 73(g_tTex2di4) DescriptorSet 0
Decorate 84(g_tTex2du4) DescriptorSet 0 Decorate 84(g_tTex2du4) DescriptorSet 0
MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 102(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 103(@entryPointOutput) Location 0
Decorate 104(@entryPointOutput) Location 0 Decorate 106(g_tTex1df4a) DescriptorSet 0
Decorate 107(g_tTex1df4a) DescriptorSet 0 Decorate 106(g_tTex1df4a) Binding 1
Decorate 107(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -371,10 +367,9 @@ gl_FragCoord origin is upper left ...@@ -371,10 +367,9 @@ gl_FragCoord origin is upper left
97: 6(float) Constant 1065353216 97: 6(float) Constant 1065353216
98: 7(fvec4) ConstantComposite 97 97 97 97 98: 7(fvec4) ConstantComposite 97 97 97 97
100: TypePointer Function 6(float) 100: TypePointer Function 6(float)
102(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) 102: TypePointer Output 94(PS_OUTPUT)
103: TypePointer Output 102(PS_OUTPUT) 103(@entryPointOutput): 102(ptr) Variable Output
104(@entryPointOutput): 103(ptr) Variable Output 106(g_tTex1df4a): 11(ptr) Variable UniformConstant
107(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(txval10): 8(ptr) Variable Function 9(txval10): 8(ptr) Variable Function
...@@ -418,7 +413,7 @@ gl_FragCoord origin is upper left ...@@ -418,7 +413,7 @@ gl_FragCoord origin is upper left
Store 99 98 Store 99 98
101: 100(ptr) AccessChain 96(psout) 40 101: 100(ptr) AccessChain 96(psout) 40
Store 101 97 Store 101 97
105:94(PS_OUTPUT) Load 96(psout) 104:94(PS_OUTPUT) Load 96(psout)
Store 104(@entryPointOutput) 105 Store 103(@entryPointOutput) 104
Return Return
FunctionEnd FunctionEnd
Test/baseResults/hlsl.semicolons.frag.out
...@@ -59,12 +59,12 @@ gl_FragCoord origin is upper left ...@@ -59,12 +59,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 26 // Id's are bound by 25
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 23 EntryPoint Fragment 4 "main" 22
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 6 "MyFunc(" Name 6 "MyFunc("
...@@ -72,10 +72,8 @@ gl_FragCoord origin is upper left ...@@ -72,10 +72,8 @@ gl_FragCoord origin is upper left
Name 12 "PS_OUTPUT" Name 12 "PS_OUTPUT"
MemberName 12(PS_OUTPUT) 0 "color" MemberName 12(PS_OUTPUT) 0 "color"
Name 14 "ps_output" Name 14 "ps_output"
Name 21 "PS_OUTPUT" Name 22 "@entryPointOutput"
MemberName 21(PS_OUTPUT) 0 "color" Decorate 22(@entryPointOutput) Location 0
Name 23 "@entryPointOutput"
Decorate 23(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
10: TypeFloat 32 10: TypeFloat 32
...@@ -87,16 +85,15 @@ gl_FragCoord origin is upper left ...@@ -87,16 +85,15 @@ gl_FragCoord origin is upper left
17: 10(float) Constant 1065353216 17: 10(float) Constant 1065353216
18: 11(fvec4) ConstantComposite 17 17 17 17 18: 11(fvec4) ConstantComposite 17 17 17 17
19: TypePointer Function 11(fvec4) 19: TypePointer Function 11(fvec4)
21(PS_OUTPUT): TypeStruct 11(fvec4) 21: TypePointer Output 12(PS_OUTPUT)
22: TypePointer Output 21(PS_OUTPUT) 22(@entryPointOutput): 21(ptr) Variable Output
23(@entryPointOutput): 22(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
14(ps_output): 13(ptr) Variable Function 14(ps_output): 13(ptr) Variable Function
20: 19(ptr) AccessChain 14(ps_output) 16 20: 19(ptr) AccessChain 14(ps_output) 16
Store 20 18 Store 20 18
24:12(PS_OUTPUT) Load 14(ps_output) 23:12(PS_OUTPUT) Load 14(ps_output)
Store 23(@entryPointOutput) 24 Store 22(@entryPointOutput) 23
Return Return
FunctionEnd FunctionEnd
6(MyFunc(): 2 Function None 3 6(MyFunc(): 2 Function None 3
......
Test/baseResults/hlsl.stringtoken.frag.out
...@@ -55,24 +55,22 @@ gl_FragCoord origin is upper left ...@@ -55,24 +55,22 @@ 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 28 // Id's are bound by 27
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 20 EntryPoint Fragment 4 "main" 19
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 8 "PS_OUTPUT" Name 8 "PS_OUTPUT"
MemberName 8(PS_OUTPUT) 0 "Color" MemberName 8(PS_OUTPUT) 0 "Color"
Name 10 "psout" Name 10 "psout"
Name 18 "PS_OUTPUT" Name 19 "@entryPointOutput"
MemberName 18(PS_OUTPUT) 0 "Color" Name 24 "TestTexture"
Name 20 "@entryPointOutput" Name 26 "TestUF"
Name 25 "TestTexture" Decorate 19(@entryPointOutput) Location 0
Name 27 "TestUF" Decorate 24(TestTexture) DescriptorSet 0
Decorate 20(@entryPointOutput) Location 0
Decorate 25(TestTexture) DescriptorSet 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -85,20 +83,19 @@ gl_FragCoord origin is upper left ...@@ -85,20 +83,19 @@ gl_FragCoord origin is upper left
14: 6(float) Constant 1065353216 14: 6(float) Constant 1065353216
15: 7(fvec4) ConstantComposite 13 13 13 14 15: 7(fvec4) ConstantComposite 13 13 13 14
16: TypePointer Function 7(fvec4) 16: TypePointer Function 7(fvec4)
18(PS_OUTPUT): TypeStruct 7(fvec4) 18: TypePointer Output 8(PS_OUTPUT)
19: TypePointer Output 18(PS_OUTPUT) 19(@entryPointOutput): 18(ptr) Variable Output
20(@entryPointOutput): 19(ptr) Variable Output 22: TypeImage 6(float) 2D sampled format:Unknown
23: TypeImage 6(float) 2D sampled format:Unknown 23: TypePointer UniformConstant 22
24: TypePointer UniformConstant 23 24(TestTexture): 23(ptr) Variable UniformConstant
25(TestTexture): 24(ptr) Variable UniformConstant 25: TypePointer UniformConstant 7(fvec4)
26: TypePointer UniformConstant 7(fvec4) 26(TestUF): 25(ptr) Variable UniformConstant
27(TestUF): 26(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
10(psout): 9(ptr) Variable Function 10(psout): 9(ptr) Variable Function
17: 16(ptr) AccessChain 10(psout) 12 17: 16(ptr) AccessChain 10(psout) 12
Store 17 15 Store 17 15
21:8(PS_OUTPUT) Load 10(psout) 20:8(PS_OUTPUT) Load 10(psout)
Store 20(@entryPointOutput) 21 Store 19(@entryPointOutput) 20
Return Return
FunctionEnd FunctionEnd
Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
...@@ -31,7 +31,6 @@ Linked fragment stage: ...@@ -31,7 +31,6 @@ Linked fragment stage:
Decorate 3805 DescriptorSet 0 Decorate 3805 DescriptorSet 0
Decorate 3869 DescriptorSet 0 Decorate 3869 DescriptorSet 0
MemberDecorate 1032 1 BuiltIn FragDepth MemberDecorate 1032 1 BuiltIn FragDepth
MemberDecorate 1033 1 BuiltIn FragDepth
Decorate 4045 Location 0 Decorate 4045 Location 0
8: TypeVoid 8: TypeVoid
1282: TypeFunction 8 1282: TypeFunction 8
...@@ -130,8 +129,7 @@ Linked fragment stage: ...@@ -130,8 +129,7 @@ Linked fragment stage:
138: 13(float) Constant 1065353216 138: 13(float) Constant 1065353216
1284: 29(fvec4) ConstantComposite 138 138 138 138 1284: 29(fvec4) ConstantComposite 138 138 138 138
650: TypePointer Function 13(float) 650: TypePointer Function 13(float)
1033: TypeStruct 29(fvec4) 13(float) 1670: TypePointer Output 1032(struct)
1670: TypePointer Output 1033(struct)
4045: 1670(ptr) Variable Output 4045: 1670(ptr) Variable Output
5663: 8 Function None 1282 5663: 8 Function None 1282
24915: Label 24915: Label
......
Test/baseResults/remap.hlsl.sample.basic.none.frag.out
...@@ -7,13 +7,13 @@ Linked fragment stage: ...@@ -7,13 +7,13 @@ Linked fragment stage:
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 186 // Id's are bound by 185
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 181 EntryPoint Fragment 4 "main" 180
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Name 4 "main" Name 4 "main"
Name 7 "MemberTest" Name 7 "MemberTest"
...@@ -59,13 +59,10 @@ Linked fragment stage: ...@@ -59,13 +59,10 @@ Linked fragment stage:
MemberName 171(PS_OUTPUT) 0 "Color" MemberName 171(PS_OUTPUT) 0 "Color"
MemberName 171(PS_OUTPUT) 1 "Depth" MemberName 171(PS_OUTPUT) 1 "Depth"
Name 173 "psout" Name 173 "psout"
Name 179 "PS_OUTPUT" Name 180 "@entryPointOutput"
MemberName 179(PS_OUTPUT) 0 "Color" Name 182 "g_sSamp2d"
MemberName 179(PS_OUTPUT) 1 "Depth" Name 183 "g_sSamp2D_b"
Name 181 "@entryPointOutput" Name 184 "g_tTex1df4a"
Name 183 "g_sSamp2d"
Name 184 "g_sSamp2D_b"
Name 185 "g_tTex1df4a"
Decorate 41(g_tTex1df4) DescriptorSet 0 Decorate 41(g_tTex1df4) DescriptorSet 0
Decorate 41(g_tTex1df4) Binding 0 Decorate 41(g_tTex1df4) Binding 0
Decorate 45(g_sSamp) DescriptorSet 0 Decorate 45(g_sSamp) DescriptorSet 0
...@@ -82,12 +79,11 @@ Linked fragment stage: ...@@ -82,12 +79,11 @@ Linked fragment stage:
Decorate 156(g_tTexcdi4) DescriptorSet 0 Decorate 156(g_tTexcdi4) DescriptorSet 0
Decorate 165(g_tTexcdu4) DescriptorSet 0 Decorate 165(g_tTexcdu4) DescriptorSet 0
MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth
MemberDecorate 179(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 180(@entryPointOutput) Location 0
Decorate 181(@entryPointOutput) Location 0 Decorate 182(g_sSamp2d) DescriptorSet 0
Decorate 183(g_sSamp2d) DescriptorSet 0 Decorate 183(g_sSamp2D_b) DescriptorSet 0
Decorate 184(g_sSamp2D_b) DescriptorSet 0 Decorate 184(g_tTex1df4a) DescriptorSet 0
Decorate 185(g_tTex1df4a) DescriptorSet 0 Decorate 184(g_tTex1df4a) Binding 1
Decorate 185(g_tTex1df4a) Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 1 6: TypeInt 32 1
...@@ -187,12 +183,11 @@ Linked fragment stage: ...@@ -187,12 +183,11 @@ Linked fragment stage:
174: 35(float) Constant 1065353216 174: 35(float) Constant 1065353216
175: 36(fvec4) ConstantComposite 174 174 174 174 175: 36(fvec4) ConstantComposite 174 174 174 174
177: TypePointer Function 35(float) 177: TypePointer Function 35(float)
179(PS_OUTPUT): TypeStruct 36(fvec4) 35(float) 179: TypePointer Output 171(PS_OUTPUT)
180: TypePointer Output 179(PS_OUTPUT) 180(@entryPointOutput): 179(ptr) Variable Output
181(@entryPointOutput): 180(ptr) Variable Output 182(g_sSamp2d): 44(ptr) Variable UniformConstant
183(g_sSamp2d): 44(ptr) Variable UniformConstant 183(g_sSamp2D_b): 44(ptr) Variable UniformConstant
184(g_sSamp2D_b): 44(ptr) Variable UniformConstant 184(g_tTex1df4a): 40(ptr) Variable UniformConstant
185(g_tTex1df4a): 40(ptr) Variable UniformConstant
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
9(mtest): 8(ptr) Variable Function 9(mtest): 8(ptr) Variable Function
...@@ -297,7 +292,7 @@ Linked fragment stage: ...@@ -297,7 +292,7 @@ Linked fragment stage:
Store 176 175 Store 176 175
178: 177(ptr) AccessChain 173(psout) 10 178: 177(ptr) AccessChain 173(psout) 10
Store 178 174 Store 178 174
182:171(PS_OUTPUT) Load 173(psout) 181:171(PS_OUTPUT) Load 173(psout)
Store 181(@entryPointOutput) 182 Store 180(@entryPointOutput) 181
Return Return
FunctionEnd FunctionEnd
Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
...@@ -7,13 +7,13 @@ Linked fragment stage: ...@@ -7,13 +7,13 @@ Linked fragment stage:
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 186 // Id's are bound by 185
Capability Shader Capability Shader
Capability Sampled1D Capability Sampled1D
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 181 EntryPoint Fragment 4 "main" 180
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Decorate 41 DescriptorSet 0 Decorate 41 DescriptorSet 0
Decorate 41 Binding 0 Decorate 41 Binding 0
...@@ -31,12 +31,11 @@ Linked fragment stage: ...@@ -31,12 +31,11 @@ Linked fragment stage:
Decorate 156 DescriptorSet 0 Decorate 156 DescriptorSet 0
Decorate 165 DescriptorSet 0 Decorate 165 DescriptorSet 0
MemberDecorate 171 1 BuiltIn FragDepth MemberDecorate 171 1 BuiltIn FragDepth
MemberDecorate 179 1 BuiltIn FragDepth Decorate 180 Location 0
Decorate 181 Location 0 Decorate 182 DescriptorSet 0
Decorate 183 DescriptorSet 0 Decorate 183 DescriptorSet 0
Decorate 184 DescriptorSet 0 Decorate 184 DescriptorSet 0
Decorate 185 DescriptorSet 0 Decorate 184 Binding 1
Decorate 185 Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 1 6: TypeInt 32 1
...@@ -136,12 +135,11 @@ Linked fragment stage: ...@@ -136,12 +135,11 @@ Linked fragment stage:
174: 35(float) Constant 1065353216 174: 35(float) Constant 1065353216
175: 36(fvec4) ConstantComposite 174 174 174 174 175: 36(fvec4) ConstantComposite 174 174 174 174
177: TypePointer Function 35(float) 177: TypePointer Function 35(float)
179: TypeStruct 36(fvec4) 35(float) 179: TypePointer Output 171(struct)
180: TypePointer Output 179(struct) 180: 179(ptr) Variable Output
181: 180(ptr) Variable Output 182: 44(ptr) Variable UniformConstant
183: 44(ptr) Variable UniformConstant 183: 44(ptr) Variable UniformConstant
184: 44(ptr) Variable UniformConstant 184: 40(ptr) Variable UniformConstant
185: 40(ptr) Variable UniformConstant
4: 2 Function None 3 4: 2 Function None 3
5: Label 5: Label
9: 8(ptr) Variable Function 9: 8(ptr) Variable Function
...@@ -246,7 +244,7 @@ Linked fragment stage: ...@@ -246,7 +244,7 @@ Linked fragment stage:
Store 176 175 Store 176 175
178: 177(ptr) AccessChain 173 10 178: 177(ptr) AccessChain 173 10
Store 178 174 Store 178 174
182: 171(struct) Load 173 181: 171(struct) Load 173
Store 181 182 Store 180 181
Return Return
FunctionEnd FunctionEnd
Test/baseResults/spv.450.tesc.out
...@@ -7,12 +7,12 @@ Linked tessellation control stage: ...@@ -7,12 +7,12 @@ Linked tessellation control stage:
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 24 // Id's are bound by 23
Capability Tessellation Capability Tessellation
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint TessellationControl 4 "main" 9 16 20 23 EntryPoint TessellationControl 4 "main" 9 16 19 22
ExecutionMode 4 OutputVertices 4 ExecutionMode 4 OutputVertices 4
Source GLSL 450 Source GLSL 450
Name 4 "main" Name 4 "main"
...@@ -25,42 +25,39 @@ Linked tessellation control stage: ...@@ -25,42 +25,39 @@ Linked tessellation control stage:
MemberName 11(TheBlock) 1 "bMem2" MemberName 11(TheBlock) 1 "bMem2"
MemberName 11(TheBlock) 2 "s" MemberName 11(TheBlock) 2 "s"
Name 16 "tcBlock" Name 16 "tcBlock"
Name 17 "S" Name 17 "SingleBlock"
MemberName 17(S) 0 "sMem1" MemberName 17(SingleBlock) 0 "bMem1"
MemberName 17(S) 1 "sMem2" MemberName 17(SingleBlock) 1 "bMem2"
Name 18 "SingleBlock" MemberName 17(SingleBlock) 2 "s"
MemberName 18(SingleBlock) 0 "bMem1" Name 19 "singleBlock"
MemberName 18(SingleBlock) 1 "bMem2" Name 20 "bn"
MemberName 18(SingleBlock) 2 "s" MemberName 20(bn) 0 "v1"
Name 20 "singleBlock" MemberName 20(bn) 1 "v2"
Name 21 "bn" MemberName 20(bn) 2 "v3"
MemberName 21(bn) 0 "v1" Name 22 ""
MemberName 21(bn) 1 "v2"
MemberName 21(bn) 2 "v3"
Name 23 ""
Decorate 9(patchOut) Patch Decorate 9(patchOut) Patch
MemberDecorate 11(TheBlock) 0 Patch MemberDecorate 11(TheBlock) 0 Patch
MemberDecorate 11(TheBlock) 1 Patch MemberDecorate 11(TheBlock) 1 Patch
MemberDecorate 11(TheBlock) 2 Patch MemberDecorate 11(TheBlock) 2 Patch
Decorate 11(TheBlock) Block Decorate 11(TheBlock) Block
Decorate 16(tcBlock) Location 12 Decorate 16(tcBlock) Location 12
MemberDecorate 18(SingleBlock) 0 Patch MemberDecorate 17(SingleBlock) 0 Patch
MemberDecorate 18(SingleBlock) 0 Location 2 MemberDecorate 17(SingleBlock) 0 Location 2
MemberDecorate 18(SingleBlock) 1 Patch MemberDecorate 17(SingleBlock) 1 Patch
MemberDecorate 18(SingleBlock) 1 Location 3 MemberDecorate 17(SingleBlock) 1 Location 3
MemberDecorate 18(SingleBlock) 2 Patch MemberDecorate 17(SingleBlock) 2 Patch
MemberDecorate 18(SingleBlock) 2 Location 4 MemberDecorate 17(SingleBlock) 2 Location 4
Decorate 18(SingleBlock) Block Decorate 17(SingleBlock) Block
Decorate 20(singleBlock) Location 2 Decorate 19(singleBlock) Location 2
MemberDecorate 21(bn) 0 Patch MemberDecorate 20(bn) 0 Patch
MemberDecorate 21(bn) 0 Location 20 MemberDecorate 20(bn) 0 Location 20
MemberDecorate 21(bn) 0 Component 0 MemberDecorate 20(bn) 0 Component 0
MemberDecorate 21(bn) 1 Patch MemberDecorate 20(bn) 1 Patch
MemberDecorate 21(bn) 1 Location 24 MemberDecorate 20(bn) 1 Location 24
MemberDecorate 21(bn) 2 Patch MemberDecorate 20(bn) 2 Patch
MemberDecorate 21(bn) 2 Location 25 MemberDecorate 20(bn) 2 Location 25
MemberDecorate 21(bn) 2 Component 0 MemberDecorate 20(bn) 2 Component 0
Decorate 21(bn) Block Decorate 20(bn) Block
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -74,13 +71,12 @@ Linked tessellation control stage: ...@@ -74,13 +71,12 @@ Linked tessellation control stage:
14: TypeArray 11(TheBlock) 13 14: TypeArray 11(TheBlock) 13
15: TypePointer Output 14 15: TypePointer Output 14
16(tcBlock): 15(ptr) Variable Output 16(tcBlock): 15(ptr) Variable Output
17(S): TypeStruct 6(float) 6(float) 17(SingleBlock): TypeStruct 6(float) 6(float) 10(S)
18(SingleBlock): TypeStruct 6(float) 6(float) 17(S) 18: TypePointer Output 17(SingleBlock)
19: TypePointer Output 18(SingleBlock) 19(singleBlock): 18(ptr) Variable Output
20(singleBlock): 19(ptr) Variable Output 20(bn): TypeStruct 7(fvec4) 7(fvec4) 7(fvec4)
21(bn): TypeStruct 7(fvec4) 7(fvec4) 7(fvec4) 21: TypePointer Output 20(bn)
22: TypePointer Output 21(bn) 22: 21(ptr) Variable Output
23: 22(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
Return Return
......
glslang/Include/revision.h
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
// 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.1456" #define GLSLANG_REVISION "Overload400-PrecQual.1456"
#define GLSLANG_DATE "31-Aug-2016" #define GLSLANG_DATE "01-Sep-2016"
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