ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rasterizer: Get rid of a clamp macro

This commit is contained in:
Lioncash 2015-10-10 16:34:03 -04:00
parent 9b921c2e7c
commit 2793785e0c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoBackends/Software/Rasterizer.cpp
View File

@ -18,8 +18,6 @@
#define BLOCK_SIZE 2 #define BLOCK_SIZE 2
#define CLAMP(x, a, b) (x>b)?b:(x<a)?a:x
namespace Rasterizer namespace Rasterizer
{ {
static Slope ZSlope; static Slope ZSlope;
@ -249,11 +247,12 @@ static inline void CalculateLOD(s32* lodp, bool* linear, u32 texmap, u32 texcoor
*linear = ((lod > 0 && (tm0.min_filter & 4)) || (lod <= 0 && tm0.mag_filter)); *linear = ((lod > 0 && (tm0.min_filter & 4)) || (lod <= 0 && tm0.mag_filter));
// order of checks matters // NOTE: The order of comparisons for this clamp check matters.
// should be: if (lod > static_cast<s32>(tm1.max_lod))
// if lod > max then max lod = static_cast<s32>(tm1.max_lod);
// else if lod < min then min else if (lod < static_cast<s32>(tm1.min_lod))
lod = CLAMP(lod, (s32)tm1.min_lod, (s32)tm1.max_lod); lod = static_cast<s32>(tm1.min_lod);
*lodp = lod; *lodp = lod;
} }