From b46b8d96cfcd25db1c297281bb18fb5d511c961c Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 10 Jan 2025 11:29:28 +0000
Subject: [PATCH] Prefer using custom D3D12/ local dxcompiler.dll in demos
 project

---
 util/test/demos/d3d12/d3d12_test.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/util/test/demos/d3d12/d3d12_test.cpp b/util/test/demos/d3d12/d3d12_test.cpp
index def069a26..ee1f14d48 100644
--- a/util/test/demos/d3d12/d3d12_test.cpp
+++ b/util/test/demos/d3d12/d3d12_test.cpp
@@ -273,7 +273,12 @@ void D3D12GraphicsTest::Prepare(int argc, char **argv)
       d3dcompiler = LoadLibraryA("d3dcompiler_44.dll");
     if(!d3dcompiler)
       d3dcompiler = LoadLibraryA("d3dcompiler_43.dll");
-    dxcompiler = LoadLibraryA("dxcompiler.dll");
+
+    // try loading dxcompiler from a local plugin folder first, since when building we copy the SDK
+    // version next to our exe and that may be old
+    dxcompiler = LoadLibraryA("D3D12/dxcompiler.dll");
+    if(!dxcompiler)
+      dxcompiler = LoadLibraryA("dxcompiler.dll");
 
     if(!d3d12)
     {