From 5ef3a558ffd323e589019badd154494728bc1038 Mon Sep 17 00:00:00 2001 From: The Dax Date: Mon, 29 Jul 2013 05:09:12 -0400 Subject: [PATCH] Remove more magic numbers and remove enumerator names. --- GPU/GLES/Framebuffer.cpp | 2 +- GPU/GLES/TextureCache.cpp | 2 +- GPU/GLES/TextureCache.h | 2 +- Windows/WndMainWindow.cpp | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 02610ddf05..dc2eb639d4 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -309,7 +309,7 @@ void FramebufferManager::DrawPixels(const u8 *framebuf, int pixelFormat, int lin } glBindTexture(GL_TEXTURE_2D,drawPixelsTex_); - if (g_Config.iTexFiltering == TextureFiltering::LINEAR || (g_Config.iTexFiltering == TextureFiltering::LINEARFMV && g_iNumVideos)) + if (g_Config.iTexFiltering == LINEAR || (g_Config.iTexFiltering == LINEARFMV && g_iNumVideos)) { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); } diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 745ef7e930..c570fad768 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -520,7 +520,7 @@ void TextureCache::UpdateSamplingParams(TexCacheEntry &entry, bool force) { } } - if ((g_Config.iTexFiltering == TextureFiltering::LINEAR || (g_Config.iTexFiltering == TextureFiltering::LINEARFMV && g_iNumVideos)) && !gstate.isColorTestEnabled()) { + if ((g_Config.iTexFiltering == LINEAR || (g_Config.iTexFiltering == LINEARFMV && g_iNumVideos)) && !gstate.isColorTestEnabled()) { magFilt |= 1; minFilt |= 1; } diff --git a/GPU/GLES/TextureCache.h b/GPU/GLES/TextureCache.h index c60a675fe8..ca6df23040 100644 --- a/GPU/GLES/TextureCache.h +++ b/GPU/GLES/TextureCache.h @@ -25,7 +25,7 @@ struct VirtualFramebuffer; -enum TextureFiltering { +enum { AUTO = 1, NEAREST = 2, LINEAR = 3, diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index da97422a82..855af27f81 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -808,19 +808,19 @@ namespace MainWindow g_Config.iRenderingMode = ++g_Config.iRenderingMode > 3? 0 : g_Config.iRenderingMode; switch(g_Config.iRenderingMode) { - case 0: + case FB_NON_BUFFERED_MODE: osm.Show(g->T("Non-Buffered Rendering")); break; - case 1: + case FB_BUFFERED_MODE: osm.Show(g->T("Buffered Rendering")); break; - case 2: + case FB_READFBOMEMORY_CPU: osm.Show(g->T("Read Framebuffer to Memory (CPU)")); break; - case 3: + case FB_READFBOMEMORY_GPU: osm.Show(g->T("Read Framebuffer to Memory (GPU)")); break; }