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

GSTextureCache: Initialize palette texture if needed and not done yet. 

Also comment on the reason behind palette texture is always created with size 256x1.
This commit is contained in:
Alessandro Vetere 2018-12-10 22:33:55 +01:00 committed by lightningterror
parent 0a5b1eb75d
commit fe845aee58
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/GSdx/Renderers/Common/GSTextureCache.cpp
View File

@ -2059,11 +2059,7 @@ GSTextureCache::Palette::Palette(const GSRenderer* renderer, uint16 pal, bool ne
m_clut = (uint32*)_aligned_malloc(palette_size, 64);
memcpy(m_clut, (const uint32*)m_renderer->m_mem.m_clut, palette_size);
if (need_gs_texture) {
m_tex_palette = m_renderer->m_dev->CreateTexture(256, 1);
m_tex_palette->Update(GSVector4i(0, 0, pal, 1), m_clut, palette_size);
}
else {
m_tex_palette = nullptr;
InitializeTexture();
}
}
@ -2080,6 +2076,18 @@ GSTextureCache::PaletteKey GSTextureCache::Palette::GetPaletteKey() {
return { m_clut, m_pal };
}
void GSTextureCache::Palette::InitializeTexture() {
if (!m_tex_palette) {
// A palette texture is always created with dimensions 256x1 (also in the case that m_pal is 16, thus a 16x1 texture
// would be enough to store the CLUT data) because the coordinates that the shader uses for
// sampling such texture are always normalized by 255.
// This is because indexes are stored as normalized values of an RGBA texture (e.g. index 15 will be read as (15/255),
// and therefore will read texel 15/255 * texture size).
m_tex_palette = m_renderer->m_dev->CreateTexture(256, 1);
m_tex_palette->Update(GSVector4i(0, 0, m_pal, 1), m_clut, m_pal * sizeof(m_clut[0]));
}
}
// GSTextureCache::PaletteKeyHash
// Hashes the content of the clut.
@ -2157,6 +2165,10 @@ std::shared_ptr<GSTextureCache::Palette> GSTextureCache::PaletteMap::LookupPalet
if (it1 != map.end()) {
// Clut content match, HIT
if (need_gs_texture && !it1->second->GetPaletteGSTexture()) {
// Generate GSTexture and upload clut content if needed and not done yet
it1->second->InitializeTexture();
}
return it1->second;
}

1
plugins/GSdx/Renderers/Common/GSTextureCache.h
View File

@ -80,6 +80,7 @@ public:
PaletteKey GetPaletteKey();
void InitializeTexture();
};
struct PaletteKeyHash {