diff options
| author | degasus <wickmarkus@web.de> | 2015-01-15 21:33:22 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2015-01-21 21:22:55 +0100 |
| commit | 62402efa6c2777c4e9829767c39fed71fe3de60a (patch) | |
| tree | 6d340eabf8d2ba25a6fa50b84377a5e38021f2ed /Source/Core/VideoCommon/HiresTextures.cpp | |
| parent | ee9d05d67f4d8d2c1f754c0b40f7f54cfbd8d4fd (diff) | |
CustomTexture: Mark textures with mipmaps
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index bf76ad0dc0..2c916ec0f8 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -80,7 +80,7 @@ void HiresTexture::Init(const std::string& gameCode) } } -std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format, bool dump) +std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format, bool has_mipmaps, bool dump) { // checking for min/max on paletted textures u32 min = 0xffff; @@ -121,7 +121,7 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co u64 tex_hash = GetHashHiresTexture(texture, (int)texture_size); u64 tlut_hash = tlut_size ? GetHashHiresTexture(tlut, (int)tlut_size) : 0; - std::string basename = StringFromFormat("tex1_%dx%d_%016lx", width, height, tex_hash); + std::string basename = StringFromFormat("tex1%s_%dx%d_%016lx", has_mipmaps ? "_m" : "", width, height, tex_hash); std::string tlutname = tlut_size ? StringFromFormat("_%016lx", tlut_hash) : ""; std::string formatname = StringFromFormat("_%d", format); @@ -131,9 +131,9 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co return basename + tlutname + formatname; } -HiresTexture* HiresTexture::Search(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format) +HiresTexture* HiresTexture::Search(const u8* texture, size_t texture_size, const u8* tlut, size_t tlut_size, u32 width, u32 height, int format, bool has_mipmaps) { - std::string base_filename = GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format); + std::string base_filename = GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format, has_mipmaps); HiresTexture* ret = nullptr; for (int level = 0;; level++) |
