RPCSX/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/RPCSX/SPIRV-Tools.git synced 2024-11-24 03:49:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Respect --skip-validation in spirv-opt (#1887)

Browse Source 
Previously a field in OptimizerOptions was set for --skip-validation,
but the OptimizerOptions was never used when calling optimizer.Run().
This commit is contained in:
Lei Zhang 2018-09-12 13:41:50 -04:00 committed by GitHub
parent 324be76b9c
commit 0f4c772ee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/opt/opt.cpp
View File

@ -591,12 +591,13 @@ OptStatus ParseFlags(int argc, const char** argv,
int main(int argc, const char** argv) { int main(int argc, const char** argv) {
const char* in_file = nullptr; const char* in_file = nullptr;
const char* out_file = nullptr; const char* out_file = nullptr;
bool skip_validator = false;
spv_target_env target_env = kDefaultEnvironment; spv_target_env target_env = kDefaultEnvironment;
spvtools::ValidatorOptions validator_options; spvtools::ValidatorOptions validator_options;
spvtools::OptimizerOptions optimizer_options; spvtools::OptimizerOptions optimizer_options;
optimizer_options.set_validator_options(validator_options);
spvtools::Optimizer optimizer(target_env); spvtools::Optimizer optimizer(target_env);
optimizer.SetMessageConsumer(spvtools::utils::CLIMessageConsumer); optimizer.SetMessageConsumer(spvtools::utils::CLIMessageConsumer);
@ -619,8 +620,8 @@ int main(int argc, const char** argv) {
// By using the same vector as input and output, we save time in the case // By using the same vector as input and output, we save time in the case
// that there was no change. // that there was no change.
bool ok = optimizer.Run(binary.data(), binary.size(), &binary, bool ok =
validator_options, skip_validator); optimizer.Run(binary.data(), binary.size(), &binary, optimizer_options);
if (!WriteFile<uint32_t>(out_file, "wb", binary.data(), binary.size())) { if (!WriteFile<uint32_t>(out_file, "wb", binary.data(), binary.size())) {
return 1; return 1;