From 644a94d5ef905c3fa46c73fd37c837782e687c2f Mon Sep 17 00:00:00 2001 From: Martins Mozeiko Date: Thu, 25 Jan 2024 11:10:34 -0800 Subject: [PATCH] fixing clang build --- build.bat | 4 +++- src/render/d3d11/render_d3d11.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.bat b/build.bat index 130dbd30..ec33d9f8 100644 --- a/build.bat +++ b/build.bat @@ -60,6 +60,8 @@ if "%msvc%"=="1" set only_compile=/c if "%clang%"=="1" set only_compile=-c if "%msvc%"=="1" set EHsc=/EHsc if "%clang%"=="1" set EHsc= +if "%msvc%"=="1" set rc=rc.exe +if "%clang%"=="1" set rc=llvm-rc.exe :: --- Choose Compile/Link Lines ---------------------------------------------- if "%msvc%"=="1" set compile_debug=%cl_debug% @@ -79,7 +81,7 @@ if not exist local mkdir local :: --- Produce Logo Icon File ------------------------------------------------- pushd build -rc /nologo /fo logo.res ..\data\logo.rc +%rc% /nologo /fo logo.res ..\data\logo.rc || exit /b 1 popd :: --- Build & Run Metaprogram ------------------------------------------------ diff --git a/src/render/d3d11/render_d3d11.cpp b/src/render/d3d11/render_d3d11.cpp index cdd6ea66..0c031e28 100644 --- a/src/render/d3d11/render_d3d11.cpp +++ b/src/render/d3d11/render_d3d11.cpp @@ -1300,8 +1300,8 @@ r_window_submit(OS_Handle window, R_Handle window_equip, R_PassList *passes) U32 uniform_offset[Axis2_COUNT][2] = { - { 0 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 }, - { 1 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 }, + { 0 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, (U32)OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 }, + { 1 * sizeof(R_D3D11_Uniforms_BlurPass) / 16, (U32)OffsetOf(R_D3D11_Uniforms_Blur, kernel) / 16 }, }; U32 uniform_count[Axis2_COUNT][2] =