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

Fix debugInfo test to target vulkan1.1 as intended

Browse Source 
Fixes #2494
This commit is contained in:
Greg Fischer 2021-01-05 11:21:20 -07:00
parent 9325cc013e
commit e453088a8a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Test/baseResults/spv.debugInfo.1.1.frag.out
View File

@ -1,6 +1,4 @@
spv.debugInfo.frag spv.debugInfo.frag
error: SPIRV-Tools Validation Errors
error: Invalid SPIR-V binary version 1.3 for target environment SPIR-V 1.0 (under OpenGL 4.5 semantics).
// Module Version 10300 // Module Version 10300
// Generated by (magic number): 8000a // Generated by (magic number): 8000a
// Id's are bound by 124 // Id's are bound by 124
@ -9,7 +7,7 @@ error: Invalid SPIR-V binary version 1.3 for target environment SPIR-V 1.0 (unde
2: ExtInstImport "GLSL.std.450" 2: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 5 "main" 24 52 EntryPoint Fragment 5 "main" 24 52
ExecutionMode 5 OriginLowerLeft ExecutionMode 5 OriginUpperLeft
1: String "spv.debugInfo.frag" 1: String "spv.debugInfo.frag"
Source GLSL 450 1 "#version 450 Source GLSL 450 1 "#version 450
@ -83,9 +81,9 @@ void main()
ModuleProcessed "resource-set-binding 3" ModuleProcessed "resource-set-binding 3"
ModuleProcessed "auto-map-bindings" ModuleProcessed "auto-map-bindings"
ModuleProcessed "auto-map-locations" ModuleProcessed "auto-map-locations"
ModuleProcessed "client opengl100" ModuleProcessed "client vulkan100"
ModuleProcessed "target-env spirv1.3" ModuleProcessed "target-env spirv1.3"
ModuleProcessed "target-env opengl" ModuleProcessed "target-env vulkan1.1"
ModuleProcessed "relaxed-errors" ModuleProcessed "relaxed-errors"
ModuleProcessed "suppress-warnings" ModuleProcessed "suppress-warnings"
ModuleProcessed "hlsl-offsets" ModuleProcessed "hlsl-offsets"
@ -97,7 +95,6 @@ void main()
Decorate 54(ubuf) Block Decorate 54(ubuf) Block
Decorate 56 DescriptorSet 3 Decorate 56 DescriptorSet 3
Decorate 56 Binding 0 Decorate 56 Binding 0
Decorate 67(s2d) Location 0
Decorate 67(s2d) DescriptorSet 3 Decorate 67(s2d) DescriptorSet 3
Decorate 67(s2d) Binding 1 Decorate 67(s2d) Binding 1
3: TypeVoid 3: TypeVoid

2
Test/runtests
View File

@ -169,7 +169,7 @@ run -g --relaxed-errors --suppress-warnings --aml --amb --hlsl-offsets --nsf --s
-G -H spv.debugInfo.frag --rsb frag 3 > $TARGETDIR/spv.debugInfo.frag.out -G -H spv.debugInfo.frag --rsb frag 3 > $TARGETDIR/spv.debugInfo.frag.out
diff -b $BASEDIR/spv.debugInfo.frag.out $TARGETDIR/spv.debugInfo.frag.out || HASERROR=1 diff -b $BASEDIR/spv.debugInfo.frag.out $TARGETDIR/spv.debugInfo.frag.out || HASERROR=1
run -g -Od --target-env vulkan1.1 --relaxed-errors --suppress-warnings --aml --amb --hlsl-offsets --nsf --spirv-val \ run -g -Od --target-env vulkan1.1 --relaxed-errors --suppress-warnings --aml --amb --hlsl-offsets --nsf --spirv-val \
-G -H spv.debugInfo.frag --rsb frag 3 > $TARGETDIR/spv.debugInfo.1.1.frag.out -V -H spv.debugInfo.frag --rsb frag 3 > $TARGETDIR/spv.debugInfo.1.1.frag.out
diff -b $BASEDIR/spv.debugInfo.1.1.frag.out $TARGETDIR/spv.debugInfo.1.1.frag.out || HASERROR=1 diff -b $BASEDIR/spv.debugInfo.1.1.frag.out $TARGETDIR/spv.debugInfo.1.1.frag.out || HASERROR=1
run -g -D -Od -e newMain -g --amb --aml --fua --hlsl-iomap --nsf --spirv-val --sib 1 --ssb 2 --sbb 3 --stb 4 --suavb 5 --sub 6 \ run -g -D -Od -e newMain -g --amb --aml --fua --hlsl-iomap --nsf --spirv-val --sib 1 --ssb 2 --sbb 3 --stb 4 --suavb 5 --sub 6 \
--sep origMain -H -Od spv.hlslDebugInfo.vert --rsb vert t0 0 0 > $TARGETDIR/spv.hlslDebugInfo.frag.out --sep origMain -H -Od spv.hlslDebugInfo.vert --rsb vert t0 0 0 > $TARGETDIR/spv.hlslDebugInfo.frag.out