From e84ecf6ee8288c614a5944115caef904495f68e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Wed, 24 Jun 2015 10:20:01 -0700 Subject: [PATCH] Fixed MSVC warning. --- src/renderer_d3d11.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index e39e4d5d8..6a8fc693e 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -49,7 +49,10 @@ namespace bgfx { namespace d3d11 uint32_t m_zero[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; }; + BX_PRAGMA_DIAGNOSTIC_PUSH(); + BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4268) // warning C4268: '' : 'const' static/global data initialized with compiler generated default constructor fills the object with zeros static const Zero s_zero; + BX_PRAGMA_DIAGNOSTIC_POP(); static const uint32_t s_checkMsaa[] = { @@ -1999,8 +2002,8 @@ BX_PRAGMA_DIAGNOSTIC_POP(); drt->DestBlendAlpha = s_blendFactor[dstA][1]; drt->BlendOpAlpha = s_blendEquation[equA]; - uint8_t writeMask = (_state&BGFX_STATE_ALPHA_WRITE) - ? D3D11_COLOR_WRITE_ENABLE_ALPHA + uint8_t writeMask = (_state&BGFX_STATE_ALPHA_WRITE) + ? D3D11_COLOR_WRITE_ENABLE_ALPHA : 0 ; writeMask |= (_state&BGFX_STATE_RGB_WRITE)