diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 5c3f213b0..d0a3d48dd 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -7,7 +7,7 @@ #if BX_PLATFORM_WINDOWS // BK - Remotery needs WinSock, but on VS2015/Win10 build // fails if WinSock2 is included after Windows.h?! -# include +# include #endif // BX_PLATFORM_WINDOWS #include "bgfx_p.h" diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index 70b00aef9..01ce3fa15 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -4894,7 +4894,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); : 0 ; - bool depth = isDepth(TextureFormat::Enum(src.m_textureFormat) ); + bool depthStencil = isDepth(TextureFormat::Enum(src.m_textureFormat) ); deviceCtx->CopySubresourceRegion(dst.m_ptr , dstZ*dst.m_numMips+blit.m_dstMip , blit.m_dstX @@ -4902,7 +4902,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); , 0 , src.m_ptr , srcZ*src.m_numMips+blit.m_srcMip - , depth ? NULL : &box + , depthStencil ? NULL : &box ); } } diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index 30347818c..4af1030c6 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -4614,13 +4614,13 @@ data.NumQualityLevels = 0; D3D12_TEXTURE_COPY_LOCATION dstLocation = { dst.m_ptr, D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX, { dstZ*dst.m_numMips+blit.m_dstMip } }; D3D12_TEXTURE_COPY_LOCATION srcLocation = { src.m_ptr, D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX, { srcZ*src.m_numMips+blit.m_srcMip } }; - bool depth = isDepth(TextureFormat::Enum(src.m_textureFormat) ); + bool depthStencil = isDepth(TextureFormat::Enum(src.m_textureFormat) ); m_commandList->CopyTextureRegion(&dstLocation , blit.m_dstX , blit.m_dstY , 0 , &srcLocation - , depth ? NULL : &box + , depthStencil ? NULL : &box ); } }