From a2a7ecf88eb74c89f905f3035a1a6ae59f718ed8 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Mon, 25 Dec 2023 20:59:37 +0000 Subject: [PATCH] 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. --- src/blitter/32bpp_anim.cpp | 2 +- src/blitter/32bpp_anim_sse4.cpp | 2 +- src/blitter/32bpp_optimized.cpp | 2 +- src/blitter/32bpp_sse_func.hpp | 2 +- src/blitter/40bpp_anim.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp index 9ca6229eb5..0c2612fcde 100644 --- a/src/blitter/32bpp_anim.cpp +++ b/src/blitter/32bpp_anim.cpp @@ -218,7 +218,7 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel if (src_px->a != 0) { src_px += n; do { - *dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); + *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]); *anim = 0; anim++; dst++; diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp index c80505ee0d..b01420ef6d 100644 --- a/src/blitter/32bpp_anim_sse4.cpp +++ b/src/blitter/32bpp_anim_sse4.cpp @@ -322,7 +322,7 @@ bmcr_alpha_blend_single: /* Apply custom transparency remap. */ for (uint x = (uint) bp->width; x > 0; x--) { if (src->a != 0) { - *dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); + *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]); *anim = 0; } src_mv++; diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp index 9a28ad7d50..15b607a9a7 100644 --- a/src/blitter/32bpp_optimized.cpp +++ b/src/blitter/32bpp_optimized.cpp @@ -209,7 +209,7 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL if (src_px->a != 0) { src_px += n; do { - *dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); + *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]); dst++; } while (--n != 0); } else { diff --git a/src/blitter/32bpp_sse_func.hpp b/src/blitter/32bpp_sse_func.hpp index 4ed788f3de..62cb705fef 100644 --- a/src/blitter/32bpp_sse_func.hpp +++ b/src/blitter/32bpp_sse_func.hpp @@ -396,7 +396,7 @@ bmcr_alpha_blend_single: /* Apply custom transparency remap. */ for (uint x = (uint) bp->width; x > 0; x--) { if (src->a != 0) { - *dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); + *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]); } src_mv++; dst++; diff --git a/src/blitter/40bpp_anim.cpp b/src/blitter/40bpp_anim.cpp index e1ee0a0fec..e65a1d7151 100644 --- a/src/blitter/40bpp_anim.cpp +++ b/src/blitter/40bpp_anim.cpp @@ -267,9 +267,9 @@ inline void Blitter_40bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel src_px += n; do { if (*anim != 0) { - *anim = bp->remap[*anim]; + *anim = remap[*anim]; } else { - *dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]); + *dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]); *anim = 0; } anim++;