gpu_unai: Buildfix

diff --git a/jni/Android.mk b/jni/Android.mk
index 1b24c0b..756f54c 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -91,7 +91,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
                  $(FRONTEND_DIR)/cspace_neon.S
   SOURCES_C   += $(NEON_DIR)/psx_gpu_if.c
 else ifeq ($(TARGET_ARCH_ABI),armeabi)
-  SOURCES_ASM += $(UNAI_DIR)/gpu_arm.s \
+  SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
                  $(FRONTEND_DIR)/cspace_arm.S
   SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
 else

diff --git a/plugins/gpu_unai/gpu_arm.s b/plugins/gpu_unai/gpu_arm.S
similarity index 97%
rename from plugins/gpu_unai/gpu_arm.s
rename to plugins/gpu_unai/gpu_arm.S
index 8fa44a7..ec87f21 100644 (file)
--- a/plugins/gpu_unai/gpu_arm.s
+++ b/plugins/gpu_unai/gpu_arm.S
@@ -5,6 +5,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "arm_features.h"
 
 .text
 .align 2

diff --git a/plugins/gpu_unai/gpulib_if.cpp b/plugins/gpu_unai/gpulib_if.cpp
index 2dedbf8..087bb42 100644 (file)
--- a/plugins/gpu_unai/gpulib_if.cpp
+++ b/plugins/gpu_unai/gpulib_if.cpp
@@ -297,7 +297,7 @@ int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
       case 0x48 ... 0x4F:
       {
         u32 num_vertexes = 1;
-        u32 *list_position = &(list[2]);
+        u32 *list_position = (u32*)&(list[2]);
 
         gpuDrawLF(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
 
@@ -308,7 +308,7 @@ int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
           gpuDrawLF(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
 
           num_vertexes++;
-          if(list_position >= list_end) {
+          if(list_position >= (u32*)list_end) {
             cmd = -1;
             goto breakloop;
           }
@@ -330,7 +330,7 @@ int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
       case 0x58 ... 0x5F:
       {
         u32 num_vertexes = 1;
-        u32 *list_position = &(list[2]);
+        u32 *list_position = (u32*)&(list[2]);
 
         gpuDrawLG(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
 
@@ -343,7 +343,7 @@ int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
           gpuDrawLG(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
 
           num_vertexes++;
-          if(list_position >= list_end) {
+          if(list_position >= (u32*)list_end) {
             cmd = -1;
             goto breakloop;
           }