mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 15:40:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HiresTextures: Use std::minmax or std::minmax_element where applicable in GenBaseName()

Browse Source 
Minimizes repetition.

std::minmax_element can be used for the 256 * 2 case, as it's only performing byte comparisons
and thus, there will always be an element smaller than 0xffff, so it doesn't need to be included
in the set of compared values.
This commit is contained in:
Lioncash 2018-03-27 12:37:04 -04:00
parent d5a1edba09
commit 2da8d98b2f
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -12,6 +12,7 @@
#include <mutex>
#include <string>
#include <thread>
#include <tuple>
#include <unordered_map>
#include <utility>
#include <vector>
@ -229,25 +230,23 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co
case 16 * 2:
for (size_t i = 0; i < texture_size; i++)
{
min = std::min<u32>(min, texture[i] & 0xf);
min = std::min<u32>(min, texture[i] >> 4);
max = std::max<u32>(max, texture[i] & 0xf);
max = std::max<u32>(max, texture[i] >> 4);
const u32 low_nibble = texture[i] & 0xf;
const u32 high_nibble = texture[i] >> 4;
std::tie(min, max) = std::minmax({min, max, low_nibble, high_nibble});
}
break;
case 256 * 2:
for (size_t i = 0; i < texture_size; i++)
{
min = std::min<u32>(min, texture[i]);
max = std::max<u32>(max, texture[i]);
}
{
const auto minmax = std::minmax_element(texture, texture + texture_size);
min = *minmax.first;
max = *minmax.second;
break;
}
case 16384 * 2:
for (size_t i = 0; i < texture_size; i += sizeof(u16))
{
const u16 texture_halfword = Common::swap16(texture[i]) & 0x3fff;
min = std::min<u32>(min, texture_halfword);
max = std::max<u32>(max, texture_halfword);
const u32 texture_halfword = Common::swap16(texture[i]) & 0x3fff;
std::tie(min, max) = std::minmax({min, max, texture_halfword});
}
break;
}