diff options
| author | NeoBrainX <NeoBrainX@googlemail.com> | 2010-12-27 18:09:03 +0000 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@googlemail.com> | 2010-12-27 18:09:03 +0000 |
| commit | 6e8df50fffeb381523d40aeae31afa4f60df46a3 (patch) | |
| tree | b6ed77399050c53af927f8f0c315c114fdcdf0d5 /Source/Core/VideoCommon/Src/TextureCacheBase.cpp | |
| parent | c33f46406e60fb2a0cf6613fdd062c6934e4914b (diff) | |
Yet another ClearScreen fix, should be the last one now.
Should fix almost all regressions of the recent ClearScreen changes and keep the fixed stuff.
The Super Mario Sunshine glitch is caused by another issue and will be addressed in my next commit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6668 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/TextureCacheBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp index bd7023b01e..551d87eb11 100644 --- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp @@ -545,10 +545,6 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, else// alpha { colmat[15] = 1; - if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24) - { - fConstAdd[3] = 1; - } cbufid = 1; } @@ -575,18 +571,10 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, case 3: // RA8 colmat[0] = colmat[4] = colmat[8] = colmat[15] = 1; cbufid = 3; - if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24) - { - fConstAdd[3] = 1; - } break; case 7: // A8 colmat[3] = colmat[7] = colmat[11] = colmat[15] = 1; - if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24) - { - fConstAdd[0] = fConstAdd[1] = fConstAdd[2] = fConstAdd[3] = 1; - } cbufid = 4; break; @@ -620,10 +608,6 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, case 6: // RGBA8 colmat[0] = colmat[5] = colmat[10] = colmat[15] = 1; cbufid = 10; - if(bpmem.zcontrol.pixel_format != PIXELFMT_RGBA6_Z24) - { - fConstAdd[3] = 1; - } break; default: @@ -633,8 +617,6 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, break; } } - - const unsigned int tex_w = (abs(source_rect.GetWidth()) >> (int)bScaleByHalf); const unsigned int tex_h = (abs(source_rect.GetHeight()) >> (int)bScaleByHalf); @@ -695,4 +677,4 @@ void TextureCache::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, entry->FromRenderTarget(bFromZBuffer, bScaleByHalf, cbufid, colmat, source_rect, bIsIntensityFmt, copyfmt); g_renderer->RestoreAPIState(); -} +}
\ No newline at end of file |