From 67ca54997d445e15891965b8d77561b9d10bb18c Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Mon, 24 Aug 2020 14:26:27 -0400 Subject: NVAPI improvements (#1512) * First pass at incorporating nvapi into test harness. * D3d12 Atomic Float Add via NVAPI working * Dx12 atomic float appears to work. * Atomic float add on Dx12. * Added atomic64 feature addition to vk. Fix correct output for atomic-float-byte-address.slang * Disable atomic float failing tests. * Upgraded VK headers. * Detect atomic float availability on VK. * Try to get test working for in64 atomic. * Made HLSL prelude controlled via the render-test requirements. * Added -enable-nvapi to premake. * Fix D3D12Renderer when NVAPI is not available. * Small improvements to VKRenderer. * Improve atomic documentation in target-compatibility.md. * Fixed NVAPI working on D3D12. * Test for specific NVAPI features. * Remove requiredFeatures from Renderer::Desc as was ignored. Tried to document more around nvapiExtnSlot. * Readded requiredFeatures to Renderer::Desc * Improve comments in the tests. --- tools/render-test/options.cpp | 4 ++-- tools/render-test/options.h | 2 +- tools/render-test/render-test-main.cpp | 33 ++++++++++++++++----------------- 3 files changed, 19 insertions(+), 20 deletions(-) (limited to 'tools/render-test') diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp index fd4b75ed1..797439cfa 100644 --- a/tools/render-test/options.cpp +++ b/tools/render-test/options.cpp @@ -240,7 +240,7 @@ static SlangResult _setRendererType(RendererType type, const char* arg, Slang::W { outOptions.dontAddDefaultEntryPoints = true; } - else if (strcmp(arg, "-nvapi-register") == 0) + else if (strcmp(arg, "-nvapi-slot") == 0) { if (argCursor == argEnd) { @@ -248,7 +248,7 @@ static SlangResult _setRendererType(RendererType type, const char* arg, Slang::W return SLANG_FAIL; } - outOptions.nvapiRegister = (*argCursor++); + outOptions.nvapiExtnSlot = (*argCursor++); } else { diff --git a/tools/render-test/options.h b/tools/render-test/options.h index d311568d4..ddb903a4a 100644 --- a/tools/render-test/options.h +++ b/tools/render-test/options.h @@ -75,7 +75,7 @@ struct Options uint32_t computeDispatchSize[3] = { 1, 1, 1 }; - Slang::String nvapiRegister; ///< The nvapiRegister to use. + Slang::String nvapiExtnSlot; ///< The nvapiRegister to use. 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 e7356901d..25486c722 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -12,6 +12,7 @@ #include "shader-renderer-util.h" #include "../source/core/slang-io.h" +#include "../source/core/slang-string-util.h" #include "core/slang-token-reader.h" @@ -406,7 +407,7 @@ Result RenderTestApp::update(Window* window) static SlangResult _setSessionPrelude(const Options& options, const char* exePath, SlangSession* session) { // Let's see if we need to set up special prelude for HLSL - if (options.nvapiRegister.getLength()) + if (options.nvapiExtnSlot.getLength()) { String rootPath; SLANG_RETURN_ON_FAIL(TestToolUtil::getRootPath(exePath, rootPath)); @@ -416,7 +417,7 @@ static SlangResult _setSessionPrelude(const Options& options, const char* exePat StringBuilder buf; // We have to choose a slot that NVAPI will use. - buf << "#define NV_SHADER_EXTN_SLOT " << options.nvapiRegister << "\n"; + buf << "#define NV_SHADER_EXTN_SLOT " << options.nvapiExtnSlot << "\n"; // Include the NVAPI header buf << "#include \"" << includePath << "\"\n\n"; @@ -589,13 +590,18 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi } } + Index nvapiExtnSlot = -1; + // Let's see if we need to set up special prelude for HLSL - if (options.nvapiRegister.getLength()) + if (options.nvapiExtnSlot.getLength() && options.nvapiExtnSlot[0] == 'u') { - // We require nvapi to be available on the device - if (options.renderFeatures.indexOf("nvapi") < 0) + // + Slang::Int value; + UnownedStringSlice slice = options.nvapiExtnSlot.getUnownedSlice(); + UnownedStringSlice indexText(slice.begin() + 1 , slice.end()); + if (SLANG_SUCCEEDED(StringUtil::parseInt(indexText, value))) { - options.renderFeatures.add("nvapi"); + nvapiExtnSlot = Index(value); } } @@ -716,16 +722,6 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi #endif } - if (options.nvapiRegister.getLength()) - { - // We require nvapi to be available on the device - if (options.renderFeatures.indexOf("nvapi") < 0) - { - options.renderFeatures.add("nvapi"); - } - } - - Slang::RefPtr renderer; { RendererUtil::CreateFunc createFunc = RendererUtil::getCreateFunc(options.rendererType); @@ -748,6 +744,7 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi desc.height = gWindowHeight; desc.adapter = options.adapter; desc.requiredFeatures = options.renderFeatures; + desc.nvapiExtnSlot = int(nvapiExtnSlot); window = renderer_test::Window::create(); SLANG_RETURN_ON_FAIL(window->initialize(gWindowWidth, gWindowHeight)); @@ -755,7 +752,9 @@ static SlangResult _innerMain(Slang::StdWriters* stdWriters, SlangSession* sessi SlangResult res = renderer->initialize(desc, window->getHandle()); if (SLANG_FAILED(res)) { - if (!options.onlyStartup) + // Returns E_NOT_AVAILABLE only when specified features are not available. + // Will cause to be ignored. + if (!options.onlyStartup && res != SLANG_E_NOT_AVAILABLE) { fprintf(stderr, "Unable to initialize renderer %s\n", rendererName.getBuffer()); } -- cgit v1.2.3