diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-12-29 20:58:24 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-12-29 20:58:24 +0100 |
| commit | 8cf078a1a03de381ba5d8b6dd0dbba7c9baaa74b (patch) | |
| tree | f74c6496728aa30e6429d845c55f0c8bdb79d88e /Source/Core/VideoBackends/OGL/TextureCache.cpp | |
| parent | f8d7becba98d2eb89a0203da4b897241520b39e2 (diff) | |
| parent | d8e5d8659e6762048e8369eac598cf389109ef70 (diff) | |
Merge pull request #3407 from phire/fix_assert
TextureCache, fix an incorrect assert.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureCache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 34154be626..824d16b8c1 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -570,7 +570,8 @@ void TextureCache::ConvertTexture(TCacheEntryBase* _entry, TCacheEntryBase* _unc glViewport(0, 0, entry->config.width, entry->config.height); s_palette_pixel_shader[format].Bind(); - int size = unconverted->format == 0 ? 32 : 512; + // C14 textures are currently unsupported + int size = (unconverted->format & 0xf) == GX_TF_I4 ? 32 : 512; auto buffer = s_palette_stream_buffer->Map(size); memcpy(buffer.first, palette, size); s_palette_stream_buffer->Unmap(size); |