diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-11-14 17:08:32 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-11-14 17:08:32 +0000 |
| commit | 06aa62504cdb00bb04f5bfae106a1b3656d1682a (patch) | |
| tree | dbd0a773b3bde61e36b158fc74c4259ca92e93f1 /Source/Core/VideoCommon | |
| parent | 18305c7c49421e7f635c57e67b434f8f5003bfdc (diff) | |
revert to r4531, but keep the changes from the following revisions: 4533,4550-4551,4556-4559
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4566 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderManager.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureDecoder.cpp | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp index 0f7de16c23..51bc778aa5 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp @@ -120,7 +120,7 @@ void PixelShaderManager::SetConstants() break; case 2: // 24 bits - ftemp[0] = ffrac/65536.0f; ftemp[1] = ffrac/256.0f; ftemp[2] = ffrac; ftemp[3] = 0; + ftemp[0] = ffrac/65536.0f; ftemp[1] = ffrac/256.0f; ftemp[2] = ffrac; ftemp[3] = ffrac/16777216.0f; break; } SetPSConstant4fv(C_ZBIAS, ftemp); diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index 5f82c25ec1..9c09ad37cb 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -60,25 +60,6 @@ int TexDecoder_GetTexelSizeInNibbles(int format) case GX_TF_C8: return 2; case GX_TF_C14X2: return 4; case GX_TF_CMPR: return 1; - case GX_CTF_R4: return 1; - case GX_CTF_RA4: return 2; - case GX_CTF_RA8: return 4; - case GX_CTF_YUVA8: return 8; - case GX_CTF_A8: return 2; - case GX_CTF_R8: return 2; - case GX_CTF_G8: return 2; - case GX_CTF_B8: return 2; - case GX_CTF_RG8: return 4; - case GX_CTF_GB8: return 4; - - case GX_TF_Z8: return 2; - case GX_TF_Z16: return 4; - case GX_TF_Z24X8: return 8; - - case GX_CTF_Z4: return 1; - case GX_CTF_Z8M: return 2; - case GX_CTF_Z8L: return 2; - case GX_CTF_Z16L: return 4; default: return 1; } } |