summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/TextureDecoder.cpp
diff options
context:
space:
mode:
authordonkopunchstania <donkopunchstania@gmail.com>2009-11-15 20:14:03 +0000
committerdonkopunchstania <donkopunchstania@gmail.com>2009-11-15 20:14:03 +0000
commitf992fc694938098596c893bef206a9980504f0ee (patch)
treef399e7829e0669341a277e7bad0eda9f014f4798 /Source/Core/VideoCommon/Src/TextureDecoder.cpp
parent9c03de8790321815fe404072df20be5820ed6e46 (diff)
EFB to RAM in OGL and software plugin now work correctly when texture in RAM is a different size than the source. Corrected some block heights in texture decoder to fix copying certain EFB formats.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4580 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureDecoder.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/TextureDecoder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp
index 5f82c25ec1..c6214850a7 100644
--- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp
@@ -171,20 +171,20 @@ int TexDecoder_GetBlockHeightInTexels(u32 format)
case GX_TF_CMPR: return 4;
case GX_CTF_R4: return 8;
case GX_CTF_RA4: return 4;
- case GX_CTF_RA8: return 2;
+ case GX_CTF_RA8: return 4;
case GX_CTF_A8: return 4;
case GX_CTF_R8: return 4;
case GX_CTF_G8: return 4;
case GX_CTF_B8: return 4;
- case GX_CTF_RG8: return 2;
- case GX_CTF_GB8: return 2;
+ case GX_CTF_RG8: return 4;
+ case GX_CTF_GB8: return 4;
case GX_TF_Z8: return 4;
- case GX_TF_Z16: return 2;
+ case GX_TF_Z16: return 4;
case GX_TF_Z24X8: return 1;
case GX_CTF_Z4: return 8;
case GX_CTF_Z8M: return 4;
case GX_CTF_Z8L: return 4;
- case GX_CTF_Z16L: return 2;
+ case GX_CTF_Z16L: return 4;
default:
ERROR_LOG(VIDEO, "Unsupported Texture Format (%08x)! (GetBlockHeightInTexels)", format);
return 4;