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

VideoCommon: Fix upper and lower depth bytes being switched when performing Z16L EFB copies (EFB to texture only). 

Fixes issue 4989.
Fixes issue 5056.
This commit is contained in:
NeoBrainX 2011-12-10 16:08:26 +01:00
parent c04c3bd9d3
commit 3d9c35f58e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
View File

@ -429,7 +429,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
float colmat[28] = {0}; float colmat[28] = {0};
float *const fConstAdd = colmat + 16; float *const fConstAdd = colmat + 16;
float *const ColorMask = colmat + 20; float *const ColorMask = colmat + 20;
ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 255.0f; ColorMask[0] = ColorMask[1] = ColorMask[2] = ColorMask[3] = 255.0f;
ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 255.0f; ColorMask[4] = ColorMask[5] = ColorMask[6] = ColorMask[7] = 1.0f / 255.0f;
unsigned int cbufid = -1; unsigned int cbufid = -1;
@ -437,7 +437,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
{ {
switch (dstFormat) switch (dstFormat)
{ {
case 0: // Z4 case 0: // Z4
colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1.0f; colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1.0f;
cbufid = 0; cbufid = 0;
break; break;
@ -447,7 +447,7 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
cbufid = 1; cbufid = 1;
break; break;
case 3: // Z16 case 3: // Z16
colmat[1] = colmat[5] = colmat[9] = colmat[12] = 1.0f; colmat[1] = colmat[5] = colmat[9] = colmat[12] = 1.0f;
cbufid = 24; cbufid = 24;
break; break;
@ -472,8 +472,10 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
cbufid = 5; cbufid = 5;
break; break;
case 12: // Z16L case 12: // Z16L - copy lower 16 depth bits
colmat[2] = colmat[6] = colmat[10] = colmat[13] = 1.0f; // expected to be used as an IA8 texture (upper 8 bits stored as intensity, lower 8 bits stored as alpha)
// Used e.g. in Zelda: Skyward Sword
colmat[1] = colmat[5] = colmat[9] = colmat[14] = 1.0f;
cbufid = 6; cbufid = 6;
break; break;
@ -483,7 +485,6 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
cbufid = 7; cbufid = 7;
break; break;
} }
} }
else if (isIntensity) else if (isIntensity)
{ {