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/D3D/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/D3D/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/TextureCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index c77b0430c1..ef0158653d 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -355,7 +355,7 @@ void TextureCache::ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* uncon D3D::stateman->SetTexture(1, palette_buf_srv); // TODO: Add support for C14X2 format. (Different multiplier, more palette entries.) - float params[4] = { (unconverted->format & 0xf) == 0 ? 15.f : 255.f }; + float params[4] = { (unconverted->format & 0xf) == GX_TF_I4 ? 15.f : 255.f }; D3D::context->UpdateSubresource(palette_uniform, 0, nullptr, ¶ms, 0, 0); D3D::stateman->SetPixelConstants(palette_uniform); |