From 9dbcc282ff26274dfe77583334e74faa8d86f60e Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 19 Sep 2013 16:06:39 -0400 Subject: [PATCH 1/2] USING_GLES2 platforms: Fix build and fix a warning on Android. --- GPU/GLES/TextureCache.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 4bb71fbe96..991714fbe4 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -178,7 +178,11 @@ inline void TextureCache::AttachFramebuffer(TexCacheEntry *entry, u32 address, V // If they match exactly, it's non-CLUT and from the top left. if (exactMatch) { // Apply to non-buffered and buffered mode only. - if (g_Config.iRenderingMode == FB_READFBOMEMORY_CPU || g_Config.iRenderingMode == FB_READFBOMEMORY_GPU ) +#ifndef USING_GLES2 + if ((g_Config.iRenderingMode == FB_READFBOMEMORY_CPU) || (g_Config.iRenderingMode == FB_READFBOMEMORY_GPU )) +#else + if (g_Config.iRenderingMode == g_Config.iRenderingMode == FB_READFBOMEMORY_GPU) +#endif return; DEBUG_LOG(G3D, "Render to texture detected at %08x!", address); From 66d328175cb180b67c118f16b90812dc3195f8df Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 19 Sep 2013 16:07:41 -0400 Subject: [PATCH 2/2] Fix stupid typo. --- GPU/GLES/TextureCache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 991714fbe4..0e1214434d 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -179,9 +179,9 @@ inline void TextureCache::AttachFramebuffer(TexCacheEntry *entry, u32 address, V if (exactMatch) { // Apply to non-buffered and buffered mode only. #ifndef USING_GLES2 - if ((g_Config.iRenderingMode == FB_READFBOMEMORY_CPU) || (g_Config.iRenderingMode == FB_READFBOMEMORY_GPU )) + if ((g_Config.iRenderingMode == FB_READFBOMEMORY_CPU) || (g_Config.iRenderingMode == FB_READFBOMEMORY_GPU)) #else - if (g_Config.iRenderingMode == g_Config.iRenderingMode == FB_READFBOMEMORY_GPU) + if (g_Config.iRenderingMode == FB_READFBOMEMORY_GPU) #endif return;