diff options
| author | degasus <wickmarkus@web.de> | 2013-02-18 18:49:20 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2013-02-18 18:49:20 +0100 |
| commit | a629dea4dc134ee7778a6c6b3481a6656802fedf (patch) | |
| tree | e035073928c499714c1098d7e875da156cb80952 /Source/Core/VideoCommon/Src/BPStructs.cpp | |
| parent | 4653adecf16d9aa0cf3003386999f3d46f3c38f4 (diff) | |
| parent | d0ea94a2aaa1909a4b53b158a4a8250ee7578ae4 (diff) | |
Merge branch 'master' into GLSL-master
Conflicts:
CMakeLists.txt
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Src/GLInterface/WX.cpp
Source/Core/DolphinWX/Src/GLInterface/WX.h
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
Source/Core/VideoCommon/Src/TextureCacheBase.h
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
damn mipmap_fixes ...
Diffstat (limited to 'Source/Core/VideoCommon/Src/BPStructs.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/BPStructs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 3d48d946a6..af5161582c 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -458,6 +458,7 @@ void BPWritten(const BPCmd& bp) case BPMEM_ZCOMPARE: // Set the Z-Compare and EFB pixel format g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format doesn't have an alpha channel + g_renderer->SetBlendMode(true); OnPixelFormatChange(); if(bp.changes & 3) SetBlendMode(); // dual source could be activated by changing to PIXELFMT_RGBA6_Z24 @@ -523,9 +524,8 @@ void BPWritten(const BPCmd& bp) for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i) { - // FIXME: Duplicate conditions. if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE || - tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE) + tmem_addr_odd + TMEM_LINE_SIZE > TMEM_SIZE) break; memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE); |