ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #307 from neobrain/custom_textures_workaround 

Workaround dumb custom texture loading logic.
This commit is contained in:
Pierre Bourdon 2014-04-24 00:46:42 +02:00
parent 0ae6895782 ca2a79d0bd
commit 13b1ff5160
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,11 @@ PC_TexFormat GetHiresTex(const std::string& filename, unsigned int* pWidth, unsi
switch (texformat) 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_I4:
case GX_TF_I8: case GX_TF_I8:
case GX_TF_IA4: case GX_TF_IA4:
@ -126,6 +131,7 @@ PC_TexFormat GetHiresTex(const std::string& filename, unsigned int* pWidth, unsi
} }
returnTex = PC_TEX_FMT_IA8; returnTex = PC_TEX_FMT_IA8;
break; break;
#endif
default: default:
*required_size = width * height * 4; *required_size = width * height * 4;
if (data_size < *required_size) if (data_size < *required_size)