diff options
| author | Yong He <yonghe@outlook.com> | 2021-08-17 09:39:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 09:39:02 -0700 |
| commit | 858c7c57b125afed9b5b2329d6b02477284e4803 (patch) | |
| tree | 49f67b342448dcfb19913d8ccc089d956de14462 /tools/render-test | |
| parent | 6406523511037987d8b8ab881aea41389afd57eb (diff) | |
Add GLSL450 intrinsics to SPIRV direct emit. (#1921)
* Add GLSL450 intrinsics to SPIRV direct emit.
* Fix.
* Fix compiler error.
* Fix.
* Fix compiler error.
* Make direct-spirv tests actually run.
Diffstat (limited to 'tools/render-test')
| -rw-r--r-- | tools/render-test/options.cpp | 4 | ||||
| -rw-r--r-- | tools/render-test/options.h | 2 | ||||
| -rw-r--r-- | tools/render-test/render-test-main.cpp | 2 | ||||
| -rw-r--r-- | tools/render-test/slang-support.cpp | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp index 5d3560351..a4a643e22 100644 --- a/tools/render-test/options.cpp +++ b/tools/render-test/options.cpp @@ -141,6 +141,10 @@ static gfx::DeviceType _toRenderType(Slang::RenderApiType apiType) { outOptions.useDXIL = true; } + else if (argValue == "-emit-spirv-directly") + { + outOptions.generateSPIRVDirectly = true; + } else if (argValue == "-only-startup") { outOptions.onlyStartup = true; diff --git a/tools/render-test/options.h b/tools/render-test/options.h index 7940d0d42..f41614360 100644 --- a/tools/render-test/options.h +++ b/tools/render-test/options.h @@ -73,6 +73,8 @@ struct Options Slang::DownstreamArgs downstreamArgs; ///< Args to downstream tools. Here it's just slang + bool generateSPIRVDirectly = false; + Options() { downstreamArgs.addName("slang"); } static SlangResult parse(int argc, const char*const* argv, Slang::WriterHelper stdError, Options& outOptions); diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp index 96cc94aa3..271356cc3 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -1326,6 +1326,8 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi desc.adapter = options.adapter.getBuffer(); desc.slang.lineDirectiveMode = SLANG_LINE_DIRECTIVE_MODE_NONE; + if (options.generateSPIRVDirectly) + desc.slang.targetFlags = SLANG_TARGET_FLAG_GENERATE_SPIRV_DIRECTLY; List<const char*> requiredFeatureList; for (auto& name : options.renderFeatures) diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp index a533a6378..65f8f244b 100644 --- a/tools/render-test/slang-support.cpp +++ b/tools/render-test/slang-support.cpp @@ -96,6 +96,8 @@ void ShaderCompilerUtil::Output::reset() spSetCodeGenTarget(slangRequest, input.target); spSetTargetProfile(slangRequest, 0, spFindProfile(out.session, input.profile.getBuffer())); + if (options.generateSPIRVDirectly) + spSetTargetFlags(slangRequest, 0, SLANG_TARGET_FLAG_GENERATE_SPIRV_DIRECTLY); // Define a macro so that shader code in a test can detect what language we // are nominally working with. |