X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fcspace.c;h=bd5e7a3e98b2987f146d2d1e5505ddebf6125624;hb=025b6fde9b8ce688008227211168358b96e98d62;hp=5f3075b5a0c822f1d74146952b531d6862eaf7fe;hpb=4f949f3c0eb95bbcd3266ffb8c84449ee5888a6b;p=pcsx_rearmed.git

diff --git a/frontend/cspace.c b/frontend/cspace.c
index 5f3075b5..bd5e7a3e 100644
--- a/frontend/cspace.c
+++ b/frontend/cspace.c
@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include <stdint.h>
 #include "cspace.h"
 
 /*
@@ -30,7 +31,6 @@
         || (defined(__GNUC__) && __GNUC__ >= 5)) \
        && __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__
 
-#include <stdint.h>
 #include <assert.h>
 
 #if defined(__ARM_NEON) || defined(__ARM_NEON__)
@@ -93,7 +93,8 @@ void bgr555_to_rgb565(void * __restrict__ dst_, const void *  __restrict__ src_,
 
 void bgr555_to_rgb565(void *dst_, const void *src_, int bytes)
 {
-    const unsigned int *src = src_;
+    // source can be misaligned, but it's very rare, so just force
+    const unsigned int *src = (const void *)((intptr_t)src_ & ~3);
     unsigned int *dst = dst_;
     unsigned int x, p, r, g, b;
 
@@ -135,9 +136,6 @@ 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) {}
@@ -217,7 +215,7 @@ void bgr555_to_uyvy(void *d, const void *s, int pixels)
   int r0, g0, b0, r1, g1, b1;
   int y0, y1, u, v;
 
-  for (; pixels > 0; src += 2, dst++, pixels -= 2)
+  for (; pixels > 1; src += 2, dst++, pixels -= 2)
   {
     b0 = (src[0] >> 10) & 0x1f;
     g0 = (src[0] >> 5) & 0x1f;