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

rend: force texture scanorder to 0 if vq and mipmap are set 

Fixes crash and corrupted texture in Star Wars Demolition
Issue #1108
This commit is contained in:
Flyinghead 2023-06-13 14:55:47 +02:00
parent 4db7137dbf
commit b6930a2a9e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/rend/TexCache.cpp
View File

@ -466,6 +466,9 @@ bool BaseTextureCacheData::Delete()
BaseTextureCacheData::BaseTextureCacheData(TSP tsp, TCW tcw)
{
if (tcw.VQ_Comp == 1 && tcw.MipMapped == 1)
// Star Wars Demolition
tcw.ScanOrder = 0;
this->tsp = tsp;
this->tcw = tcw;
@ -490,16 +493,15 @@ BaseTextureCacheData::BaseTextureCacheData(TSP tsp, TCW tcw)
if (tcw.ScanOrder && (tex->PL || tex->PL32))
{
//Texture is stored 'planar' in memory, no deswizzle is needed
//verify(tcw.VQ_Comp==0);
if (tcw.VQ_Comp != 0)
{
WARN_LOG(RENDERER, "Warning: planar texture with VQ set (invalid)");
tcw.VQ_Comp = 0;
this->tcw.VQ_Comp = 0;
}
if (tcw.MipMapped != 0)
{
WARN_LOG(RENDERER, "Warning: planar texture with mipmaps (invalid)");
tcw.MipMapped = 0;
this->tcw.MipMapped = 0;
}
//Planar textures support stride selection, mostly used for non power of 2 textures (videos)
@ -521,8 +523,8 @@ BaseTextureCacheData::BaseTextureCacheData(TSP tsp, TCW tcw)
{
if (!IsPaletted())
{
tcw.ScanOrder = 0;
tcw.StrideSel = 0;
this->tcw.ScanOrder = 0;
this->tcw.StrideSel = 0;
}
// Quake 3 Arena uses one
if (tcw.MipMapped)