summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon
diff options
context:
space:
mode:
authorTony Wasserka <NeoBrainX@gmail.com>2013-11-07 17:05:43 +0100
committerTony Wasserka <NeoBrainX@gmail.com>2014-04-24 00:33:48 +0200
commitca2a79d0bd0a943dfeb48e6e0a197e82b23b4a4d (patch)
treee46e1b0f4dbfbdd8e0ae7f7b53a23446cafb083c /Source/Core/VideoCommon
parent65e0579d9f86c4aad4f1b46bc60e916451ffbee3 (diff)
Workaround dumb custom texture loading logic so that D3D11, GL core (used on OS X) and GLES code paths have less broken custom textures.
Diffstat (limited to 'Source/Core/VideoCommon')
-rw-r--r--Source/Core/VideoCommon/HiresTextures.cpp6
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)