From 0b9a72a62d38481ff08f742b2318d07f29ff5dff Mon Sep 17 00:00:00 2001 From: EmptyChaos Date: Thu, 24 Mar 2016 02:42:08 +0000 Subject: VideoCommon: Refactor TexMode0 mipmaps disabled test into a helper function --- Source/Core/VideoBackends/Software/TextureSampler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/Software/TextureSampler.cpp') diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp index 6c1001a6c8..b5049cb6a3 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.cpp +++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp @@ -10,6 +10,7 @@ #include "VideoBackends/Software/TextureSampler.h" #include "VideoCommon/BPMemory.h" +#include "VideoCommon/SamplerCommon.h" #include "VideoCommon/TextureDecoder.h" #define ALLOW_MIPMAP 1 @@ -69,14 +70,14 @@ void Sample(s32 s, s32 t, s32 lod, bool linear, u8 texmap, u8 *sample) s32 lodFract = lod & 0xf; - if (lod > 0 && tm0.min_filter & 3) + if (lod > 0 && SamplerCommon::AreBpTexMode0MipmapsEnabled(tm0)) { // use mipmap baseMip = lod >> 4; - mipLinear = (lodFract && tm0.min_filter & 2); + mipLinear = (lodFract && tm0.min_filter & TexMode0::TEXF_LINEAR); // if using nearest mip filter and lodFract >= 0.5 round up to next mip - baseMip += (lodFract >> 3) & (tm0.min_filter & 1); + baseMip += (lodFract >> 3) & (tm0.min_filter & TexMode0::TEXF_POINT); } if (mipLinear) -- cgit v1.2.3