fixing clang build

This commit is contained in:
Martins Mozeiko
2024-01-25 11:10:34 -08:00
committed by Ryan Fleury
parent fc9449a2d5
commit 644a94d5ef
2 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -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 ------------------------------------------------
+2 -2
View File
@@ -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] =