piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the min/max functions in CommonFuncs.

Browse Source 
The algorithm header has the same functions.
This commit is contained in:
Lioncash
2014-05-02 22:47:04 -04:00
parent 3097345929
commit 49b0eef393
29 changed files with 104 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoBackends/Software/TextureSampler.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <algorithm>
#include <cmath>
#include "Core/HW/Memmap.h"
@ -142,8 +143,8 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8 *sample)
while (mip)
{
mipWidth = max(mipWidth, fmtWidth);
mipHeight = max(mipHeight, fmtHeight);
mipWidth = std::max(mipWidth, fmtWidth);
mipHeight = std::max(mipHeight, fmtHeight);
u32 size = (mipWidth * mipHeight * fmtDepth) >> 1;
imageSrc += size;