From: Paul Cercueil <paul@crapouillou.net>
Date: Mon, 30 May 2022 17:08:10 +0000 (+0100)
Subject: frontend: Remove duplicated code
X-Git-Tag: r24l~453^2~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fd0f4a808908fb991243b907cf0cace07c52850;p=pcsx_rearmed.git

frontend: Remove duplicated code

The same function bgr888_to_rgb565() was present twice, protected by
different macros.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---

diff --git a/frontend/cspace.c b/frontend/cspace.c
index 557fe461..1dbc8a66 100644
--- a/frontend/cspace.c
+++ b/frontend/cspace.c
@@ -43,29 +43,7 @@ void bgr555_to_rgb565(void *dst_, const void *src_, int bytes)
 
 #endif
 
-#ifdef __arm64__
-
-void bgr888_to_rgb565(void *dst_, const void *src_, int bytes)
-{
-    const unsigned char *src = src_;
-    unsigned int *dst = dst_;
-    unsigned int r1, g1, b1, r2, g2, b2;
-
-    for (; bytes >= 6; bytes -= 6, src += 6, dst++) {
-        r1 = src[0] & 0xf8;
-        g1 = src[1] & 0xfc;
-        b1 = src[2] & 0xf8;
-        r2 = src[3] & 0xf8;
-        g2 = src[4] & 0xfc;
-        b2 = src[5] & 0xf8;
-        *dst = (r2 << 24) | (g2 << 19) | (b2 << 13) |
-               (r1 << 8) | (g1 << 3) | (b1 >> 3);
-    }
-}
-
-#endif
-
-#ifndef __ARM_NEON__
+#if defined(__arm64__) || !defined(__ARM_NEON__)
 
 void bgr888_to_rgb565(void *dst_, const void *src_, int bytes)
 {
@@ -90,6 +68,9 @@ void bgr888_to_rgb565(void *dst_, const void *src_, int bytes)
     }
 }
 
+#endif
+
+#ifndef __ARM_NEON__
 // TODO?
 void rgb888_to_rgb565(void *dst, const void *src, int bytes) {}
 void bgr888_to_rgb888(void *dst, const void *src, int bytes) {}