encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-16 00:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

sample: add a --fxc option to validate HLSL with FXC

Browse Source 
Change-Id: I39d684a71d9f985a1f30b871f08f51bdf50f17a1
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/56064
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
2021-06-28 12:02:17 +00:00
committed by Tint LUCI CQ
parent 1b1d963d7b
commit 3cbbeaf1db
3 changed files with 126 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
samples/main.cc
View File

@@ -65,6 +65,7 @@ struct Options {
std::vector<std::string> transforms;
bool use_fxc = false;
std::string dxc_path;
std::string xcrun_path;
};
@@ -95,8 +96,9 @@ const char kUsage[] = R"(Usage: tint [options] <input-file>
Affects AST dumping, and text-based output languages.
--dump-inspector-bindings -- Dump reflection data about bindins to stdout.
-h -- This help text
--validate -- Validates generated SPIR-V with spirv-val.
Has no effect on non-SPIRV outputs.
--validate -- Validates the generated shader
--fxc -- Ask to validate HLSL output using FXC instead of DXC.
When specified, automatically enables --validate
--dxc -- Path to DXC executable, used to validate HLSL output.
When specified, automatically enables --validate
--xcrun -- Path to xcrun executable, used to validate MSL output.
@@ -404,6 +406,9 @@ bool ParseArgs(const std::vector<std::string>& args, Options* opts) {
opts->dump_inspector_bindings = true;
} else if (arg == "--validate") {
opts->validate = true;
} else if (arg == "--fxc") {
opts->validate = true;
opts->use_fxc = true;
} else if (arg == "--dxc") {
++i;
if (i >= args.size()) {
@@ -872,20 +877,31 @@ int main(int argc, const char** argv) {
#endif
#if TINT_BUILD_HLSL_WRITER
case Format::kHlsl: {
auto dxc = tint::utils::Command::LookPath(
options.dxc_path.empty() ? "dxc" : options.dxc_path);
if (dxc.Found()) {
auto* w = static_cast<tint::writer::Text*>(writer.get());
auto hlsl = w->result();
auto res = tint::val::Hlsl(dxc.Path(), hlsl, program.get());
if (res.failed) {
validation_failed = true;
validation_msgs << res.source << std::endl;
validation_msgs << res.output;
}
auto* w = static_cast<tint::writer::Text*>(writer.get());
auto hlsl = w->result();
tint::val::Result res;
if (options.use_fxc) {
#ifdef _WIN32
res = tint::val::HlslUsingFXC(hlsl, program.get());
#else
res.failed = true;
res.output = "FXC can only be used on Windows. Sorry :X";
#endif // _WIN32
} else {
auto dxc = tint::utils::Command::LookPath(
options.dxc_path.empty() ? "dxc" : options.dxc_path);
if (dxc.Found()) {
res = tint::val::HlslUsingDXC(dxc.Path(), hlsl, program.get());
} else {
res.failed = true;
res.output = "DXC executable not found. Cannot validate";
}
}
if (res.failed) {
validation_failed = true;
validation_msgs << "DXC executable not found. Cannot validate";
validation_msgs << res.source << std::endl;
validation_msgs << res.output;
}
break;
}