Skip to content

G
glslang
Commit 5aa59e20 by John Kessenich
Options

HLSL: Map parameter qualifiers from generic to function-specific and entry-point specific.

parent c3387d33
Showing with 444 additions and 458 deletions
SPIRV/GlslangToSpv.cpp
......@@ -238,7 +238,7 @@ spv::StorageClass TranslateStorageClass(const glslang::TType& type)
return spv::StorageClassUniform;
else
return spv::StorageClassUniformConstant;
// TODO: how are we distuingishing between default and non-default non-writable uniforms? Do default uniforms even exist?
// TODO: how are we distinguishing between default and non-default non-writable uniforms? Do default uniforms even exist?
} else {
switch (type.getQualifier().storage) {
case glslang::EvqShared: return spv::StorageClassWorkgroup; break;
......
Test/baseResults/hlsl.assoc.frag.out
......@@ -4,31 +4,31 @@ gl_FragCoord origin is upper left
0:? Sequence
0:12 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vf4;vf4; (temp 4-component vector of float)
0:8 Function Parameters:
0:8 'a1' (temp 4-component vector of float)
0:8 'a2' (temp 4-component vector of float)
0:8 'a3' (temp 4-component vector of float)
0:8 'a4' (temp 4-component vector of float)
0:8 'a5' (temp 4-component vector of float)
0:8 'a1' (in 4-component vector of float)
0:8 'a2' (in 4-component vector of float)
0:8 'a3' (in 4-component vector of float)
0:8 'a4' (in 4-component vector of float)
0:8 'a5' (in 4-component vector of float)
0:? Sequence
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a1' (temp 4-component vector of float)
0:9 'a1' (in 4-component vector of float)
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a2' (temp 4-component vector of float)
0:9 'a2' (in 4-component vector of float)
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a3' (temp 4-component vector of float)
0:9 'a3' (in 4-component vector of float)
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a4' (temp 4-component vector of float)
0:9 'a5' (temp 4-component vector of float)
0:9 'a4' (in 4-component vector of float)
0:9 'a5' (in 4-component vector of float)
0:10 Branch: Return with expression
0:10 add (temp 4-component vector of float)
0:10 add (temp 4-component vector of float)
0:10 add (temp 4-component vector of float)
0:10 'a1' (temp 4-component vector of float)
0:10 'a2' (temp 4-component vector of float)
0:10 'a1' (in 4-component vector of float)
0:10 'a2' (in 4-component vector of float)
0:10 add (temp 4-component vector of float)
0:10 'a3' (temp 4-component vector of float)
0:10 'a4' (temp 4-component vector of float)
0:10 'a5' (temp 4-component vector of float)
0:10 'a3' (in 4-component vector of float)
0:10 'a4' (in 4-component vector of float)
0:10 'a5' (in 4-component vector of float)
0:? Linker Objects
......@@ -40,31 +40,31 @@ gl_FragCoord origin is upper left
0:? Sequence
0:12 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vf4;vf4; (temp 4-component vector of float)
0:8 Function Parameters:
0:8 'a1' (temp 4-component vector of float)
0:8 'a2' (temp 4-component vector of float)
0:8 'a3' (temp 4-component vector of float)
0:8 'a4' (temp 4-component vector of float)
0:8 'a5' (temp 4-component vector of float)
0:8 'a1' (in 4-component vector of float)
0:8 'a2' (in 4-component vector of float)
0:8 'a3' (in 4-component vector of float)
0:8 'a4' (in 4-component vector of float)
0:8 'a5' (in 4-component vector of float)
0:? Sequence
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a1' (temp 4-component vector of float)
0:9 'a1' (in 4-component vector of float)
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a2' (temp 4-component vector of float)
0:9 'a2' (in 4-component vector of float)
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a3' (temp 4-component vector of float)
0:9 'a3' (in 4-component vector of float)
0:9 move second child to first child (temp 4-component vector of float)
0:9 'a4' (temp 4-component vector of float)
0:9 'a5' (temp 4-component vector of float)
0:9 'a4' (in 4-component vector of float)
0:9 'a5' (in 4-component vector of float)
0:10 Branch: Return with expression
0:10 add (temp 4-component vector of float)
0:10 add (temp 4-component vector of float)
0:10 add (temp 4-component vector of float)
0:10 'a1' (temp 4-component vector of float)
0:10 'a2' (temp 4-component vector of float)
0:10 'a1' (in 4-component vector of float)
0:10 'a2' (in 4-component vector of float)
0:10 add (temp 4-component vector of float)
0:10 'a3' (temp 4-component vector of float)
0:10 'a4' (temp 4-component vector of float)
0:10 'a5' (temp 4-component vector of float)
0:10 'a3' (in 4-component vector of float)
0:10 'a4' (in 4-component vector of float)
0:10 'a5' (in 4-component vector of float)
0:? Linker Objects
// Module Version 10000
......@@ -74,7 +74,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 9 10 11 12 13
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -87,14 +87,14 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
8: TypePointer Input 7(fvec4)
9(a1): 8(ptr) Variable Input
10(a2): 8(ptr) Variable Input
11(a3): 8(ptr) Variable Input
12(a4): 8(ptr) Variable Input
13(a5): 8(ptr) Variable Input
4(PixelShaderFunction): 2 Function None 3
5: Label
9(a1): 8(ptr) Variable Function
10(a2): 8(ptr) Variable Function
11(a3): 8(ptr) Variable Function
12(a4): 8(ptr) Variable Function
13(a5): 8(ptr) Variable Function
14: 7(fvec4) Load 13(a5)
Store 12(a4) 14
Store 11(a3) 14
......
Test/baseResults/hlsl.attribute.frag.out
......@@ -4,7 +4,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:14 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:11 Test condition and select (temp void)
0:11 Condition
......@@ -22,7 +22,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:14 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:11 Test condition and select (temp void)
0:11 Condition
......
Test/baseResults/hlsl.cast.frag.out
......@@ -4,16 +4,16 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Branch: Return with expression
0:3 add (temp 4-component vector of float)
0:3 add (temp 4-component vector of float)
0:3 Construct vec4 (temp 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 Convert int to float (temp 4-component vector of float)
0:3 Convert float to int (temp 4-component vector of int)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 Constant:
0:3 1.198000
0:3 1.198000
......@@ -30,16 +30,16 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Branch: Return with expression
0:3 add (temp 4-component vector of float)
0:3 add (temp 4-component vector of float)
0:3 Construct vec4 (temp 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 Convert int to float (temp 4-component vector of float)
0:3 Convert float to int (temp 4-component vector of int)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 Constant:
0:3 1.198000
0:3 1.198000
......@@ -54,7 +54,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 9
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -63,14 +63,14 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
8: TypePointer Input 7(fvec4)
9(input): 8(ptr) Variable Input
17: TypeInt 32 1
18: TypeVector 17(int) 4
22: 6(float) Constant 1067014160
23: 7(fvec4) ConstantComposite 22 22 22 22
4(PixelShaderFunction): 2 Function None 3
5: Label
9(input): 8(ptr) Variable Function
10: 7(fvec4) Load 9(input)
11: 6(float) CompositeExtract 10 0
12: 6(float) CompositeExtract 10 1
......
Test/baseResults/hlsl.doLoop.frag.out
......@@ -4,7 +4,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:7 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Loop with condition not tested first
0:3 Loop Condition
......@@ -19,11 +19,11 @@ gl_FragCoord origin is upper left
0:5 Loop with condition not tested first
0:5 Loop Condition
0:5 Compare Equal (temp bool)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 Loop Body
0:5 Branch: Return with expression
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:? Linker Objects
......@@ -35,7 +35,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:7 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Loop with condition not tested first
0:3 Loop Condition
......@@ -50,11 +50,11 @@ gl_FragCoord origin is upper left
0:5 Loop with condition not tested first
0:5 Loop Condition
0:5 Compare Equal (temp bool)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 Loop Body
0:5 Branch: Return with expression
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:? Linker Objects
// Module Version 10000
......@@ -64,7 +64,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 23
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -75,11 +75,11 @@ gl_FragCoord origin is upper left
11: 10(bool) ConstantFalse
20: TypeFloat 32
21: TypeVector 20(float) 4
22: TypePointer Function 21(fvec4)
22: TypePointer Input 21(fvec4)
23(input): 22(ptr) Variable Input
28: TypeVector 10(bool) 4
4(PixelShaderFunction): 2 Function None 3
5: Label
23(input): 22(ptr) Variable Function
Branch 6
6: Label
LoopMerge 8 9 None
......
Test/baseResults/hlsl.float1.frag.out
......@@ -12,8 +12,8 @@ gl_FragCoord origin is upper left
0:2 2.000000
0:8 Function Definition: ShaderFunction(vf1;f1; (temp 1-component vector of float)
0:5 Function Parameters:
0:5 'inFloat1' (temp 1-component vector of float)
0:5 'inScalar' (temp float)
0:5 'inFloat1' (in 1-component vector of float)
0:5 'inScalar' (in float)
0:? Sequence
0:6 Branch: Return with expression
0:6 add (temp 1-component vector of float)
......@@ -21,8 +21,8 @@ gl_FragCoord origin is upper left
0:6 'f1' (temp 1-component vector of float)
0:6 'scalar' (temp float)
0:6 vector-scale (temp 1-component vector of float)
0:6 'inFloat1' (temp 1-component vector of float)
0:6 'inScalar' (temp float)
0:6 'inFloat1' (in 1-component vector of float)
0:6 'inScalar' (in float)
0:? Linker Objects
0:? 'f1' (temp 1-component vector of float)
0:? 'scalar' (temp float)
......@@ -44,8 +44,8 @@ gl_FragCoord origin is upper left
0:2 2.000000
0:8 Function Definition: ShaderFunction(vf1;f1; (temp 1-component vector of float)
0:5 Function Parameters:
0:5 'inFloat1' (temp 1-component vector of float)
0:5 'inScalar' (temp float)
0:5 'inFloat1' (in 1-component vector of float)
0:5 'inScalar' (in float)
0:? Sequence
0:6 Branch: Return with expression
0:6 add (temp 1-component vector of float)
......@@ -53,8 +53,8 @@ gl_FragCoord origin is upper left
0:6 'f1' (temp 1-component vector of float)
0:6 'scalar' (temp float)
0:6 vector-scale (temp 1-component vector of float)
0:6 'inFloat1' (temp 1-component vector of float)
0:6 'inScalar' (temp float)
0:6 'inFloat1' (in 1-component vector of float)
0:6 'inScalar' (in float)
0:? Linker Objects
0:? 'f1' (temp 1-component vector of float)
0:? 'scalar' (temp float)
......
Test/baseResults/hlsl.float4.frag.out
......@@ -11,11 +11,11 @@ gl_FragCoord origin is upper left
0:? 1.000000
0:12 Function Definition: ShaderFunction(vf4; (temp 4-component vector of float)
0:9 Function Parameters:
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:? Sequence
0:10 Branch: Return with expression
0:10 component-wise multiply (temp 4-component vector of float)
0:10 'input' (temp 4-component vector of float)
0:10 'input' (in 4-component vector of float)
0:10 'AmbientColor' (temp 4-component vector of float)
0:? Linker Objects
0:? 'AmbientColor' (temp 4-component vector of float)
......@@ -40,11 +40,11 @@ gl_FragCoord origin is upper left
0:? 1.000000
0:12 Function Definition: ShaderFunction(vf4; (temp 4-component vector of float)
0:9 Function Parameters:
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:? Sequence
0:10 Branch: Return with expression
0:10 component-wise multiply (temp 4-component vector of float)
0:10 'input' (temp 4-component vector of float)
0:10 'input' (in 4-component vector of float)
0:10 'AmbientColor' (temp 4-component vector of float)
0:? Linker Objects
0:? 'AmbientColor' (temp 4-component vector of float)
......
Test/baseResults/hlsl.forLoop.frag.out
......@@ -4,7 +4,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:9 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:? Sequence
0:3 Loop with condition tested first
......@@ -12,7 +12,7 @@ gl_FragCoord origin is upper left
0:3 No loop body
0:4 Sequence
0:4 Pre-Increment (temp 4-component vector of float)
0:4 'input' (temp 4-component vector of float)
0:4 'input' (in 4-component vector of float)
0:4 Loop with condition tested first
0:4 No loop condition
0:4 No loop body
......@@ -20,36 +20,36 @@ gl_FragCoord origin is upper left
0:5 Loop with condition tested first
0:5 Loop Condition
0:5 Compare Not Equal (temp bool)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 No loop body
0:? Sequence
0:6 Loop with condition tested first
0:6 Loop Condition
0:6 Compare Not Equal (temp bool)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 Loop Body
0:? Sequence
0:6 Branch: Return with expression
0:6 Negate value (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:7 Sequence
0:7 Pre-Decrement (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Loop with condition tested first
0:7 Loop Condition
0:7 Compare Not Equal (temp bool)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Loop Body
0:? Sequence
0:7 Branch: Return with expression
0:7 Negate value (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Loop Terminal Expression
0:7 add second child into first child (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Constant:
0:7 2.000000
0:? Linker Objects
......@@ -63,7 +63,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:9 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:? Sequence
0:3 Loop with condition tested first
......@@ -71,7 +71,7 @@ gl_FragCoord origin is upper left
0:3 No loop body
0:4 Sequence
0:4 Pre-Increment (temp 4-component vector of float)
0:4 'input' (temp 4-component vector of float)
0:4 'input' (in 4-component vector of float)
0:4 Loop with condition tested first
0:4 No loop condition
0:4 No loop body
......@@ -79,36 +79,36 @@ gl_FragCoord origin is upper left
0:5 Loop with condition tested first
0:5 Loop Condition
0:5 Compare Not Equal (temp bool)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:5 No loop body
0:? Sequence
0:6 Loop with condition tested first
0:6 Loop Condition
0:6 Compare Not Equal (temp bool)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 Loop Body
0:? Sequence
0:6 Branch: Return with expression
0:6 Negate value (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:7 Sequence
0:7 Pre-Decrement (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Loop with condition tested first
0:7 Loop Condition
0:7 Compare Not Equal (temp bool)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Loop Body
0:? Sequence
0:7 Branch: Return with expression
0:7 Negate value (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Loop Terminal Expression
0:7 add second child into first child (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 Constant:
0:7 2.000000
0:? Linker Objects
......@@ -120,7 +120,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 13
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -129,14 +129,14 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
10: TypeFloat 32
11: TypeVector 10(float) 4
12: TypePointer Function 11(fvec4)
12: TypePointer Input 11(fvec4)
13(input): 12(ptr) Variable Input
15: 10(float) Constant 1065353216
29: TypeBool
30: TypeVector 29(bool) 4
60: 10(float) Constant 1073741824
4(PixelShaderFunction): 2 Function None 3
5: Label
13(input): 12(ptr) Variable Function
Branch 6
6: Label
LoopMerge 8 9 None
......
Test/baseResults/hlsl.frag.out
......@@ -15,47 +15,47 @@ gl_FragCoord origin is upper left
0:2 0.100000
0:13 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:5 Function Parameters:
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:? Sequence
0:6 Branch: Return with expression
0:6 add (temp 4-component vector of float)
0:6 vector-scale (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 'AmbientIntensity' (temp float)
0:6 'AmbientColor' (temp 4-component vector of float)
0:7 Branch: Return with expression
0:7 add (temp 4-component vector of float)
0:7 component-wise multiply (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 component-wise multiply (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:8 Branch: Return with expression
0:8 add (temp 4-component vector of float)
0:8 add (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:8 component-wise multiply (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:9 Branch: Return with expression
0:9 component-wise multiply (temp 4-component vector of float)
0:9 Pre-Increment (temp 4-component vector of float)
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:9 Negate value (temp 4-component vector of float)
0:9 Negate value (temp 4-component vector of float)
0:9 Pre-Decrement (temp 4-component vector of float)
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:10 Branch: Return with expression
0:10 add (temp 4-component vector of float)
0:10 Post-Increment (temp 4-component vector of float)
0:10 'input' (temp 4-component vector of float)
0:10 'input' (in 4-component vector of float)
0:10 Pre-Increment (temp 4-component vector of float)
0:10 'input' (temp 4-component vector of float)
0:10 'input' (in 4-component vector of float)
0:11 Branch: Return with expression
0:11 sine (global 4-component vector of float)
0:11 'input' (temp 4-component vector of float)
0:11 'input' (in 4-component vector of float)
0:? Linker Objects
0:? 'AmbientColor' (temp 4-component vector of float)
0:? 'AmbientIntensity' (temp float)
......@@ -80,81 +80,82 @@ gl_FragCoord origin is upper left
0:2 0.100000
0:13 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:5 Function Parameters:
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:? Sequence
0:6 Branch: Return with expression
0:6 add (temp 4-component vector of float)
0:6 vector-scale (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 'AmbientIntensity' (temp float)
0:6 'AmbientColor' (temp 4-component vector of float)
0:7 Branch: Return with expression
0:7 add (temp 4-component vector of float)
0:7 component-wise multiply (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 component-wise multiply (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:8 Branch: Return with expression
0:8 add (temp 4-component vector of float)
0:8 add (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:8 component-wise multiply (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (temp 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:8 'input' (in 4-component vector of float)
0:9 Branch: Return with expression
0:9 component-wise multiply (temp 4-component vector of float)
0:9 Pre-Increment (temp 4-component vector of float)
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:9 Negate value (temp 4-component vector of float)
0:9 Negate value (temp 4-component vector of float)
0:9 Pre-Decrement (temp 4-component vector of float)
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:10 Branch: Return with expression
0:10 add (temp 4-component vector of float)
0:10 Post-Increment (temp 4-component vector of float)
0:10 'input' (temp 4-component vector of float)
0:10 'input' (in 4-component vector of float)
0:10 Pre-Increment (temp 4-component vector of float)
0:10 'input' (temp 4-component vector of float)
0:10 'input' (in 4-component vector of float)
0:11 Branch: Return with expression
0:11 sine (global 4-component vector of float)
0:11 'input' (temp 4-component vector of float)
0:11 'input' (in 4-component vector of float)
0:? Linker Objects
0:? 'AmbientColor' (temp 4-component vector of float)
0:? 'AmbientIntensity' (temp float)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 57
// Id's are bound by 58
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 9
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
Name 9 "input"
Name 12 "AmbientIntensity"
Name 15 "AmbientColor"
Name 16 "AmbientColor"
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
8: TypePointer Input 7(fvec4)
9(input): 8(ptr) Variable Input
11: TypePointer Function 6(float)
36: 6(float) Constant 1065353216
15: TypePointer Function 7(fvec4)
37: 6(float) Constant 1065353216
4(PixelShaderFunction): 2 Function None 3
5: Label
9(input): 8(ptr) Variable Function
12(AmbientIntensity): 11(ptr) Variable Function
15(AmbientColor): 8(ptr) Variable Function
16(AmbientColor): 15(ptr) Variable Function
10: 7(fvec4) Load 9(input)
13: 6(float) Load 12(AmbientIntensity)
14: 7(fvec4) VectorTimesScalar 10 13
16: 7(fvec4) Load 15(AmbientColor)
17: 7(fvec4) FAdd 14 16
ReturnValue 17
17: 7(fvec4) Load 16(AmbientColor)
18: 7(fvec4) FAdd 14 17
ReturnValue 18
FunctionEnd
Test/baseResults/hlsl.if.frag.out
......@@ -4,63 +4,63 @@ gl_FragCoord origin is upper left
0:? Sequence
0:29 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Test condition and select (temp void)
0:3 Condition
0:3 Compare Equal (temp bool)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 true case
0:4 Branch: Return with expression
0:4 'input' (temp 4-component vector of float)
0:4 'input' (in 4-component vector of float)
0:6 Test condition and select (temp void)
0:6 Condition
0:6 Compare Equal (temp bool)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 true case
0:7 Branch: Return with expression
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:6 false case
0:9 Branch: Return with expression
0:9 Negate value (temp 4-component vector of float)
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:11 Test condition and select (temp void)
0:11 Condition
0:11 Compare Equal (temp bool)
0:11 'input' (temp 4-component vector of float)
0:11 'input' (temp 4-component vector of float)
0:11 'input' (in 4-component vector of float)
0:11 'input' (in 4-component vector of float)
0:11 true case is null
0:14 Test condition and select (temp void)
0:14 Condition
0:14 Compare Equal (temp bool)
0:14 'input' (temp 4-component vector of float)
0:14 'input' (temp 4-component vector of float)
0:14 'input' (in 4-component vector of float)
0:14 'input' (in 4-component vector of float)
0:14 true case is null
0:19 Test condition and select (temp void)
0:19 Condition
0:19 Compare Equal (temp bool)
0:19 'input' (temp 4-component vector of float)
0:19 'input' (temp 4-component vector of float)
0:19 'input' (in 4-component vector of float)
0:19 'input' (in 4-component vector of float)
0:19 true case
0:? Sequence
0:20 Branch: Return with expression
0:20 'input' (temp 4-component vector of float)
0:20 'input' (in 4-component vector of float)
0:23 Test condition and select (temp void)
0:23 Condition
0:23 Compare Equal (temp bool)
0:23 'input' (temp 4-component vector of float)
0:23 'input' (temp 4-component vector of float)
0:23 'input' (in 4-component vector of float)
0:23 'input' (in 4-component vector of float)
0:23 true case
0:? Sequence
0:24 Branch: Return with expression
0:24 'input' (temp 4-component vector of float)
0:24 'input' (in 4-component vector of float)
0:23 false case
0:? Sequence
0:26 Branch: Return with expression
0:26 Negate value (temp 4-component vector of float)
0:26 'input' (temp 4-component vector of float)
0:26 'input' (in 4-component vector of float)
0:? Linker Objects
......@@ -72,63 +72,63 @@ gl_FragCoord origin is upper left
0:? Sequence
0:29 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Test condition and select (temp void)
0:3 Condition
0:3 Compare Equal (temp bool)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 true case
0:4 Branch: Return with expression
0:4 'input' (temp 4-component vector of float)
0:4 'input' (in 4-component vector of float)
0:6 Test condition and select (temp void)
0:6 Condition
0:6 Compare Equal (temp bool)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (temp 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 'input' (in 4-component vector of float)
0:6 true case
0:7 Branch: Return with expression
0:7 'input' (temp 4-component vector of float)
0:7 'input' (in 4-component vector of float)
0:6 false case
0:9 Branch: Return with expression
0:9 Negate value (temp 4-component vector of float)
0:9 'input' (temp 4-component vector of float)
0:9 'input' (in 4-component vector of float)
0:11 Test condition and select (temp void)
0:11 Condition
0:11 Compare Equal (temp bool)
0:11 'input' (temp 4-component vector of float)
0:11 'input' (temp 4-component vector of float)
0:11 'input' (in 4-component vector of float)
0:11 'input' (in 4-component vector of float)
0:11 true case is null
0:14 Test condition and select (temp void)
0:14 Condition
0:14 Compare Equal (temp bool)
0:14 'input' (temp 4-component vector of float)
0:14 'input' (temp 4-component vector of float)
0:14 'input' (in 4-component vector of float)
0:14 'input' (in 4-component vector of float)
0:14 true case is null
0:19 Test condition and select (temp void)
0:19 Condition
0:19 Compare Equal (temp bool)
0:19 'input' (temp 4-component vector of float)
0:19 'input' (temp 4-component vector of float)
0:19 'input' (in 4-component vector of float)
0:19 'input' (in 4-component vector of float)
0:19 true case
0:? Sequence
0:20 Branch: Return with expression
0:20 'input' (temp 4-component vector of float)
0:20 'input' (in 4-component vector of float)
0:23 Test condition and select (temp void)
0:23 Condition
0:23 Compare Equal (temp bool)
0:23 'input' (temp 4-component vector of float)
0:23 'input' (temp 4-component vector of float)
0:23 'input' (in 4-component vector of float)
0:23 'input' (in 4-component vector of float)
0:23 true case
0:? Sequence
0:24 Branch: Return with expression
0:24 'input' (temp 4-component vector of float)
0:24 'input' (in 4-component vector of float)
0:23 false case
0:? Sequence
0:26 Branch: Return with expression
0:26 Negate value (temp 4-component vector of float)
0:26 'input' (temp 4-component vector of float)
0:26 'input' (in 4-component vector of float)
0:? Linker Objects
// Module Version 10000
......@@ -138,7 +138,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 9
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -147,12 +147,12 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
8: TypePointer Input 7(fvec4)
9(input): 8(ptr) Variable Input
12: TypeBool
13: TypeVector 12(bool) 4
4(PixelShaderFunction): 2 Function None 3
5: Label
9(input): 8(ptr) Variable Function
10: 7(fvec4) Load 9(input)
11: 7(fvec4) Load 9(input)
14: 13(bvec4) FOrdEqual 10 11
......
Test/baseResults/hlsl.intrinsics.frag.out
This source diff could not be displayed because it is too large. You can view the blob instead.
Test/baseResults/hlsl.intrinsics.negative.comp.out
......@@ -158,10 +158,10 @@ local_size = (1, 1, 1)
ERROR: node is still EOpNull!
0:56 Function Definition: ComputeShaderFunction(f1;f1;f1;i1; (temp float)
0:2 Function Parameters:
0:2 'inF0' (temp float)
0:2 'inF1' (temp float)
0:2 'inF2' (temp float)
0:2 'inI0' (temp int)
0:2 'inF0' (in float)
0:2 'inF1' (in float)
0:2 'inF2' (in float)
0:2 'inI0' (in int)
0:? Sequence
0:7 Constant:
0:7 0.000000
......@@ -254,10 +254,10 @@ ERROR: node is still EOpNull!
0:53 0.000000
0:65 Function Definition: ComputeShaderFunction(vf1;vf1;vf1;vi1; (temp 1-component vector of float)
0:57 Function Parameters:
0:57 'inF0' (temp 1-component vector of float)
0:57 'inF1' (temp 1-component vector of float)
0:57 'inF2' (temp 1-component vector of float)
0:57 'inI0' (temp 1-component vector of int)
0:57 'inF0' (in 1-component vector of float)
0:57 'inF1' (in 1-component vector of float)
0:57 'inF2' (in 1-component vector of float)
0:57 'inI0' (in 1-component vector of int)
0:? Sequence
0:60 Constant:
0:60 0.000000
......@@ -266,10 +266,10 @@ ERROR: node is still EOpNull!
0:62 0.000000
0:112 Function Definition: ComputeShaderFunction(vf2;vf2;vf2;vi2; (temp 2-component vector of float)
0:66 Function Parameters:
0:66 'inF0' (temp 2-component vector of float)
0:66 'inF1' (temp 2-component vector of float)
0:66 'inF2' (temp 2-component vector of float)
0:66 'inI0' (temp 2-component vector of int)
0:66 'inF0' (in 2-component vector of float)
0:66 'inF1' (in 2-component vector of float)
0:66 'inF2' (in 2-component vector of float)
0:66 'inI0' (in 2-component vector of int)
0:? Sequence
0:69 Constant:
0:69 0.000000
......@@ -351,10 +351,10 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:157 Function Definition: ComputeShaderFunction(vf3;vf3;vf3;vi3; (temp 3-component vector of float)
0:113 Function Parameters:
0:113 'inF0' (temp 3-component vector of float)
0:113 'inF1' (temp 3-component vector of float)
0:113 'inF2' (temp 3-component vector of float)
0:113 'inI0' (temp 3-component vector of int)
0:113 'inF0' (in 3-component vector of float)
0:113 'inF1' (in 3-component vector of float)
0:113 'inF2' (in 3-component vector of float)
0:113 'inI0' (in 3-component vector of int)
0:? Sequence
0:116 Constant:
0:116 0.000000
......@@ -433,10 +433,10 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:202 Function Definition: ComputeShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:158 Function Parameters:
0:158 'inF0' (temp 4-component vector of float)
0:158 'inF1' (temp 4-component vector of float)
0:158 'inF2' (temp 4-component vector of float)
0:158 'inI0' (temp 4-component vector of int)
0:158 'inF0' (in 4-component vector of float)
0:158 'inF1' (in 4-component vector of float)
0:158 'inF2' (in 4-component vector of float)
0:158 'inI0' (in 4-component vector of int)
0:? Sequence
0:161 Constant:
0:161 0.000000
......@@ -525,10 +525,10 @@ local_size = (1, 1, 1)
ERROR: node is still EOpNull!
0:56 Function Definition: ComputeShaderFunction(f1;f1;f1;i1; (temp float)
0:2 Function Parameters:
0:2 'inF0' (temp float)
0:2 'inF1' (temp float)
0:2 'inF2' (temp float)
0:2 'inI0' (temp int)
0:2 'inF0' (in float)
0:2 'inF1' (in float)
0:2 'inF2' (in float)
0:2 'inI0' (in int)
0:? Sequence
0:7 Constant:
0:7 0.000000
......@@ -621,10 +621,10 @@ ERROR: node is still EOpNull!
0:53 0.000000
0:65 Function Definition: ComputeShaderFunction(vf1;vf1;vf1;vi1; (temp 1-component vector of float)
0:57 Function Parameters:
0:57 'inF0' (temp 1-component vector of float)
0:57 'inF1' (temp 1-component vector of float)
0:57 'inF2' (temp 1-component vector of float)
0:57 'inI0' (temp 1-component vector of int)
0:57 'inF0' (in 1-component vector of float)
0:57 'inF1' (in 1-component vector of float)
0:57 'inF2' (in 1-component vector of float)
0:57 'inI0' (in 1-component vector of int)
0:? Sequence
0:60 Constant:
0:60 0.000000
......@@ -633,10 +633,10 @@ ERROR: node is still EOpNull!
0:62 0.000000
0:112 Function Definition: ComputeShaderFunction(vf2;vf2;vf2;vi2; (temp 2-component vector of float)
0:66 Function Parameters:
0:66 'inF0' (temp 2-component vector of float)
0:66 'inF1' (temp 2-component vector of float)
0:66 'inF2' (temp 2-component vector of float)
0:66 'inI0' (temp 2-component vector of int)
0:66 'inF0' (in 2-component vector of float)
0:66 'inF1' (in 2-component vector of float)
0:66 'inF2' (in 2-component vector of float)
0:66 'inI0' (in 2-component vector of int)
0:? Sequence
0:69 Constant:
0:69 0.000000
......@@ -718,10 +718,10 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:157 Function Definition: ComputeShaderFunction(vf3;vf3;vf3;vi3; (temp 3-component vector of float)
0:113 Function Parameters:
0:113 'inF0' (temp 3-component vector of float)
0:113 'inF1' (temp 3-component vector of float)
0:113 'inF2' (temp 3-component vector of float)
0:113 'inI0' (temp 3-component vector of int)
0:113 'inF0' (in 3-component vector of float)
0:113 'inF1' (in 3-component vector of float)
0:113 'inF2' (in 3-component vector of float)
0:113 'inI0' (in 3-component vector of int)
0:? Sequence
0:116 Constant:
0:116 0.000000
......@@ -800,10 +800,10 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:202 Function Definition: ComputeShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:158 Function Parameters:
0:158 'inF0' (temp 4-component vector of float)
0:158 'inF1' (temp 4-component vector of float)
0:158 'inF2' (temp 4-component vector of float)
0:158 'inI0' (temp 4-component vector of int)
0:158 'inF0' (in 4-component vector of float)
0:158 'inF1' (in 4-component vector of float)
0:158 'inF2' (in 4-component vector of float)
0:158 'inI0' (in 4-component vector of int)
0:? Sequence
0:161 Constant:
0:161 0.000000
......
Test/baseResults/hlsl.intrinsics.negative.frag.out
......@@ -100,10 +100,10 @@ gl_FragCoord origin is upper left
ERROR: node is still EOpNull!
0:35 Function Definition: PixelShaderFunction(f1;f1;f1;i1; (temp float)
0:2 Function Parameters:
0:2 'inF0' (temp float)
0:2 'inF1' (temp float)
0:2 'inF2' (temp float)
0:2 'inI0' (temp int)
0:2 'inF0' (in float)
0:2 'inF1' (in float)
0:2 'inF2' (in float)
0:2 'inI0' (in int)
0:? Sequence
0:5 Constant:
0:5 0.000000
......@@ -146,10 +146,10 @@ ERROR: node is still EOpNull!
0:32 0.000000
0:44 Function Definition: PixelShaderFunction(vf1;vf1;vf1;vi1; (temp 1-component vector of float)
0:36 Function Parameters:
0:36 'inF0' (temp 1-component vector of float)
0:36 'inF1' (temp 1-component vector of float)
0:36 'inF2' (temp 1-component vector of float)
0:36 'inI0' (temp 1-component vector of int)
0:36 'inF0' (in 1-component vector of float)
0:36 'inF1' (in 1-component vector of float)
0:36 'inF2' (in 1-component vector of float)
0:36 'inI0' (in 1-component vector of int)
0:? Sequence
0:39 Constant:
0:39 0.000000
......@@ -158,10 +158,10 @@ ERROR: node is still EOpNull!
0:41 0.000000
0:62 Function Definition: PixelShaderFunction(vf2;vf2;vf2;vi2; (temp 2-component vector of float)
0:45 Function Parameters:
0:45 'inF0' (temp 2-component vector of float)
0:45 'inF1' (temp 2-component vector of float)
0:45 'inF2' (temp 2-component vector of float)
0:45 'inI0' (temp 2-component vector of int)
0:45 'inF0' (in 2-component vector of float)
0:45 'inF1' (in 2-component vector of float)
0:45 'inF2' (in 2-component vector of float)
0:45 'inI0' (in 2-component vector of int)
0:? Sequence
0:46 Constant:
0:46 0.000000
......@@ -193,10 +193,10 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:79 Function Definition: PixelShaderFunction(vf3;vf3;vf3;vi3; (temp 3-component vector of float)
0:63 Function Parameters:
0:63 'inF0' (temp 3-component vector of float)
0:63 'inF1' (temp 3-component vector of float)
0:63 'inF2' (temp 3-component vector of float)
0:63 'inI0' (temp 3-component vector of int)
0:63 'inF0' (in 3-component vector of float)
0:63 'inF1' (in 3-component vector of float)
0:63 'inF2' (in 3-component vector of float)
0:63 'inI0' (in 3-component vector of int)
0:? Sequence
0:64 Constant:
0:64 0.000000
......@@ -225,10 +225,10 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:115 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:80 Function Parameters:
0:80 'inF0' (temp 4-component vector of float)
0:80 'inF1' (temp 4-component vector of float)
0:80 'inF2' (temp 4-component vector of float)
0:80 'inI0' (temp 4-component vector of int)
0:80 'inF0' (in 4-component vector of float)
0:80 'inF1' (in 4-component vector of float)
0:80 'inF2' (in 4-component vector of float)
0:80 'inI0' (in 4-component vector of int)
0:? Sequence
0:81 Constant:
0:81 0.000000
......@@ -258,9 +258,9 @@ ERROR: node is still EOpNull!
0:? 4.000000
0:123 Function Definition: PixelShaderFunction(mf22;mf22;mf22; (temp 2X2 matrix of float)
0:116 Function Parameters:
0:116 'inF0' (temp 2X2 matrix of float)
0:116 'inF1' (temp 2X2 matrix of float)
0:116 'inF2' (temp 2X2 matrix of float)
0:116 'inF0' (in 2X2 matrix of float)
0:116 'inF1' (in 2X2 matrix of float)
0:116 'inF2' (in 2X2 matrix of float)
0:? Sequence
0:118 Constant:
0:118 0.000000
......@@ -298,9 +298,9 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:131 Function Definition: PixelShaderFunction(mf33;mf33;mf33; (temp 3X3 matrix of float)
0:124 Function Parameters:
0:124 'inF0' (temp 3X3 matrix of float)
0:124 'inF1' (temp 3X3 matrix of float)
0:124 'inF2' (temp 3X3 matrix of float)
0:124 'inF0' (in 3X3 matrix of float)
0:124 'inF1' (in 3X3 matrix of float)
0:124 'inF2' (in 3X3 matrix of float)
0:? Sequence
0:126 Constant:
0:126 0.000000
......@@ -343,9 +343,9 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:138 Function Definition: PixelShaderFunction(mf44;mf44;mf44; (temp 4X4 matrix of float)
0:132 Function Parameters:
0:132 'inF0' (temp 4X4 matrix of float)
0:132 'inF1' (temp 4X4 matrix of float)
0:132 'inF2' (temp 4X4 matrix of float)
0:132 'inF0' (in 4X4 matrix of float)
0:132 'inF1' (in 4X4 matrix of float)
0:132 'inF2' (in 4X4 matrix of float)
0:? Sequence
0:134 Constant:
0:134 0.000000
......@@ -404,10 +404,10 @@ gl_FragCoord origin is upper left
ERROR: node is still EOpNull!
0:35 Function Definition: PixelShaderFunction(f1;f1;f1;i1; (temp float)
0:2 Function Parameters:
0:2 'inF0' (temp float)
0:2 'inF1' (temp float)
0:2 'inF2' (temp float)
0:2 'inI0' (temp int)
0:2 'inF0' (in float)
0:2 'inF1' (in float)
0:2 'inF2' (in float)
0:2 'inI0' (in int)
0:? Sequence
0:5 Constant:
0:5 0.000000
......@@ -450,10 +450,10 @@ ERROR: node is still EOpNull!
0:32 0.000000
0:44 Function Definition: PixelShaderFunction(vf1;vf1;vf1;vi1; (temp 1-component vector of float)
0:36 Function Parameters:
0:36 'inF0' (temp 1-component vector of float)
0:36 'inF1' (temp 1-component vector of float)
0:36 'inF2' (temp 1-component vector of float)
0:36 'inI0' (temp 1-component vector of int)
0:36 'inF0' (in 1-component vector of float)
0:36 'inF1' (in 1-component vector of float)
0:36 'inF2' (in 1-component vector of float)
0:36 'inI0' (in 1-component vector of int)
0:? Sequence
0:39 Constant:
0:39 0.000000
......@@ -462,10 +462,10 @@ ERROR: node is still EOpNull!
0:41 0.000000
0:62 Function Definition: PixelShaderFunction(vf2;vf2;vf2;vi2; (temp 2-component vector of float)
0:45 Function Parameters:
0:45 'inF0' (temp 2-component vector of float)
0:45 'inF1' (temp 2-component vector of float)
0:45 'inF2' (temp 2-component vector of float)
0:45 'inI0' (temp 2-component vector of int)
0:45 'inF0' (in 2-component vector of float)
0:45 'inF1' (in 2-component vector of float)
0:45 'inF2' (in 2-component vector of float)
0:45 'inI0' (in 2-component vector of int)
0:? Sequence
0:46 Constant:
0:46 0.000000
......@@ -497,10 +497,10 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:79 Function Definition: PixelShaderFunction(vf3;vf3;vf3;vi3; (temp 3-component vector of float)
0:63 Function Parameters:
0:63 'inF0' (temp 3-component vector of float)
0:63 'inF1' (temp 3-component vector of float)
0:63 'inF2' (temp 3-component vector of float)
0:63 'inI0' (temp 3-component vector of int)
0:63 'inF0' (in 3-component vector of float)
0:63 'inF1' (in 3-component vector of float)
0:63 'inF2' (in 3-component vector of float)
0:63 'inI0' (in 3-component vector of int)
0:? Sequence
0:64 Constant:
0:64 0.000000
......@@ -529,10 +529,10 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:115 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:80 Function Parameters:
0:80 'inF0' (temp 4-component vector of float)
0:80 'inF1' (temp 4-component vector of float)
0:80 'inF2' (temp 4-component vector of float)
0:80 'inI0' (temp 4-component vector of int)
0:80 'inF0' (in 4-component vector of float)
0:80 'inF1' (in 4-component vector of float)
0:80 'inF2' (in 4-component vector of float)
0:80 'inI0' (in 4-component vector of int)
0:? Sequence
0:81 Constant:
0:81 0.000000
......@@ -562,9 +562,9 @@ ERROR: node is still EOpNull!
0:? 4.000000
0:123 Function Definition: PixelShaderFunction(mf22;mf22;mf22; (temp 2X2 matrix of float)
0:116 Function Parameters:
0:116 'inF0' (temp 2X2 matrix of float)
0:116 'inF1' (temp 2X2 matrix of float)
0:116 'inF2' (temp 2X2 matrix of float)
0:116 'inF0' (in 2X2 matrix of float)
0:116 'inF1' (in 2X2 matrix of float)
0:116 'inF2' (in 2X2 matrix of float)
0:? Sequence
0:118 Constant:
0:118 0.000000
......@@ -602,9 +602,9 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:131 Function Definition: PixelShaderFunction(mf33;mf33;mf33; (temp 3X3 matrix of float)
0:124 Function Parameters:
0:124 'inF0' (temp 3X3 matrix of float)
0:124 'inF1' (temp 3X3 matrix of float)
0:124 'inF2' (temp 3X3 matrix of float)
0:124 'inF0' (in 3X3 matrix of float)
0:124 'inF1' (in 3X3 matrix of float)
0:124 'inF2' (in 3X3 matrix of float)
0:? Sequence
0:126 Constant:
0:126 0.000000
......@@ -647,9 +647,9 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:138 Function Definition: PixelShaderFunction(mf44;mf44;mf44; (temp 4X4 matrix of float)
0:132 Function Parameters:
0:132 'inF0' (temp 4X4 matrix of float)
0:132 'inF1' (temp 4X4 matrix of float)
0:132 'inF2' (temp 4X4 matrix of float)
0:132 'inF0' (in 4X4 matrix of float)
0:132 'inF1' (in 4X4 matrix of float)
0:132 'inF2' (in 4X4 matrix of float)
0:? Sequence
0:134 Constant:
0:134 0.000000
......
Test/baseResults/hlsl.intrinsics.negative.vert.out
......@@ -233,10 +233,10 @@ Shader version: 450
ERROR: node is still EOpNull!
0:74 Function Definition: VertexShaderFunction(f1;f1;f1;i1; (temp float)
0:15 Function Parameters:
0:15 'inF0' (temp float)
0:15 'inF1' (temp float)
0:15 'inF2' (temp float)
0:15 'inI0' (temp int)
0:15 'inF0' (in float)
0:15 'inF1' (in float)
0:15 'inF2' (in float)
0:15 'inI0' (in int)
0:? Sequence
0:20 Constant:
0:20 0.000000
......@@ -331,10 +331,10 @@ ERROR: node is still EOpNull!
0:71 0.000000
0:83 Function Definition: VertexShaderFunction(vf1;vf1;vf1;vi1; (temp 1-component vector of float)
0:75 Function Parameters:
0:75 'inF0' (temp 1-component vector of float)
0:75 'inF1' (temp 1-component vector of float)
0:75 'inF2' (temp 1-component vector of float)
0:75 'inI0' (temp 1-component vector of int)
0:75 'inF0' (in 1-component vector of float)
0:75 'inF1' (in 1-component vector of float)
0:75 'inF2' (in 1-component vector of float)
0:75 'inI0' (in 1-component vector of int)
0:? Sequence
0:78 Constant:
0:78 0.000000
......@@ -343,10 +343,10 @@ ERROR: node is still EOpNull!
0:80 0.000000
0:130 Function Definition: VertexShaderFunction(vf2;vf2;vf2;vi2; (temp 2-component vector of float)
0:84 Function Parameters:
0:84 'inF0' (temp 2-component vector of float)
0:84 'inF1' (temp 2-component vector of float)
0:84 'inF2' (temp 2-component vector of float)
0:84 'inI0' (temp 2-component vector of int)
0:84 'inF0' (in 2-component vector of float)
0:84 'inF1' (in 2-component vector of float)
0:84 'inF2' (in 2-component vector of float)
0:84 'inI0' (in 2-component vector of int)
0:? Sequence
0:87 Constant:
0:87 0.000000
......@@ -428,10 +428,10 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:175 Function Definition: VertexShaderFunction(vf3;vf3;vf3;vi3; (temp 3-component vector of float)
0:131 Function Parameters:
0:131 'inF0' (temp 3-component vector of float)
0:131 'inF1' (temp 3-component vector of float)
0:131 'inF2' (temp 3-component vector of float)
0:131 'inI0' (temp 3-component vector of int)
0:131 'inF0' (in 3-component vector of float)
0:131 'inF1' (in 3-component vector of float)
0:131 'inF2' (in 3-component vector of float)
0:131 'inI0' (in 3-component vector of int)
0:? Sequence
0:134 Constant:
0:134 0.000000
......@@ -510,10 +510,10 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:251 Function Definition: VertexShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:176 Function Parameters:
0:176 'inF0' (temp 4-component vector of float)
0:176 'inF1' (temp 4-component vector of float)
0:176 'inF2' (temp 4-component vector of float)
0:176 'inI0' (temp 4-component vector of int)
0:176 'inF0' (in 4-component vector of float)
0:176 'inF1' (in 4-component vector of float)
0:176 'inF2' (in 4-component vector of float)
0:176 'inI0' (in 4-component vector of int)
0:? Sequence
0:179 Constant:
0:179 0.000000
......@@ -593,9 +593,9 @@ ERROR: node is still EOpNull!
0:? 4.000000
0:259 Function Definition: VertexShaderFunction(mf22;mf22;mf22; (temp 2X2 matrix of float)
0:252 Function Parameters:
0:252 'inF0' (temp 2X2 matrix of float)
0:252 'inF1' (temp 2X2 matrix of float)
0:252 'inF2' (temp 2X2 matrix of float)
0:252 'inF0' (in 2X2 matrix of float)
0:252 'inF1' (in 2X2 matrix of float)
0:252 'inF2' (in 2X2 matrix of float)
0:? Sequence
0:254 Constant:
0:254 0.000000
......@@ -655,9 +655,9 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:267 Function Definition: VertexShaderFunction(mf33;mf33;mf33; (temp 3X3 matrix of float)
0:260 Function Parameters:
0:260 'inF0' (temp 3X3 matrix of float)
0:260 'inF1' (temp 3X3 matrix of float)
0:260 'inF2' (temp 3X3 matrix of float)
0:260 'inF0' (in 3X3 matrix of float)
0:260 'inF1' (in 3X3 matrix of float)
0:260 'inF2' (in 3X3 matrix of float)
0:? Sequence
0:262 Constant:
0:262 0.000000
......@@ -722,9 +722,9 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:274 Function Definition: VertexShaderFunction(mf44;mf44;mf44; (temp 4X4 matrix of float)
0:268 Function Parameters:
0:268 'inF0' (temp 4X4 matrix of float)
0:268 'inF1' (temp 4X4 matrix of float)
0:268 'inF2' (temp 4X4 matrix of float)
0:268 'inF0' (in 4X4 matrix of float)
0:268 'inF1' (in 4X4 matrix of float)
0:268 'inF2' (in 4X4 matrix of float)
0:? Sequence
0:270 Constant:
0:270 0.000000
......@@ -816,10 +816,10 @@ Shader version: 450
ERROR: node is still EOpNull!
0:74 Function Definition: VertexShaderFunction(f1;f1;f1;i1; (temp float)
0:15 Function Parameters:
0:15 'inF0' (temp float)
0:15 'inF1' (temp float)
0:15 'inF2' (temp float)
0:15 'inI0' (temp int)
0:15 'inF0' (in float)
0:15 'inF1' (in float)
0:15 'inF2' (in float)
0:15 'inI0' (in int)
0:? Sequence
0:20 Constant:
0:20 0.000000
......@@ -914,10 +914,10 @@ ERROR: node is still EOpNull!
0:71 0.000000
0:83 Function Definition: VertexShaderFunction(vf1;vf1;vf1;vi1; (temp 1-component vector of float)
0:75 Function Parameters:
0:75 'inF0' (temp 1-component vector of float)
0:75 'inF1' (temp 1-component vector of float)
0:75 'inF2' (temp 1-component vector of float)
0:75 'inI0' (temp 1-component vector of int)
0:75 'inF0' (in 1-component vector of float)
0:75 'inF1' (in 1-component vector of float)
0:75 'inF2' (in 1-component vector of float)
0:75 'inI0' (in 1-component vector of int)
0:? Sequence
0:78 Constant:
0:78 0.000000
......@@ -926,10 +926,10 @@ ERROR: node is still EOpNull!
0:80 0.000000
0:130 Function Definition: VertexShaderFunction(vf2;vf2;vf2;vi2; (temp 2-component vector of float)
0:84 Function Parameters:
0:84 'inF0' (temp 2-component vector of float)
0:84 'inF1' (temp 2-component vector of float)
0:84 'inF2' (temp 2-component vector of float)
0:84 'inI0' (temp 2-component vector of int)
0:84 'inF0' (in 2-component vector of float)
0:84 'inF1' (in 2-component vector of float)
0:84 'inF2' (in 2-component vector of float)
0:84 'inI0' (in 2-component vector of int)
0:? Sequence
0:87 Constant:
0:87 0.000000
......@@ -1011,10 +1011,10 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:175 Function Definition: VertexShaderFunction(vf3;vf3;vf3;vi3; (temp 3-component vector of float)
0:131 Function Parameters:
0:131 'inF0' (temp 3-component vector of float)
0:131 'inF1' (temp 3-component vector of float)
0:131 'inF2' (temp 3-component vector of float)
0:131 'inI0' (temp 3-component vector of int)
0:131 'inF0' (in 3-component vector of float)
0:131 'inF1' (in 3-component vector of float)
0:131 'inF2' (in 3-component vector of float)
0:131 'inI0' (in 3-component vector of int)
0:? Sequence
0:134 Constant:
0:134 0.000000
......@@ -1093,10 +1093,10 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:251 Function Definition: VertexShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:176 Function Parameters:
0:176 'inF0' (temp 4-component vector of float)
0:176 'inF1' (temp 4-component vector of float)
0:176 'inF2' (temp 4-component vector of float)
0:176 'inI0' (temp 4-component vector of int)
0:176 'inF0' (in 4-component vector of float)
0:176 'inF1' (in 4-component vector of float)
0:176 'inF2' (in 4-component vector of float)
0:176 'inI0' (in 4-component vector of int)
0:? Sequence
0:179 Constant:
0:179 0.000000
......@@ -1176,9 +1176,9 @@ ERROR: node is still EOpNull!
0:? 4.000000
0:259 Function Definition: VertexShaderFunction(mf22;mf22;mf22; (temp 2X2 matrix of float)
0:252 Function Parameters:
0:252 'inF0' (temp 2X2 matrix of float)
0:252 'inF1' (temp 2X2 matrix of float)
0:252 'inF2' (temp 2X2 matrix of float)
0:252 'inF0' (in 2X2 matrix of float)
0:252 'inF1' (in 2X2 matrix of float)
0:252 'inF2' (in 2X2 matrix of float)
0:? Sequence
0:254 Constant:
0:254 0.000000
......@@ -1238,9 +1238,9 @@ ERROR: node is still EOpNull!
0:? 2.000000
0:267 Function Definition: VertexShaderFunction(mf33;mf33;mf33; (temp 3X3 matrix of float)
0:260 Function Parameters:
0:260 'inF0' (temp 3X3 matrix of float)
0:260 'inF1' (temp 3X3 matrix of float)
0:260 'inF2' (temp 3X3 matrix of float)
0:260 'inF0' (in 3X3 matrix of float)
0:260 'inF1' (in 3X3 matrix of float)
0:260 'inF2' (in 3X3 matrix of float)
0:? Sequence
0:262 Constant:
0:262 0.000000
......@@ -1305,9 +1305,9 @@ ERROR: node is still EOpNull!
0:? 3.000000
0:274 Function Definition: VertexShaderFunction(mf44;mf44;mf44; (temp 4X4 matrix of float)
0:268 Function Parameters:
0:268 'inF0' (temp 4X4 matrix of float)
0:268 'inF1' (temp 4X4 matrix of float)
0:268 'inF2' (temp 4X4 matrix of float)
0:268 'inF0' (in 4X4 matrix of float)
0:268 'inF1' (in 4X4 matrix of float)
0:268 'inF2' (in 4X4 matrix of float)
0:? Sequence
0:270 Constant:
0:270 0.000000
......
Test/baseResults/hlsl.intrinsics.vert.out
This source diff could not be displayed because it is too large. You can view the blob instead.
Test/baseResults/hlsl.matType.frag.out
......@@ -8,8 +8,8 @@ gl_FragCoord origin is upper left
0:1 1.000000
0:11 Function Definition: ShaderFunction(vf1;f1; (temp 1-component vector of float)
0:9 Function Parameters:
0:9 'inFloat1' (temp 1-component vector of float)
0:9 'inScalar' (temp float)
0:9 'inFloat1' (in 1-component vector of float)
0:9 'inScalar' (in float)
0:? Linker Objects
0:? 'f1' (temp 1-component vector of float)
0:? 'fmat11' (temp 1X1 matrix of float)
......@@ -31,8 +31,8 @@ gl_FragCoord origin is upper left
0:1 1.000000
0:11 Function Definition: ShaderFunction(vf1;f1; (temp 1-component vector of float)
0:9 Function Parameters:
0:9 'inFloat1' (temp 1-component vector of float)
0:9 'inScalar' (temp float)
0:9 'inFloat1' (in 1-component vector of float)
0:9 'inScalar' (in float)
0:? Linker Objects
0:? 'f1' (temp 1-component vector of float)
0:? 'fmat11' (temp 1X1 matrix of float)
......
Test/baseResults/hlsl.max.frag.out
......@@ -4,13 +4,13 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: PixelShaderFunction(vf4;vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input1' (temp 4-component vector of float)
0:2 'input2' (temp 4-component vector of float)
0:2 'input1' (in 4-component vector of float)
0:2 'input2' (in 4-component vector of float)
0:? Sequence
0:3 Branch: Return with expression
0:3 max (global 4-component vector of float)
0:3 'input1' (temp 4-component vector of float)
0:3 'input2' (temp 4-component vector of float)
0:3 'input1' (in 4-component vector of float)
0:3 'input2' (in 4-component vector of float)
0:? Linker Objects
......@@ -22,13 +22,13 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: PixelShaderFunction(vf4;vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input1' (temp 4-component vector of float)
0:2 'input2' (temp 4-component vector of float)
0:2 'input1' (in 4-component vector of float)
0:2 'input2' (in 4-component vector of float)
0:? Sequence
0:3 Branch: Return with expression
0:3 max (global 4-component vector of float)
0:3 'input1' (temp 4-component vector of float)
0:3 'input2' (temp 4-component vector of float)
0:3 'input1' (in 4-component vector of float)
0:3 'input2' (in 4-component vector of float)
0:? Linker Objects
// Module Version 10000
......@@ -38,7 +38,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 9 11
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -48,11 +48,11 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
8: TypePointer Input 7(fvec4)
9(input1): 8(ptr) Variable Input
11(input2): 8(ptr) Variable Input
4(PixelShaderFunction): 2 Function None 3
5: Label
9(input1): 8(ptr) Variable Function
11(input2): 8(ptr) Variable Function
10: 7(fvec4) Load 9(input1)
12: 7(fvec4) Load 11(input2)
13: 7(fvec4) ExtInst 1(GLSL.std.450) 40(FMax) 10 12
......
Test/baseResults/hlsl.precedence.frag.out
......@@ -4,19 +4,19 @@ gl_FragCoord origin is upper left
0:? Sequence
0:10 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vf4; (temp 4-component vector of float)
0:7 Function Parameters:
0:7 'a1' (temp 4-component vector of float)
0:7 'a2' (temp 4-component vector of float)
0:7 'a3' (temp 4-component vector of float)
0:7 'a4' (temp 4-component vector of float)
0:7 'a1' (in 4-component vector of float)
0:7 'a2' (in 4-component vector of float)
0:7 'a3' (in 4-component vector of float)
0:7 'a4' (in 4-component vector of float)
0:? Sequence
0:8 Branch: Return with expression
0:8 add (temp 4-component vector of float)
0:8 add (temp 4-component vector of float)
0:8 'a1' (temp 4-component vector of float)
0:8 'a1' (in 4-component vector of float)
0:8 component-wise multiply (temp 4-component vector of float)
0:8 'a2' (temp 4-component vector of float)
0:8 'a3' (temp 4-component vector of float)
0:8 'a4' (temp 4-component vector of float)
0:8 'a2' (in 4-component vector of float)
0:8 'a3' (in 4-component vector of float)
0:8 'a4' (in 4-component vector of float)
0:? Linker Objects
......@@ -28,19 +28,19 @@ gl_FragCoord origin is upper left
0:? Sequence
0:10 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vf4; (temp 4-component vector of float)
0:7 Function Parameters:
0:7 'a1' (temp 4-component vector of float)
0:7 'a2' (temp 4-component vector of float)
0:7 'a3' (temp 4-component vector of float)
0:7 'a4' (temp 4-component vector of float)
0:7 'a1' (in 4-component vector of float)
0:7 'a2' (in 4-component vector of float)
0:7 'a3' (in 4-component vector of float)
0:7 'a4' (in 4-component vector of float)
0:? Sequence
0:8 Branch: Return with expression
0:8 add (temp 4-component vector of float)
0:8 add (temp 4-component vector of float)
0:8 'a1' (temp 4-component vector of float)
0:8 'a1' (in 4-component vector of float)
0:8 component-wise multiply (temp 4-component vector of float)
0:8 'a2' (temp 4-component vector of float)
0:8 'a3' (temp 4-component vector of float)
0:8 'a4' (temp 4-component vector of float)
0:8 'a2' (in 4-component vector of float)
0:8 'a3' (in 4-component vector of float)
0:8 'a4' (in 4-component vector of float)
0:? Linker Objects
// Module Version 10000
......@@ -50,7 +50,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 9 11 13 17
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -62,13 +62,13 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
8: TypePointer Input 7(fvec4)
9(a1): 8(ptr) Variable Input
11(a2): 8(ptr) Variable Input
13(a3): 8(ptr) Variable Input
17(a4): 8(ptr) Variable Input
4(PixelShaderFunction): 2 Function None 3
5: Label
9(a1): 8(ptr) Variable Function
11(a2): 8(ptr) Variable Function
13(a3): 8(ptr) Variable Function
17(a4): 8(ptr) Variable Function
10: 7(fvec4) Load 9(a1)
12: 7(fvec4) Load 11(a2)
14: 7(fvec4) Load 13(a3)
......
Test/baseResults/hlsl.precedence2.frag.out
......@@ -4,27 +4,27 @@ gl_FragCoord origin is upper left
0:? Sequence
0:10 Function Definition: PixelShaderFunction(i1;i1;i1;i1; (temp int)
0:7 Function Parameters:
0:7 'a1' (temp int)
0:7 'a2' (temp int)
0:7 'a3' (temp int)
0:7 'a4' (temp int)
0:7 'a1' (in int)
0:7 'a2' (in int)
0:7 'a3' (in int)
0:7 'a4' (in int)
0:? Sequence
0:8 Branch: Return with expression
0:8 add (temp int)
0:8 left-shift (temp int)
0:8 add (temp int)
0:8 component-wise multiply (temp int)
0:8 'a1' (temp int)
0:8 'a2' (temp int)
0:8 'a3' (temp int)
0:8 'a4' (temp int)
0:8 'a1' (in int)
0:8 'a2' (in int)
0:8 'a3' (in int)
0:8 'a4' (in int)
0:8 left-shift (temp int)
0:8 'a1' (temp int)
0:8 'a1' (in int)
0:8 add (temp int)
0:8 'a2' (temp int)
0:8 'a2' (in int)
0:8 component-wise multiply (temp int)
0:8 'a3' (temp int)
0:8 'a4' (temp int)
0:8 'a3' (in int)
0:8 'a4' (in int)
0:? Linker Objects
......@@ -36,27 +36,27 @@ gl_FragCoord origin is upper left
0:? Sequence
0:10 Function Definition: PixelShaderFunction(i1;i1;i1;i1; (temp int)
0:7 Function Parameters:
0:7 'a1' (temp int)
0:7 'a2' (temp int)
0:7 'a3' (temp int)
0:7 'a4' (temp int)
0:7 'a1' (in int)
0:7 'a2' (in int)
0:7 'a3' (in int)
0:7 'a4' (in int)
0:? Sequence
0:8 Branch: Return with expression
0:8 add (temp int)
0:8 left-shift (temp int)
0:8 add (temp int)
0:8 component-wise multiply (temp int)
0:8 'a1' (temp int)
0:8 'a2' (temp int)
0:8 'a3' (temp int)
0:8 'a4' (temp int)
0:8 'a1' (in int)
0:8 'a2' (in int)
0:8 'a3' (in int)
0:8 'a4' (in int)
0:8 left-shift (temp int)
0:8 'a1' (temp int)
0:8 'a1' (in int)
0:8 add (temp int)
0:8 'a2' (temp int)
0:8 'a2' (in int)
0:8 component-wise multiply (temp int)
0:8 'a3' (temp int)
0:8 'a4' (temp int)
0:8 'a3' (in int)
0:8 'a4' (in int)
0:? Linker Objects
// Module Version 10000
......@@ -66,7 +66,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 8 10 13 16
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -77,13 +77,13 @@ gl_FragCoord origin is upper left
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
7: TypePointer Function 6(int)
7: TypePointer Input 6(int)
8(a1): 7(ptr) Variable Input
10(a2): 7(ptr) Variable Input
13(a3): 7(ptr) Variable Input
16(a4): 7(ptr) Variable Input
4(PixelShaderFunction): 2 Function None 3
5: Label
8(a1): 7(ptr) Variable Function
10(a2): 7(ptr) Variable Function
13(a3): 7(ptr) Variable Function
16(a4): 7(ptr) Variable Function
9: 6(int) Load 8(a1)
11: 6(int) Load 10(a2)
12: 6(int) IMul 9 11
......
Test/baseResults/hlsl.scope.frag.out
......@@ -4,7 +4,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:31 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:4 'x' (temp int)
0:? Sequence
......@@ -48,7 +48,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:31 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:4 'x' (temp int)
0:? Sequence
......
Test/baseResults/hlsl.sin.frag.out
......@@ -4,11 +4,11 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Branch: Return with expression
0:3 sine (global 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:? Linker Objects
......@@ -20,11 +20,11 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Branch: Return with expression
0:3 sine (global 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:? Linker Objects
// Module Version 10000
......@@ -34,7 +34,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 9
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -43,10 +43,10 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
8: TypePointer Input 7(fvec4)
9(input): 8(ptr) Variable Input
4(PixelShaderFunction): 2 Function None 3
5: Label
9(input): 8(ptr) Variable Function
10: 7(fvec4) Load 9(input)
11: 7(fvec4) ExtInst 1(GLSL.std.450) 13(Sin) 10
ReturnValue 11
......
Test/baseResults/hlsl.struct.frag.out
......@@ -4,13 +4,13 @@ gl_FragCoord origin is upper left
0:? Sequence
0:39 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:31 Function Parameters:
0:31 'input' (temp 4-component vector of float)
0:31 'input' (in 4-component vector of float)
0:? Sequence
0:36 Compare Equal (temp bool)
0:36 's3' (temp structure{temp 3-component vector of bool b3})
0:36 's3' (temp structure{temp 3-component vector of bool b3})
0:38 Branch: Return with expression
0:38 'input' (temp 4-component vector of float)
0:38 'input' (in 4-component vector of float)
0:? Linker Objects
0:? 's1' (temp structure{temp bool b, temp bool c, temp 4-component vector of float a, temp 4-component vector of float d})
0:? 's2' (temp structure{temp 4-component vector of float i})
......@@ -25,13 +25,13 @@ gl_FragCoord origin is upper left
0:? Sequence
0:39 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:31 Function Parameters:
0:31 'input' (temp 4-component vector of float)
0:31 'input' (in 4-component vector of float)
0:? Sequence
0:36 Compare Equal (temp bool)
0:36 's3' (temp structure{temp 3-component vector of bool b3})
0:36 's3' (temp structure{temp 3-component vector of bool b3})
0:38 Branch: Return with expression
0:38 'input' (temp 4-component vector of float)
0:38 'input' (in 4-component vector of float)
0:? Linker Objects
0:? 's1' (temp structure{temp bool b, temp bool c, temp 4-component vector of float a, temp 4-component vector of float d})
0:? 's2' (temp structure{temp 4-component vector of float i})
......@@ -44,7 +44,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 20
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -81,7 +81,8 @@ gl_FragCoord origin is upper left
9: TypePointer Function 8(FS)
17: TypeFloat 32
18: TypeVector 17(float) 4
19: TypePointer Function 18(fvec4)
19: TypePointer Input 18(fvec4)
20(input): 19(ptr) Variable Input
23(myS): TypeStruct 6(bool) 6(bool) 18(fvec4) 18(fvec4)
24: TypePointer Function 23(myS)
26: TypeStruct 18(fvec4)
......@@ -92,7 +93,6 @@ gl_FragCoord origin is upper left
4(PixelShaderFunction): 2 Function None 3
5: Label
10(s3): 9(ptr) Variable Function
20(input): 19(ptr) Variable Function
25(s1): 24(ptr) Variable Function
28(s2): 27(ptr) Variable Function
32(s4): 31(ptr) Variable Function
......
Test/baseResults/hlsl.void.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:8 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:5 Function Parameters:
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:? Sequence
0:6 Function Call: foo1( (temp void)
0:7 Function Call: foo2( (temp void)
......@@ -27,7 +27,7 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:8 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:5 Function Parameters:
0:5 'input' (temp 4-component vector of float)
0:5 'input' (in 4-component vector of float)
0:? Sequence
0:6 Function Call: foo1( (temp void)
0:7 Function Call: foo2( (temp void)
......
Test/baseResults/hlsl.whileLoop.frag.out
......@@ -4,17 +4,17 @@ gl_FragCoord origin is upper left
0:? Sequence
0:8 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Loop with condition tested first
0:3 Loop Condition
0:3 Compare Not Equal (temp bool)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 Loop Body
0:? Sequence
0:3 Branch: Return with expression
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:4 Loop with condition tested first
0:4 Loop Condition
0:4 Constant:
......@@ -41,17 +41,17 @@ gl_FragCoord origin is upper left
0:? Sequence
0:8 Function Definition: PixelShaderFunction(vf4; (temp 4-component vector of float)
0:2 Function Parameters:
0:2 'input' (temp 4-component vector of float)
0:2 'input' (in 4-component vector of float)
0:? Sequence
0:3 Loop with condition tested first
0:3 Loop Condition
0:3 Compare Not Equal (temp bool)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:3 Loop Body
0:? Sequence
0:3 Branch: Return with expression
0:3 'input' (temp 4-component vector of float)
0:3 'input' (in 4-component vector of float)
0:4 Loop with condition tested first
0:4 Loop Condition
0:4 Constant:
......@@ -76,7 +76,7 @@ gl_FragCoord origin is upper left
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction"
EntryPoint Fragment 4 "PixelShaderFunction" 14
ExecutionMode 4 OriginUpperLeft
Source HLSL 450
Name 4 "PixelShaderFunction"
......@@ -85,13 +85,13 @@ gl_FragCoord origin is upper left
3: TypeFunction 2
11: TypeFloat 32
12: TypeVector 11(float) 4
13: TypePointer Function 12(fvec4)
13: TypePointer Input 12(fvec4)
14(input): 13(ptr) Variable Input
17: TypeBool
18: TypeVector 17(bool) 4
28: 17(bool) ConstantFalse
4(PixelShaderFunction): 2 Function None 3
5: Label
14(input): 13(ptr) Variable Function
Branch 6
6: Label
LoopMerge 8 9 None
......
hlsl/hlslGrammar.cpp
......@@ -785,6 +785,8 @@ bool HlslGrammar::acceptParameterDeclaration(TFunction& function)
acceptPostDecls(*type);
parseContext.paramFix(*type);
TParameter param = { idToken.string, type };
function.addParameter(param);
......
hlsl/hlslParseHelper.cpp
......@@ -717,6 +717,11 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l
functionReturnsValue = false;
inEntrypoint = (function.getName() == intermediate.getEntryPoint().c_str());
if (inEntrypoint) {
// parameters are actually shader-level inputs
for (int i = 0; i < function.getParamCount(); i++)
function[i].type->getQualifier().storage = EvqVaryingIn;
}
//
// New symbol table scope for body of function plus its arguments
......@@ -2356,42 +2361,21 @@ void HlslParseContext::redeclareBuiltinBlock(const TSourceLoc& loc, TTypeList& n
intermediate.addSymbolLinkageNode(linkage, *block);
}
void HlslParseContext::paramCheckFix(const TSourceLoc& loc, const TStorageQualifier& qualifier, TType& type)
void HlslParseContext::paramFix(TType& type)
{
switch (qualifier) {
switch (type.getQualifier().storage) {
case EvqConst:
case EvqConstReadOnly:
type.getQualifier().storage = EvqConstReadOnly;
break;
case EvqIn:
case EvqOut:
case EvqInOut:
type.getQualifier().storage = qualifier;
break;
case EvqGlobal:
case EvqTemporary:
type.getQualifier().storage = EvqIn;
break;
default:
type.getQualifier().storage = EvqIn;
error(loc, "storage qualifier not allowed on function parameter", GetStorageQualifierString(qualifier), "");
break;
}
}
void HlslParseContext::paramCheckFix(const TSourceLoc& loc, const TQualifier& qualifier, TType& type)
{
if (qualifier.isMemory()) {
type.getQualifier().volatil = qualifier.volatil;
type.getQualifier().coherent = qualifier.coherent;
type.getQualifier().readonly = qualifier.readonly;
type.getQualifier().writeonly = qualifier.writeonly;
type.getQualifier().restrict = qualifier.restrict;
}
paramCheckFix(loc, qualifier.storage, type);
}
void HlslParseContext::specializationCheck(const TSourceLoc& loc, const TType& type, const char* op)
{
if (type.containsSpecializationSize())
......
hlsl/hlslParseHelper.h
......@@ -116,8 +116,7 @@ public:
int computeSamplerTypeIndex(TSampler&);
TSymbol* redeclareBuiltinVariable(const TSourceLoc&, const TString&, const TQualifier&, const TShaderQualifiers&, bool& newDeclaration);
void redeclareBuiltinBlock(const TSourceLoc&, TTypeList& typeList, const TString& blockName, const TString* instanceName, TArraySizes* arraySizes);
void paramCheckFix(const TSourceLoc&, const TStorageQualifier&, TType& type);
void paramCheckFix(const TSourceLoc&, const TQualifier&, TType& type);
void paramFix(TType& type);
void specializationCheck(const TSourceLoc&, const TType&, const char* op);
void setLayoutQualifier(const TSourceLoc&, TPublicType&, TString&);
......
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