Merge pull request #5206 from ligfx/fixcustomtextures

TextureCacheBase: fix custom textures not being loaded
dolphin-emu · Apr 5, 2017 · 27e9e46 · 27e9e46
2 parents 9fc2233 + e9e3226
commit 27e9e46
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -781,32 +781,33 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)
   if (!entry)
     return nullptr;
 
-  if (!hires_tex)
+  const u8* tlut = &texMem[tlutaddr];
+  if (hires_tex)
+  {
+    entry->Load(temp, width, height, expandedWidth, 0);
+  }
+  else if (decode_on_gpu)
   {
-    const u8* tlut = &texMem[tlutaddr];
-    if (decode_on_gpu)
+    u32 row_stride = bytes_per_block * (expandedWidth / bsw);
+    g_texture_cache->DecodeTextureOnGPU(
+        entry, 0, src_data, texture_size, static_cast<TextureFormat>(texformat), width, height,
+        expandedWidth, expandedHeight, row_stride, tlut, static_cast<TlutFormat>(tlutfmt));
+  }
+  else
+  {
+    if (!(texformat == GX_TF_RGBA8 && from_tmem))
     {
-      u32 row_stride = bytes_per_block * (expandedWidth / bsw);
-      g_texture_cache->DecodeTextureOnGPU(
-          entry, 0, src_data, texture_size, static_cast<TextureFormat>(texformat), width, height,
-          expandedWidth, expandedHeight, row_stride, tlut, static_cast<TlutFormat>(tlutfmt));
+      TexDecoder_Decode(temp, src_data, expandedWidth, expandedHeight, texformat, tlut,
+                        (TlutFormat)tlutfmt);
     }
     else
     {
-      if (!(texformat == GX_TF_RGBA8 && from_tmem))
-      {
-        TexDecoder_Decode(temp, src_data, expandedWidth, expandedHeight, texformat, tlut,
-                          (TlutFormat)tlutfmt);
-      }
-      else
-      {
-        u8* src_data_gb =
-            &texMem[bpmem.tex[stage / 4].texImage2[stage % 4].tmem_odd * TMEM_LINE_SIZE];
-        TexDecoder_DecodeRGBA8FromTmem(temp, src_data, src_data_gb, expandedWidth, expandedHeight);
-      }
-
-      entry->Load(temp, width, height, expandedWidth, 0);
+      u8* src_data_gb =
+          &texMem[bpmem.tex[stage / 4].texImage2[stage % 4].tmem_odd * TMEM_LINE_SIZE];
+      TexDecoder_DecodeRGBA8FromTmem(temp, src_data, src_data_gb, expandedWidth, expandedHeight);
     }
+
+    entry->Load(temp, width, height, expandedWidth, 0);
   }
 
   iter = textures_by_address.emplace(address, entry);