From c82d5b4ba31ae828cae27962f1a4d328fd4ea4da Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Tue, 31 Dec 2013 04:55:09 +0100
Subject: Fixed NEON GPU plugin for PC by using stdint.h types - use NEON GPU
 plugin for non-ARM targets now

---
 plugins/gpu_neon/psx_gpu/common.h  | 14 +++++++++++++-
 plugins/gpu_neon/psx_gpu/psx_gpu.c |  4 ++++
 plugins/gpu_neon/psx_gpu_if.c      |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'plugins/gpu_neon')

diff --git a/plugins/gpu_neon/psx_gpu/common.h b/plugins/gpu_neon/psx_gpu/common.h
index d5cf3e9..6c2a99b 100644
--- a/plugins/gpu_neon/psx_gpu/common.h
+++ b/plugins/gpu_neon/psx_gpu/common.h
@@ -1,6 +1,18 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#include <stdint.h>
+
+#ifdef NEON_PC
+typedef int8_t s8;
+typedef uint8_t u8;
+typedef int16_t s16;
+typedef uint16_t u16;
+typedef int32_t s32;
+typedef uint32_t u32;
+typedef int64_t s64;
+typedef uint64_t u64;
+#else
 typedef signed char s8;
 typedef unsigned char u8;
 typedef signed short s16;
@@ -9,8 +21,8 @@ typedef signed int s32;
 typedef unsigned int u32;
 typedef signed long long int s64;
 typedef unsigned long long int u64;
+#endif
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu.c b/plugins/gpu_neon/psx_gpu/psx_gpu.c
index e113f06..24f663b 100644
--- a/plugins/gpu_neon/psx_gpu/psx_gpu.c
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu.c
@@ -4130,7 +4130,11 @@ void setup_sprite_untextured_simple(psx_gpu_struct *psx_gpu, s32 x, s32 y,
     num_width = width;
 
     vram_ptr = (void *)vram_ptr16;
+#ifdef NEON_PC
+    if((int32_t)vram_ptr16 & 2)
+#else
     if((long)vram_ptr16 & 2)
+#endif
     {
       *vram_ptr16 = color_32bpp;
       vram_ptr = (void *)(vram_ptr16 + 1);
diff --git a/plugins/gpu_neon/psx_gpu_if.c b/plugins/gpu_neon/psx_gpu_if.c
index ad01761..86103f3 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -8,7 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <stdio.h>
+#include <stdint.h>
 #include <sys/mman.h>
 
 extern const unsigned char cmd_lengths[256];
-- 
cgit v1.2.3