mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix 9ce1626b: Some blitters have `bp->remap` aliased to `remap` for performance. (#11626) 

While this probably doesn't make a huge difference for the custom transparent remap code path, the alias is there so use it.
pull/11627/head
Peter Nelson 2023-12-25 20:59:37 +00:00 committed by GitHub
parent fdf6cbf848
commit a2a7ecf88e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blitter/32bpp_anim.cpp
View File

@ -218,7 +218,7 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
if (src_px->a != 0) { if (src_px->a != 0) {
src_px += n; src_px += n;
do { do {
*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
*anim = 0; *anim = 0;
anim++; anim++;
dst++; dst++;

2
src/blitter/32bpp_anim_sse4.cpp
View File

@ -322,7 +322,7 @@ bmcr_alpha_blend_single:
/* Apply custom transparency remap. */ /* Apply custom transparency remap. */
for (uint x = (uint) bp->width; x > 0; x--) { for (uint x = (uint) bp->width; x > 0; x--) {
if (src->a != 0) { if (src->a != 0) {
*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
*anim = 0; *anim = 0;
} }
src_mv++; src_mv++;

2
src/blitter/32bpp_optimized.cpp
View File

@ -209,7 +209,7 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
if (src_px->a != 0) { if (src_px->a != 0) {
src_px += n; src_px += n;
do { do {
*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
dst++; dst++;
} while (--n != 0); } while (--n != 0);
} else { } else {

2
src/blitter/32bpp_sse_func.hpp
View File

@ -396,7 +396,7 @@ bmcr_alpha_blend_single:
/* Apply custom transparency remap. */ /* Apply custom transparency remap. */
for (uint x = (uint) bp->width; x > 0; x--) { for (uint x = (uint) bp->width; x > 0; x--) {
if (src->a != 0) { if (src->a != 0) {
*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
} }
src_mv++; src_mv++;
dst++; dst++;

4
src/blitter/40bpp_anim.cpp
View File

@ -267,9 +267,9 @@ inline void Blitter_40bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
src_px += n; src_px += n;
do { do {
if (*anim != 0) { if (*anim != 0) {
*anim = bp->remap[*anim]; *anim = remap[*anim];
} else { } else {
*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
*anim = 0; *anim = 0;
} }
anim++; anim++;