[D3D12] Fixed missing define in CMakeLists.txt script for DXC compiler.

CMake function add_definitions() only adds defines for the current subdirectory. LLGL_D3D12_ENABLE_DXCOMPILER is defined in LLGL_DXCommon build script, so it must be adopted in D3D12 backend explicitly.
LukasBanana · Jun 16, 2024 · f22c4dc · f22c4dc
1 parent 769497c
commit f22c4dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/sources/Renderer/DXCommon/DXC/DXCInstance.cpp b/sources/Renderer/DXCommon/DXC/DXCInstance.cpp
@@ -127,7 +127,7 @@ HRESULT DXCompileShaderToDxil(
     if (FAILED(hr))
         return hr;
 
-    return S_OK;
+    return compileResult;
 }
 
 HRESULT DXReflectDxilShader(

diff --git a/sources/Renderer/Direct3D12/CMakeLists.txt b/sources/Renderer/Direct3D12/CMakeLists.txt
@@ -65,6 +65,11 @@ source_group("Include\\Platform"            FILES ${FilesIncludeD3D12})
 # === Projects ===
 
 if(LLGL_BUILD_RENDERER_DIRECT3D12)
+    # Adopt define from LLGL_DXCommon lib
+    if(LLGL_D3D12_ENABLE_DXCOMPILER)
+        ADD_DEFINE(LLGL_D3D12_ENABLE_DXCOMPILER)
+    endif()
+
     # Direct3D 12 Renderer
     add_llgl_module(LLGL_Direct3D12 LLGL_BUILD_RENDERER_DIRECT3D12 "${FilesD3D12}")
     target_link_libraries(LLGL_Direct3D12 LLGL LLGL_DXCommon d3d12 dxgi D3DCompiler)