ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TextureCache, fix an incorrect assert.

This commit is contained in:
Scott Mansell 2015-12-29 14:25:31 +13:00
parent aabcd441d9
commit d8e5d8659e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D/TextureCache.cpp
View File

@ -355,7 +355,7 @@ void TextureCache::ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* uncon
D3D::stateman->SetTexture(1, palette_buf_srv); D3D::stateman->SetTexture(1, palette_buf_srv);
// TODO: Add support for C14X2 format. (Different multiplier, more palette entries.) // 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, &params, 0, 0); D3D::context->UpdateSubresource(palette_uniform, 0, nullptr, &params, 0, 0);
D3D::stateman->SetPixelConstants(palette_uniform); D3D::stateman->SetPixelConstants(palette_uniform);

3
Source/Core/VideoBackends/OGL/TextureCache.cpp
View File

@ -570,7 +570,8 @@ void TextureCache::ConvertTexture(TCacheEntryBase* _entry, TCacheEntryBase* _unc
glViewport(0, 0, entry->config.width, entry->config.height); glViewport(0, 0, entry->config.width, entry->config.height);
s_palette_pixel_shader[format].Bind(); 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); auto buffer = s_palette_stream_buffer->Map(size);
memcpy(buffer.first, palette, size); memcpy(buffer.first, palette, size);
s_palette_stream_buffer->Unmap(size); s_palette_stream_buffer->Unmap(size);

6
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -216,9 +216,9 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::DoPartialTextureUpdates(Tex
|| isPaletteTexture) || isPaletteTexture)
return entry_to_update; return entry_to_update;
u32 block_width = TexDecoder_GetBlockWidthInTexels(entry_to_update->format); u32 block_width = TexDecoder_GetBlockWidthInTexels(entry_to_update->format & 0xf);
u32 block_height = TexDecoder_GetBlockHeightInTexels(entry_to_update->format); u32 block_height = TexDecoder_GetBlockHeightInTexels(entry_to_update->format & 0xf);
u32 block_size = block_width * block_height * TexDecoder_GetTexelSizeInNibbles(entry_to_update->format) / 2; 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; u32 numBlocksX = (entry_to_update->native_width + block_width - 1) / block_width;

3
Source/Core/VideoCommon/TextureCacheBase.h
View File

@ -52,7 +52,7 @@ public:
u32 size_in_bytes; u32 size_in_bytes;
u64 base_hash; u64 base_hash;
u64 hash; // for paletted textures, hash = base_hash ^ palette_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_efb_copy;
bool is_custom_tex; bool is_custom_tex;
u32 memory_stride; u32 memory_stride;
@ -68,7 +68,6 @@ public:
void SetGeneralParameters(u32 _addr, u32 _size, u32 _format) 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; addr = _addr;
size_in_bytes = _size; size_in_bytes = _size;
format = _format; format = _format;