From 4d24f55226870055c8dcbb3409efc5355da134d7 Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Thu, 20 Apr 2023 20:06:37 +0800
Subject: Changes for vkd3d proton (#2813)

* Add some caches to .gitignore

* Remove appendWideChars

Use String::toWString instead

* s/Sleep/sleepCurrentThread

* formatting

* Expand set of shared libraries which have buggy dlclose

Work around
https://github.com/microsoft/DirectXShaderCompiler/issues/5119 and
https://github.com/doitsujin/dxvk/issues/3330 libdxcompiler.so invokes
UB on dlclose, the dxvk libs break GDB when closed

* Add assert for specialization failure on DX11

As a band aid for https://github.com/shader-slang/slang/issues/2805

* More fine grained selection of directx features
---
 tools/gfx/d3d12/d3d12-device.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools/gfx/d3d12/d3d12-device.cpp')

diff --git a/tools/gfx/d3d12/d3d12-device.cpp b/tools/gfx/d3d12/d3d12-device.cpp
index ad71388c4..f00b4d8e0 100644
--- a/tools/gfx/d3d12/d3d12-device.cpp
+++ b/tools/gfx/d3d12/d3d12-device.cpp
@@ -463,6 +463,7 @@ Result DeviceImpl::initialize(const Desc& desc)
         return SLANG_FAIL;
     }
 
+#if SLANG_ENABLE_PIX
     HMODULE pixModule = LoadLibraryW(L"WinPixEventRuntime.dll");
     if (pixModule)
     {
@@ -471,6 +472,7 @@ Result DeviceImpl::initialize(const Desc& desc)
         m_EndEventOnCommandList =
             (PFN_EndEventOnCommandList)GetProcAddress(pixModule, "PIXEndEventOnCommandList");
     }
+#endif
 
     if (ENABLE_DEBUG_LAYER || isGfxDebugLayerEnabled())
     {
-- 
cgit v1.2.3