From 7fcf8a2584158e7166c3f137c4f8587f25d546be Mon Sep 17 00:00:00 2001 From: fallenoak Date: Sun, 26 Jul 2026 09:58:04 -0500 Subject: [PATCH] chore(gx): fix style nits in Blit functions --- src/gx/Blit.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/gx/Blit.cpp b/src/gx/Blit.cpp index f27d4a4..7e1d186 100644 --- a/src/gx/Blit.cpp +++ b/src/gx/Blit.cpp @@ -33,8 +33,8 @@ void Blit_uint16_uint16(const C2iVector& size, const void* in, uint32_t inStride return; } - const char* in_ = reinterpret_cast(in); - char* out_ = reinterpret_cast(out); + auto in_ = static_cast(in); + auto out_ = static_cast(out); for (int32_t i = 0; i < size.y; i++) { memcpy(out_, in_, 2 * size.x); @@ -49,8 +49,8 @@ void Blit_uint32_uint32(const C2iVector& size, const void* in, uint32_t inStride return; } - const char* in_ = reinterpret_cast(in); - char* out_ = reinterpret_cast(out); + auto in_ = static_cast(in); + auto out_ = static_cast(out); for (int32_t i = 0; i < size.y; i++) { memcpy(out_, in_, 4 * size.x); @@ -180,13 +180,10 @@ void Blit_Dxt1_Rgb565(const C2iVector& size, const void* in, uint32_t inStride, } void Blit_Dxt1_Dxt1(const C2iVector& size, const void* in, uint32_t inStride, void* out, uint32_t outStride) { - const char* in_ = static_cast(in); - char* out_ = static_cast(out); - int32_t v6 = std::max(size.x, 4); int32_t v7 = std::max(size.y, 4); - memcpy(out_, in_, (4 * v6 * v7) >> 3); + memcpy(out, in, (4 * v6 * v7) >> 3); } void Blit_Dxt3_Argb8888(const C2iVector& size, const void* in, uint32_t inStride, void* out, uint32_t outStride) { @@ -201,14 +198,14 @@ void Blit_Dxt35_Dxt35(const C2iVector& size, const void* in, uint32_t inStride, int32_t v5 = std::max(size.x, 4); int32_t v6 = std::max(size.y / 4, 1); - const char* in_ = static_cast(in); - char* out_ = static_cast(out); - if (inStride == v5 * 4 && outStride == v5 * 4) { - memcpy(out_, in_, v5 * v6 * 4); + memcpy(out, in, v5 * v6 * 4); return; } + auto in_ = static_cast(in); + auto out_ = static_cast(out); + for (int32_t i = v6; i > 0; i--) { memcpy(out_, in_, v5 * 4); in_ += inStride;