xrRender: Clang is more strict with integer narrowing

OpenXRay · Oct 1, 2018 · b177189 · b177189
1 parent 5365fe6
commit b177189
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Layers/xrRender/dxConsoleRender.cpp b/src/Layers/xrRender/dxConsoleRender.cpp
@@ -14,7 +14,7 @@ void dxConsoleRender::OnRender(bool bGame)
 {
     VERIFY(HW.pDevice);
 
-    D3DRECT R = {0, 0, Device.dwWidth, Device.dwHeight};
+    D3DRECT R = {0, 0, static_cast<LONG>(Device.dwWidth), static_cast<LONG>(Device.dwHeight)};
     if (bGame)
         R.y2 /= 2;
 

diff --git a/src/Layers/xrRenderGL/glState.cpp b/src/Layers/xrRenderGL/glState.cpp
@@ -226,8 +226,8 @@ void glState::UpdateSamplerState(u32 stage, u32 name, u32 value)
         break;
     case D3DSAMP_BORDERCOLOR: /* D3DCOLOR */
     {
-        GLint color[] = {color_get_R(value), color_get_G(value), color_get_B(value), color_get_A(value)};
-        CHK_GL(glSamplerParameteriv(m_samplerArray[stage], GL_TEXTURE_BORDER_COLOR, color));
+        GLuint color[] = {color_get_R(value), color_get_G(value), color_get_B(value), color_get_A(value)};
+        CHK_GL(glSamplerParameterIuiv(m_samplerArray[stage], GL_TEXTURE_BORDER_COLOR, color));
     }
         break;
     case D3DSAMP_MAGFILTER: /* D3DTEXTUREFILTER filter to use for magnification */