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

Tests: Fix #1372: Don't legalize runtests HLSL tests.

Browse Source 
We want these tests to be independent of whether SPIRV-opt is used.
This commit is contained in:
John Kessenich 2018-05-10 10:22:13 -06:00
parent fd9d9ef436
commit ecbd056b75
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Test/baseResults/compoundsuffix.frag.hlsl
View File

@ -1,7 +1,7 @@
compoundsuffix.frag.hlsl compoundsuffix.frag.hlsl
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80006 // Generated by (magic number): 80006
// Id's are bound by 21 // Id's are bound by 22
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
@ -10,18 +10,36 @@ compoundsuffix.frag.hlsl
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
Name 11 "@main(vf4;"
Name 10 "fragColor"
Name 15 "fragColor"
Name 16 "param"
Name 20 "fragColor" Name 20 "fragColor"
Decorate 20(fragColor) Location 0 Decorate 20(fragColor) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
7: TypeVector 6(float) 4 7: TypeVector 6(float) 4
8: TypePointer Function 7(fvec4)
9: TypeFunction 2 8(ptr)
13: 6(float) Constant 1065353216 13: 6(float) Constant 1065353216
14: 7(fvec4) ConstantComposite 13 13 13 13 14: 7(fvec4) ConstantComposite 13 13 13 13
19: TypePointer Output 7(fvec4) 19: TypePointer Output 7(fvec4)
20(fragColor): 19(ptr) Variable Output 20(fragColor): 19(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
Store 20(fragColor) 14 15(fragColor): 8(ptr) Variable Function
16(param): 8(ptr) Variable Function
17: 2 FunctionCall 11(@main(vf4;) 16(param)
18: 7(fvec4) Load 16(param)
Store 15(fragColor) 18
21: 7(fvec4) Load 15(fragColor)
Store 20(fragColor) 21
Return
FunctionEnd
11(@main(vf4;): 2 Function None 9
10(fragColor): 8(ptr) FunctionParameter
12: Label
Store 10(fragColor) 14
Return Return
FunctionEnd FunctionEnd

6
Test/runtests
View File

@ -77,11 +77,11 @@ fi
# Testing -S and compound suffixes # Testing -S and compound suffixes
# #
echo Running explicit stage test and compound suffix tests echo Running explicit stage test and compound suffix tests
$EXE -i -S vert nosuffix > $TARGETDIR/nosuffix.out $EXE -Od -i -S vert nosuffix > $TARGETDIR/nosuffix.out
diff -b $BASEDIR/nosuffix.out $TARGETDIR/nosuffix.out || HASERROR=1 diff -b $BASEDIR/nosuffix.out $TARGETDIR/nosuffix.out || HASERROR=1
$EXE -i compoundsuffix.vert.glsl > $TARGETDIR/compoundsuffix.vert.glsl $EXE -Od -i compoundsuffix.vert.glsl > $TARGETDIR/compoundsuffix.vert.glsl
diff -b $BASEDIR/compoundsuffix.vert.glsl $TARGETDIR/compoundsuffix.vert.glsl || HASERROR=1 diff -b $BASEDIR/compoundsuffix.vert.glsl $TARGETDIR/compoundsuffix.vert.glsl || HASERROR=1
$EXE -e main -H compoundsuffix.frag.hlsl > $TARGETDIR/compoundsuffix.frag.hlsl $EXE -Od -e main -H compoundsuffix.frag.hlsl > $TARGETDIR/compoundsuffix.frag.hlsl
diff -b $BASEDIR/compoundsuffix.frag.hlsl $TARGETDIR/compoundsuffix.frag.hlsl || HASERROR=1 diff -b $BASEDIR/compoundsuffix.frag.hlsl $TARGETDIR/compoundsuffix.frag.hlsl || HASERROR=1
# #