diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2018-05-22 09:57:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 09:57:26 +0200 |
| commit | 0979febe7805fe2d4e6669ea233bf6af9fc9680d (patch) | |
| tree | 0ca3e1ddf25754e906ba0a4b39ac3f95a29577c2 /Source/Core/VideoCommon/HiresTextures.cpp | |
| parent | 7eaba154a41c72826d4c660753386421f21336d7 (diff) | |
| parent | f7a0cae7f47c6fb9a80bf22ffd55281331c3aaef (diff) | |
Merge pull request #6941 from stenzek/unaligned-texture-load
HiresTextures: Do not load compressed textures with unaligned dimensions
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index adca2551db..79e71fa32b 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -335,7 +335,7 @@ std::unique_ptr<HiresTexture> HiresTexture::Load(const std::string& base_filenam // Try loading DDS textures first, that way we maintain compression of DXT formats. // TODO: Reduce the number of open() calls here. We could use one fd. Level level; - if (!LoadDDSTexture(level, filename_iter->second.path)) + if (!LoadDDSTexture(level, filename_iter->second.path, mip_level)) { File::IOFile file; file.Open(filename_iter->second.path, "rb"); |
