Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

rendersw: add out of bounds check to 16-bit get_texel (32-bit version already has it)

Browse Source
This commit is contained in:
hap 2023-12-26 16:54:24 +01:00
parent 6ab5abe35d
commit 642c89bd14
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/emu/rendersw.hxx
View File

@ -153,7 +153,10 @@ private:
}
else
{
u16 const *const texbase = reinterpret_cast<u16 const *>(texture.base) + (curv >> 16) * texture.rowpixels + (curu >> 16);
s32 u = std::clamp<s32>(curu >> 16, 0, texture.width - 1);
s32 v = std::clamp<s32>(curv >> 16, 0, texture.height - 1);
u16 const *const texbase = reinterpret_cast<u16 const *>(texture.base) + v * texture.rowpixels + u;
return palbase[texbase[0]];
}
}
@ -185,7 +188,10 @@ private:
}
else
{
u16 const *const texbase = reinterpret_cast<u16 const *>(texture.base) + (curv >> 16) * texture.rowpixels + (curu >> 16);
s32 u = std::clamp<s32>(curu >> 16, 0, texture.width - 1);
s32 v = std::clamp<s32>(curv >> 16, 0, texture.height - 1);
u16 const *const texbase = reinterpret_cast<u16 const *>(texture.base) + v * texture.rowpixels + u;
return palbase[texbase[0]];
}
}
@ -247,8 +253,11 @@ private:
}
else
{
const u16 *texbase = reinterpret_cast<const u16 *>(texture.base) + (curv >> 16) * texture.rowpixels + (curu >> 17) * 2;
return (texbase[(curu >> 16) & 1] >> 8) | ((texbase[0] & 0xff) << 8) | ((texbase[1] & 0xff) << 16);
s32 u = std::clamp<s32>(curu >> 16, 0, texture.width - 1);
s32 v = std::clamp<s32>(curv >> 16, 0, texture.height - 1);
const u16 *texbase = reinterpret_cast<const u16 *>(texture.base) + v * texture.rowpixels + (u >> 1) * 2;
return (texbase[u & 1] >> 8) | ((texbase[0] & 0xff) << 8) | ((texbase[1] & 0xff) << 16);
}
}