mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-17 02:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d12: Fix mipmap data

Browse Source
This commit is contained in:
vlj 2015-06-16 21:41:27 +02:00 committed by Vincent Lejeune
parent 178d0e0e85
commit eda3c9084e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp
View File

@ -334,8 +334,6 @@ ID3D12Resource *uploadSingleTexture(
size_t currentHeight = heightInBlocks, currentWidth = widthInBlocks;
unsigned tmp = texture.GetMipmap();
if (tmp > 1)
printf("here");
for (unsigned mipLevel = 0; mipLevel < texture.GetMipmap(); mipLevel++)
{
MipmapLevelInfo currentMipmapLevelInfo = {};
@ -366,7 +364,7 @@ ID3D12Resource *uploadSingleTexture(
dst[(row * currentMipmapLevelInfo.rowPitch / 4) + j] = src[LinearToSwizzleAddress(j, row, 0, log2width, log2height, 0)];
}
else
memcpy((char*)textureData + offsetInDst + row * currentMipmapLevelInfo.rowPitch, (char*)pixels + offsetInSrc + row * currentWidth * blockSizeInByte, currentWidth * blockSizeInByte);
memcpy((char*)textureData + offsetInDst + row * currentMipmapLevelInfo.rowPitch, (char*)pixels + offsetInSrc + row * widthInBlocks * blockSizeInByte, currentWidth * blockSizeInByte);
break;
}
case CELL_GCM_TEXTURE_A4R4G4B4:
@ -404,7 +402,7 @@ ID3D12Resource *uploadSingleTexture(
}
offsetInDst += currentHeight * currentMipmapLevelInfo.rowPitch;
offsetInDst = powerOf2Align(offsetInDst, 256);
offsetInSrc += currentHeight * currentWidth * blockSizeInByte;
offsetInSrc += currentHeight * widthInBlocks * blockSizeInByte;
mipinfos.push_back(currentMipmapLevelInfo);
currentHeight /= 2;
currentWidth /= 2;