Merge pull request #1114 from LoopDawg/validator-script
Add script to crank test shaders through spirv-val
diff --git a/.appveyor.yml b/.appveyor.yml
index d5c7225..33a6837 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@
os: Visual Studio 2013
platform:
- - Any CPU
+ - x64
configuration:
- Debug
@@ -39,3 +39,45 @@
test_script:
- ctest -C %CONFIGURATION% --output-on-failure
- cd ../Test && bash runtests
+ - cd ../build
+
+after_test:
+ # For debug build, the generated dll has a postfix "d" in its name.
+ - ps: >-
+ If ($env:configuration -Match "Debug") {
+ $env:SUFFIX="d"
+ } Else {
+ $env:SUFFIX=""
+ }
+ - cd install
+ # Zip all glslang artifacts for uploading and deploying
+ - 7z a glslang-master-windows-"%PLATFORM%"-"%CONFIGURATION%".zip
+ bin\glslangValidator.exe
+ include\glslang\*
+ include\SPIRV\*
+ lib\glslang%SUFFIX%.lib
+ lib\HLSL%SUFFIX%.lib
+ lib\OGLCompiler%SUFFIX%.lib
+ lib\OSDependent%SUFFIX%.lib
+ lib\SPIRV%SUFFIX%.lib
+ lib\SPVRemapper%SUFFIX%.lib
+ lib\SPIRV-Tools%SUFFIX%.lib
+ lib\SPIRV-Tools-opt%SUFFIX%.lib
+
+artifacts:
+ - path: build\install\*.zip
+ name: artifacts-zip
+
+deploy:
+ - provider: GitHub
+ auth_token:
+ secure: YglcSYdl0TylEa59H4K6lylBEDr586NAt2EMgZquSo+iuPrwgZQuJLPCoihSm9y6
+ release: master-tot
+ description: "Continuous build of the latest master branch by Appveyor and Travis CI"
+ artifact: artifacts-zip
+ draft: false
+ prerelease: false
+ force_update: true
+ on:
+ branch: master
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 6292a81..87d1f5b 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -268,7 +268,7 @@
//
// Process an optional binding base of one the forms:
// --argname [stage] base // base for stage (if given) or all stages (if not)
-// --argname [stage] [set base]... // set/base pairs: set the base for given binding set.
+// --argname [stage] [base set]... // set/base pairs: set the base for given binding set.
// Where stage is one of the forms accepted by FindLanguage, and base is an integer
//
@@ -293,8 +293,8 @@
if ((argc - arg) > 2 && isdigit(argv[arg+0][0]) && isdigit(argv[arg+1][0])) {
// Parse a per-set binding base
while ((argc - arg) > 2 && isdigit(argv[arg+0][0]) && isdigit(argv[arg+1][0])) {
- const int setNum = atoi(argv[arg++]);
const int baseNum = atoi(argv[arg++]);
+ const int setNum = atoi(argv[arg++]);
perSetBase[setNum] = baseNum;
}
} else {
@@ -821,7 +821,7 @@
// TODO: use a range based for loop here, when available in all environments.
for (auto i = baseBindingForSet[res][compUnit.stage].begin();
i != baseBindingForSet[res][compUnit.stage].end(); ++i)
- shader->setShiftBindingForSet(res, i->first, i->second);
+ shader->setShiftBindingForSet(res, i->second, i->first);
}
shader->setFlattenUniformArrays((Options & EOptionFlattenUniformArrays) != 0);
@@ -1302,24 +1302,24 @@
" Set descriptor set for all resources\n"
" --rsb [stage] type set binding synonym for --resource-set-binding\n"
" --shift-image-binding [stage] num base binding number for images (uav)\n"
- " --shift-image-binding [stage] [set num]... per-descriptor-set shift values\n"
+ " --shift-image-binding [stage] [num set]... per-descriptor-set shift values\n"
" --sib [stage] num synonym for --shift-image-binding\n"
" --shift-sampler-binding [stage] num base binding number for samplers\n"
- " --shift-sampler-binding [stage] [set num]... per-descriptor-set shift values\n"
+ " --shift-sampler-binding [stage] [num set]... per-descriptor-set shift values\n"
" --ssb [stage] num synonym for --shift-sampler-binding\n"
" --shift-ssbo-binding [stage] num base binding number for SSBOs\n"
- " --shift-ssbo-binding [stage] [set num]... per-descriptor-set shift values\n"
+ " --shift-ssbo-binding [stage] [num set]... per-descriptor-set shift values\n"
" --sbb [stage] num synonym for --shift-ssbo-binding\n"
" --shift-texture-binding [stage] num base binding number for textures\n"
- " --shift-texture-binding [stage] [set num]... per-descriptor-set shift values\n"
+ " --shift-texture-binding [stage] [num set]... per-descriptor-set shift values\n"
" --stb [stage] num synonym for --shift-texture-binding\n"
" --shift-uav-binding [stage] num base binding number for UAVs\n"
- " --shift-uav-binding [stage] [set num]... per-descriptor-set shift values\n"
+ " --shift-uav-binding [stage] [num set]... per-descriptor-set shift values\n"
" --suavb [stage] num synonym for --shift-uav-binding\n"
" --shift-UBO-binding [stage] num base binding number for UBOs\n"
- " --shift-UBO-binding [stage] [set num]... per-descriptor-set shift values\n"
+ " --shift-UBO-binding [stage] [num set]... per-descriptor-set shift values\n"
" --shift-cbuffer-binding [stage] num synonym for --shift-UBO-binding\n"
- " --shift-cbuffer-binding [stage] [set num]... per-descriptor-set shift values\n"
+ " --shift-cbuffer-binding [stage] [num set]... per-descriptor-set shift values\n"
" --sub [stage] num synonym for --shift-UBO-binding\n"
" --source-entrypoint <name> the given shader source function is\n"
" renamed to be the <name> given in -e\n"
diff --git a/Test/runtests b/Test/runtests
index 8e1135e..814210b 100755
--- a/Test/runtests
+++ b/Test/runtests
@@ -108,7 +108,7 @@
# Testing per-descriptor-set IO map shift
#
echo 'Testing per-descriptor-set IO map shift'
-$EXE -e main --hlsl-iomap --ssb 1 10 2 15 --stb 20 --stb 2 25 --suavb 30 --suavb 2 40 --sub 6 50 -i -q -D -V hlsl.shift.per-set.frag > $TARGETDIR/hlsl.shift.per-set.frag.out || HASERROR=1
+$EXE -e main --hlsl-iomap --ssb 10 1 15 2 --stb 20 --stb 25 2 --suavb 30 --suavb 40 2 --sub 50 6 -i -q -D -V hlsl.shift.per-set.frag > $TARGETDIR/hlsl.shift.per-set.frag.out || HASERROR=1
diff -b $BASEDIR/hlsl.shift.per-set.frag.out $TARGETDIR/hlsl.shift.per-set.frag.out || HASERROR=1
#
diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp
index d5229da..c8e954c 100644
--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -1667,8 +1667,8 @@
}
// Set binding base for given resource type for a given binding set.
-void TShader::setShiftBindingForSet(TResourceType res, unsigned int set, unsigned int base) {
- intermediate->setShiftBindingForSet(res, set, base);
+void TShader::setShiftBindingForSet(TResourceType res, unsigned int base, unsigned int set) {
+ intermediate->setShiftBindingForSet(res, base, set);
}
// Set binding base for sampler types
diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h
index 8495395..062eb1b 100644
--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -271,7 +271,7 @@
unsigned int getShiftBinding(TResourceType res) const { return shiftBinding[res]; }
- void setShiftBindingForSet(TResourceType res, unsigned int set, unsigned int shift)
+ void setShiftBindingForSet(TResourceType res, unsigned int shift, unsigned int set)
{
if (shift == 0) // ignore if there's no shift: it's a no-op.
return;
@@ -281,8 +281,8 @@
const char* name = getResourceName(res);
if (name != nullptr) {
processes.addProcess(name);
- processes.addArgument(set);
processes.addArgument(shift);
+ processes.addArgument(set);
}
}
diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
index f0990ad..6fadfbf 100644
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -368,7 +368,7 @@
void setShiftUavBinding(unsigned int base); // DEPRECATED: use setShiftBinding
void setShiftCbufferBinding(unsigned int base); // synonym for setShiftUboBinding
void setShiftSsboBinding(unsigned int base); // DEPRECATED: use setShiftBinding
- void setShiftBindingForSet(TResourceType res, unsigned int set, unsigned int base);
+ void setShiftBindingForSet(TResourceType res, unsigned int base, unsigned int set);
void setResourceSetBinding(const std::vector<std::string>& base);
void setAutoMapBindings(bool map);
void setAutoMapLocations(bool map);
