From fcac02e405661de311b5ceebbd6d3e2c78bf8aea Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 21 Aug 2020 16:04:42 -0400 Subject: Vulkan update/NVAPI support (#1511) * 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. --- tools/gfx/nvapi/nvapi-include.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tools/gfx/nvapi/nvapi-include.h (limited to 'tools/gfx/nvapi/nvapi-include.h') diff --git a/tools/gfx/nvapi/nvapi-include.h b/tools/gfx/nvapi/nvapi-include.h new file mode 100644 index 000000000..e3674af95 --- /dev/null +++ b/tools/gfx/nvapi/nvapi-include.h @@ -0,0 +1,19 @@ +// nvapi-include.h +#pragma once + +// A helper that makes the NVAPI available across targets + +#ifdef GFX_NVAPI +// On windows if we include NVAPI, we must include windows.h first + +# ifdef _WIN32 +# define WIN32_LEAN_AND_MEAN +# define NOMINMAX +# include +# undef WIN32_LEAN_AND_MEAN +# undef NOMINMAX +# endif + +# include +#endif + -- cgit v1.2.3