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

rend: fix Space Harrier arcade in Shenmue 

Use the original tex dimensions and make sure they never change between
updates.
This commit is contained in:
Flyinghead 2024-03-12 14:56:13 +01:00
parent c7d6525c51
commit de89d8cfed
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/rend/TexCache.cpp
View File

@ -643,22 +643,23 @@ bool BaseTextureCacheData::Update()
stride = width; stride = width;
} }
const u32 original_h = height; u32 heightLimit = height;
const u32 originalSize = size;
if (startAddress > VRAM_SIZE || mmStartAddress + size > VRAM_SIZE) if (startAddress > VRAM_SIZE || mmStartAddress + size > VRAM_SIZE)
{ {
height = 0; heightLimit = 0;
if (mmStartAddress < VRAM_SIZE && mmStartAddress + size > VRAM_SIZE && tcw.ScanOrder) if (mmStartAddress < VRAM_SIZE && mmStartAddress + size > VRAM_SIZE && tcw.ScanOrder)
{ {
// Shenmue Space Harrier mini-arcade loads a texture that goes beyond the end of VRAM // Shenmue Space Harrier mini-arcade loads a texture that goes beyond the end of VRAM
// but only uses the top portion of it // but only uses the top portion of it
height = (VRAM_SIZE - mmStartAddress) * 8 / stride / tex->bpp; heightLimit = (VRAM_SIZE - mmStartAddress) * 8 / stride / tex->bpp;
size = stride * height * tex->bpp/8; size = stride * heightLimit * tex->bpp/8;
} }
if (height == 0) if (heightLimit == 0)
{ {
size = originalSize;
WARN_LOG(RENDERER, "Warning: invalid texture. Address %08X %08X size %d", startAddress, mmStartAddress, size); WARN_LOG(RENDERER, "Warning: invalid texture. Address %08X %08X size %d", startAddress, mmStartAddress, size);
dirty = 1; dirty = 1;
height = original_h;
unprotectVRam(); unprotectVRam();
return false; return false;
} }
@ -730,7 +731,7 @@ bool BaseTextureCacheData::Update()
else else
{ {
pb32.init(width, height); pb32.init(width, height);
texconv32(&pb32, (u8*)&vram[mmStartAddress], stride, height); texconv32(&pb32, (u8*)&vram[mmStartAddress], stride, heightLimit);
// xBRZ scaling // xBRZ scaling
if (textureUpscaling) if (textureUpscaling)
@ -800,7 +801,7 @@ bool BaseTextureCacheData::Update()
else else
{ {
pb16.init(width, height); pb16.init(width, height);
texconv(&pb16,(u8*)&vram[mmStartAddress],stride,height); texconv(&pb16, (u8*)&vram[mmStartAddress], stride, heightLimit);
} }
temp_tex_buffer = pb16.data(); temp_tex_buffer = pb16.data();
} }
@ -813,9 +814,6 @@ bool BaseTextureCacheData::Update()
temp_tex_buffer = pb16.data(); temp_tex_buffer = pb16.data();
mipmapped = false; mipmapped = false;
} }
// Restore the original texture height if it was constrained to VRAM limits above
height = original_h;
//lock the texture to detect changes in it //lock the texture to detect changes in it
protectVRam(); protectVRam();
@ -827,6 +825,8 @@ bool BaseTextureCacheData::Update()
NOTICE_LOG(RENDERER, "Dumped texture %x.png. Old hash %x", texture_hash, old_texture_hash); NOTICE_LOG(RENDERER, "Dumped texture %x.png. Old hash %x", texture_hash, old_texture_hash);
} }
PrintTextureName(); PrintTextureName();
// Restore the original texture size if it was constrained to VRAM limits above
size = originalSize;
return true; return true;
} }