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/d3d11/d3d11-helper-functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/gfx/d3d11/d3d11-helper-functions.cpp') diff --git a/tools/gfx/d3d11/d3d11-helper-functions.cpp b/tools/gfx/d3d11/d3d11-helper-functions.cpp index 4e1df9879..6774b7d93 100644 --- a/tools/gfx/d3d11/d3d11-helper-functions.cpp +++ b/tools/gfx/d3d11/d3d11-helper-functions.cpp @@ -337,7 +337,7 @@ namespace d3d11 default: assert(!"Unknown dimension"); } - descOut.Texture2DArray.ArraySize = max(textureDesc.size.depth, arraySize); + descOut.Texture2DArray.ArraySize = std::max(textureDesc.size.depth, arraySize); descOut.Texture2DArray.MostDetailedMip = 0; descOut.Texture2DArray.MipLevels = textureDesc.numMipLevels; descOut.Texture2DArray.FirstArraySlice = 0; -- cgit v1.2.3