Merge pull request #2894 from raven02/patch-2

Code cleanup :Use UPPER case for enum
This commit is contained in:
Henrik Rydgård 2013-07-23 05:15:11 -07:00
commit c9279a951b
3 changed files with 6 additions and 7 deletions

View File

@ -309,7 +309,7 @@ void FramebufferManager::DrawPixels(const u8 *framebuf, int pixelFormat, int lin
}
glBindTexture(GL_TEXTURE_2D,drawPixelsTex_);
if (g_Config.iTexFiltering == 3 || (g_Config.iTexFiltering == 4 && g_iNumVideos))
if (g_Config.iTexFiltering == LINEAR || (g_Config.iTexFiltering == LINEARFMV && g_iNumVideos))
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}

View File

@ -520,12 +520,12 @@ void TextureCache::UpdateSamplingParams(TexCacheEntry &entry, bool force) {
}
}
if ((g_Config.iTexFiltering == linear || (g_Config.iTexFiltering == linearFMV && g_iNumVideos)) && !gstate.isColorTestEnabled()) {
if ((g_Config.iTexFiltering == LINEAR || (g_Config.iTexFiltering == LINEARFMV && g_iNumVideos)) && !gstate.isColorTestEnabled()) {
magFilt |= 1;
minFilt |= 1;
}
if (g_Config.iTexFiltering == nearest) {
if (g_Config.iTexFiltering == NEAREST) {
magFilt &= ~1;
minFilt &= ~1;
}

View File

@ -26,11 +26,10 @@
struct VirtualFramebuffer;
enum TextureFiltering {
nearest = 2,
linear = 3,
linearFMV = 4,
NEAREST = 2,
LINEAR = 3,
LINEARFMV = 4,
};
class TextureCache
{
public: