diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-04-24 00:46:42 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-04-24 00:46:42 +0200 |
| commit | 13b1ff5160c5489efd5d6dbfb79475755a3ae3ee (patch) | |
| tree | c5bb0d6526e2afa5a3f463cd5d14821d5e84d4d4 /Source/Core/VideoCommon/HiresTextures.cpp | |
| parent | 0ae68957825090848816237594b0eeafbab08d21 (diff) | |
| parent | ca2a79d0bd0a943dfeb48e6e0a197e82b23b4a4d (diff) | |
Merge pull request #307 from neobrain/custom_textures_workaround
Workaround dumb custom texture loading logic.
Diffstat (limited to 'Source/Core/VideoCommon/HiresTextures.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 938e8cc5aa..b6c0935a83 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -109,6 +109,11 @@ PC_TexFormat GetHiresTex(const std::string& filename, unsigned int* pWidth, unsi switch (texformat) { + // TODO(neobrain): This function currently has no way to enforce RGBA32 + // output, which however is required on some configurations to function + // properly. As a lazy workaround, we hence disable the optimized code + // path for now. +#if 0 case GX_TF_I4: case GX_TF_I8: case GX_TF_IA4: @@ -126,6 +131,7 @@ PC_TexFormat GetHiresTex(const std::string& filename, unsigned int* pWidth, unsi } returnTex = PC_TEX_FMT_IA8; break; +#endif default: *required_size = width * height * 4; if (data_size < *required_size) |