From 4c9c8a7a4d9b97fec6041a562638fbea521533ed Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 14 Apr 2023 17:08:18 +0800 Subject: Some small fixes with Windows/DX usage (#2797) * Correct case of windows.h includes * Use Slang::SharedLibrary to load directx dlls * s/max/std::max/ * Factor common OS code in calcHasApi * Add DXIL test for compute/simple * s/false/FALSE for calls to WinAPI functions * Factor common OS code in gfxGetAdapters * 2 missing headers d3d12sdklayers for ID3DDebug climits for UINT_MAX * Define out unused function on Linux * Only try to load Vulkan and CUDA on Windows or Linux * simplify D3DUtil::getDxgiModule * Remove WIN32_LEAN_AND_MEAN &co from source files Add a global define * Set WIN32_LEAN_AND_MEAN &friends in headers Restore previous state also * regenerate vs projects --- tools/gfx-unit-test/gfx-test-texture-util.cpp | 3 +-- tools/gfx-unit-test/gfx-test-util.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'tools/gfx-unit-test') diff --git a/tools/gfx-unit-test/gfx-test-texture-util.cpp b/tools/gfx-unit-test/gfx-test-texture-util.cpp index ff1ef39d0..ed651475d 100644 --- a/tools/gfx-unit-test/gfx-test-texture-util.cpp +++ b/tools/gfx-unit-test/gfx-test-texture-util.cpp @@ -21,8 +21,7 @@ #if GFX_ENABLE_RENDERDOC_INTEGRATION # include "external/renderdoc_app.h" -# define WIN32_LEAN_AND_MEAN -# include +# include #endif using namespace Slang; diff --git a/tools/gfx-unit-test/gfx-test-util.cpp b/tools/gfx-unit-test/gfx-test-util.cpp index fcebdda9f..298283a4a 100644 --- a/tools/gfx-unit-test/gfx-test-util.cpp +++ b/tools/gfx-unit-test/gfx-test-util.cpp @@ -7,8 +7,7 @@ #if GFX_ENABLE_RENDERDOC_INTEGRATION # include "external/renderdoc_app.h" -# define WIN32_LEAN_AND_MEAN -# include +# include #endif using Slang::ComPtr; -- cgit v1.2.3