Branimir Karadžić 10 年之前
父節點
當前提交
347a86cbc0
共有 3 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      src/bgfx.cpp
  2. 2 2
      src/renderer_d3d11.cpp
  3. 2 2
      src/renderer_d3d12.cpp

+ 1 - 1
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 <WinSock2.h>
+#	include <winsock2.h>
 #endif // BX_PLATFORM_WINDOWS
 
 #include "bgfx_p.h"

+ 2 - 2
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
 								);
 						}
 					}

+ 2 - 2
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
 								);
 						}
 					}