This commit is contained in:
Branimir Karadžić 2015-11-19 22:44:50 -08:00
parent 20e7e79763
commit 347a86cbc0
3 changed files with 5 additions and 5 deletions

View File

@ -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"

View File

@ -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
);
}
}

View File

@ -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
);
}
}