diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-12-29 14:25:31 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-12-29 14:25:31 +1300 |
| commit | d8e5d8659e6762048e8369eac598cf389109ef70 (patch) | |
| tree | 88a0ac684a8c004346ef29c81a65b0ed07bebc4e /Source/Core/VideoCommon | |
| parent | aabcd441d9a9fa98565a6aaf82cf56b64b53767d (diff) | |
TextureCache, fix an incorrect assert.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 341977d7a8..2cdfba3977 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -216,9 +216,9 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::DoPartialTextureUpdates(Tex || isPaletteTexture) return entry_to_update; - u32 block_width = TexDecoder_GetBlockWidthInTexels(entry_to_update->format); - u32 block_height = TexDecoder_GetBlockHeightInTexels(entry_to_update->format); - u32 block_size = block_width * block_height * TexDecoder_GetTexelSizeInNibbles(entry_to_update->format) / 2; + u32 block_width = TexDecoder_GetBlockWidthInTexels(entry_to_update->format & 0xf); + u32 block_height = TexDecoder_GetBlockHeightInTexels(entry_to_update->format & 0xf); + u32 block_size = block_width * block_height * TexDecoder_GetTexelSizeInNibbles(entry_to_update->format & 0xf) / 2; u32 numBlocksX = (entry_to_update->native_width + block_width - 1) / block_width; diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index 26cec83659..e1e64777ae 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -52,7 +52,7 @@ public: u32 size_in_bytes; u64 base_hash; u64 hash; // for paletted textures, hash = base_hash ^ palette_hash - u32 format; + u32 format; // bits 0-3 will contain the in-memory format. bool is_efb_copy; bool is_custom_tex; u32 memory_stride; @@ -68,7 +68,6 @@ public: void SetGeneralParameters(u32 _addr, u32 _size, u32 _format) { - _dbg_assert_msg_(VIDEO, _format < 0x10, "You shouldn't use dolphin's \"Extra\" texture formats in a texture cache entry"); addr = _addr; size_in_bytes = _size; format = _format; |