ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed writing of too much data.

This commit is contained in:
gibbed 2014-01-21 19:09:07 -08:00
parent 1091c171b2
commit 302111afbf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/gpu/d3d11/d3d11_graphics_driver.cc
View File

@ -1394,9 +1394,12 @@ int D3D11GraphicsDriver::FetchTexture2D(
memset(dest, 0, output_pitch * (output_height / info.block_size)); // TODO(gibbed): remove me later memset(dest, 0, output_pitch * (output_height / info.block_size)); // TODO(gibbed): remove me later
uint32_t block_width = logical_width / info.block_size;
uint32_t block_height = logical_height / info.block_size;
if (!fetch.tiled) { if (!fetch.tiled) {
dest = (uint8_t*)res.pData; dest = (uint8_t*)res.pData;
for (uint32_t y = 0; y < input_height / info.block_size; y++) { for (uint32_t y = 0; y < block_height; y++) {
for (uint32_t x = 0; x < logical_pitch; x += info.texel_pitch) { for (uint32_t x = 0; x < logical_pitch; x += info.texel_pitch) {
TextureSwap(dest + x, src + x, info.texel_pitch, (XE_GPU_ENDIAN)fetch.endianness); TextureSwap(dest + x, src + x, info.texel_pitch, (XE_GPU_ENDIAN)fetch.endianness);
} }
@ -1405,8 +1408,6 @@ int D3D11GraphicsDriver::FetchTexture2D(
} }
} }
else { else {
uint32_t block_width = logical_width / info.block_size;
uint32_t block_height = logical_height / info.block_size;
auto bpp = (info.texel_pitch >> 2) + ((info.texel_pitch >> 1) >> (info.texel_pitch >> 2)); auto bpp = (info.texel_pitch >> 2) + ((info.texel_pitch >> 1) >> (info.texel_pitch >> 2));
for (uint32_t y = 0, output_base_offset = 0; y < block_height; y++, output_base_offset += output_pitch) { for (uint32_t y = 0, output_base_offset = 0; y < block_height; y++, output_base_offset += output_pitch) {
auto input_base_offset = TiledOffset2DOuter(y, (input_width / info.block_size), bpp); auto input_base_offset = TiledOffset2DOuter(y, (input_width / info.block_size), bpp);