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

HLSL: allow self-type cast (as no-op passthrough)

Browse Source 
Previously, casting an object of a struct type to an identical type
would produce an error.  This PR allows this case.

As a side-effect of the change, several self-type casts in existing
tests go away.  For example:

    0:10          Construct float ( temp float)
    0:10            'f' ( in float)

becomes this (without the unneeded constructor op):

    0:10          'f' ( in float)

For vector or array types this can result in somewhat less overall code.

Fixes: #1218
This commit is contained in:
LoopDawg
2018-05-17 13:03:12 -06:00
parent ebec909487
commit c59916710e
6 changed files with 205 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
Test/baseResults/hlsl.cast.frag.out
View File

@@ -9,8 +9,7 @@ gl_FragCoord origin is upper left
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' ( in 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' ( in 4-component vector of float)
@@ -47,8 +46,7 @@ gl_FragCoord origin is upper left
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' ( in 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' ( in 4-component vector of float)
@@ -73,62 +71,57 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80006
// Id's are bound by 39
// Id's are bound by 34
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "PixelShaderFunction" 32 35
EntryPoint Fragment 4 "PixelShaderFunction" 27 30
ExecutionMode 4 OriginUpperLeft
Source HLSL 500
Name 4 "PixelShaderFunction"
Name 11 "@PixelShaderFunction(vf4;"
Name 10 "input"
Name 30 "input"
Name 32 "input"
Name 35 "@entryPointOutput"
Name 36 "param"
Decorate 32(input) Location 0
Decorate 35(@entryPointOutput) Location 0
Name 25 "input"
Name 27 "input"
Name 30 "@entryPointOutput"
Name 31 "param"
Decorate 27(input) Location 0
Decorate 30(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
9: TypeFunction 7(fvec4) 8(ptr)
20: TypeInt 32 1
21: TypeVector 20(int) 4
25: 6(float) Constant 1067014160
26: 7(fvec4) ConstantComposite 25 25 25 25
31: TypePointer Input 7(fvec4)
32(input): 31(ptr) Variable Input
34: TypePointer Output 7(fvec4)
35(@entryPointOutput): 34(ptr) Variable Output
15: TypeInt 32 1
16: TypeVector 15(int) 4
20: 6(float) Constant 1067014160
21: 7(fvec4) ConstantComposite 20 20 20 20
26: TypePointer Input 7(fvec4)
27(input): 26(ptr) Variable Input
29: TypePointer Output 7(fvec4)
30(@entryPointOutput): 29(ptr) Variable Output
4(PixelShaderFunction): 2 Function None 3
5: Label
30(input): 8(ptr) Variable Function
36(param): 8(ptr) Variable Function
33: 7(fvec4) Load 32(input)
Store 30(input) 33
37: 7(fvec4) Load 30(input)
Store 36(param) 37
38: 7(fvec4) FunctionCall 11(@PixelShaderFunction(vf4;) 36(param)
Store 35(@entryPointOutput) 38
25(input): 8(ptr) Variable Function
31(param): 8(ptr) Variable Function
28: 7(fvec4) Load 27(input)
Store 25(input) 28
32: 7(fvec4) Load 25(input)
Store 31(param) 32
33: 7(fvec4) FunctionCall 11(@PixelShaderFunction(vf4;) 31(param)
Store 30(@entryPointOutput) 33
Return
FunctionEnd
11(@PixelShaderFunction(vf4;): 7(fvec4) Function None 9
10(input): 8(ptr) FunctionParameter
12: Label
13: 7(fvec4) Load 10(input)
14: 6(float) CompositeExtract 13 0
15: 6(float) CompositeExtract 13 1
16: 6(float) CompositeExtract 13 2
17: 6(float) CompositeExtract 13 3
18: 7(fvec4) CompositeConstruct 14 15 16 17
19: 7(fvec4) Load 10(input)
22: 21(ivec4) ConvertFToS 19
23: 7(fvec4) ConvertSToF 22
24: 7(fvec4) FAdd 18 23
27: 7(fvec4) FAdd 24 26
ReturnValue 27
14: 7(fvec4) Load 10(input)
17: 16(ivec4) ConvertFToS 14
18: 7(fvec4) ConvertSToF 17
19: 7(fvec4) FAdd 13 18
22: 7(fvec4) FAdd 19 21
ReturnValue 22
FunctionEnd