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/VideoCommon/TextureCacheBase.h | |
| parent | f8d7becba98d2eb89a0203da4b897241520b39e2 (diff) | |
| parent | d8e5d8659e6762048e8369eac598cf389109ef70 (diff) | |
Merge pull request #3407 from phire/fix_assert
TextureCache, fix an incorrect assert.
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.h')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.h | 3 |
1 files changed, 1 insertions, 2 deletions
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; |