gpu_unai: fix some 64bit issues

[pcsx_rearmed.git] / plugins / gpu_unai / gpu.cpp

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index 3342d1e..1552bed 100644 (file)
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -96,7 +96,7 @@ u32   tInc, tMsk;
 
 GPUPacket PacketBuffer;
 // FRAME_BUFFER_SIZE is defined in bytes; 512K is guard memory for out of range reads
-u16   GPU_FrameBuffer[(FRAME_BUFFER_SIZE+512*1024)/2] __attribute__((aligned(16)));
+u16   GPU_FrameBuffer[(FRAME_BUFFER_SIZE+512*1024)/2] __attribute__((aligned(2048)));
 u32   GPU_GP1;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -107,12 +107,10 @@ u32   GPU_GP1;
 //  GPU Raster Macros
 #define        GPU_RGB16(rgb)        ((((rgb)&0xF80000)>>9)|(((rgb)&0xF800)>>6)|(((rgb)&0xF8)>>3))
 
-#define GPU_EXPANDSIGN_POLY(x)  (((s32)(x)<<20)>>20)
-//#define GPU_EXPANDSIGN_POLY(x)  (((s32)(x)<<21)>>21)
-#define GPU_EXPANDSIGN_SPRT(x)  (((s32)(x)<<21)>>21)
+#define GPU_EXPANDSIGN(x)  (((s32)(x)<<21)>>21)
 
-//#define      GPU_TESTRANGE(x)      { if((u32)(x+1024) > 2047) return; }
-#define        GPU_TESTRANGE(x)      { if ((x<-1023) || (x>1023)) return; }
+#define CHKMAX_X 1024
+#define CHKMAX_Y 512
 
 #define        GPU_SWAP(a,b,t) {(t)=(a);(a)=(b);(b)=(t);}
 
@@ -274,8 +272,9 @@ void  GPU_writeDataMem(u32* dmaAddress, s32 dmaCount)
        {
                if (FrameToWrite) 
                {
-                       while (dmaCount--) 
+                       while (dmaCount)
                        {
+                               dmaCount--;
                                data = *dmaAddress++;
                                if ((&pvram[px])>(VIDEO_END)) pvram-=512*1024;
                                pvram[px] = data;
@@ -433,7 +432,7 @@ void  GPU_readDataMem(u32* dmaAddress, s32 dmaCount)
        {
                if ((&pvram[px])>(VIDEO_END)) pvram-=512*1024;
                // lower 16 bit
-               u32 data = (unsigned long)pvram[px];
+               u32 data = pvram[px];
 
                if (++px>=x_end) 
                {
@@ -443,7 +442,7 @@ void  GPU_readDataMem(u32* dmaAddress, s32 dmaCount)
 
                if ((&pvram[px])>(VIDEO_END)) pvram-=512*1024;
                // higher 16 bit (always, even if it's an odd width)
-               data |= (unsigned long)(pvram[px])<<16;
+               data |= (u32)(pvram[px])<<16;
                
                *dmaAddress++ = data;
 
@@ -820,24 +819,21 @@ void  GPU_updateLace(void)
 #else
 
 #include "../../frontend/plugin_lib.h"
-#include "../../frontend/arm_utils.h"
 
 extern "C" {
 
 static const struct rearmed_cbs *cbs;
-static void *screen_buf;
+static s16 old_res_horz, old_res_vert, old_rgb24;
 
 static void blit(void)
 {
-       static s16 old_res_horz, old_res_vert, old_rgb24;
+       u16 *base = (u16 *)GPU_FrameBuffer;
        s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
        s16 h0, x0, y0, w0, h1;
-       u16 *srcs;
-       u8  *dest;
 
        x0 = DisplayArea[0] & ~1; // alignment needed by blitter
        y0 = DisplayArea[1];
-       srcs = &((u16*)GPU_FrameBuffer)[FRAME_OFFSET(x0,y0)];
+       base += FRAME_OFFSET(x0, y0);
 
        w0 = DisplayArea[2];
        h0 = DisplayArea[3];  // video mode
@@ -853,33 +849,10 @@ static void blit(void)
                old_res_horz = w0;
                old_res_vert = h1;
                old_rgb24 = (s16)isRGB24;
-               screen_buf = cbs->pl_vout_set_mode(w0, h1, isRGB24 ? 24 : 16);
-       }
-       dest = (u8 *)screen_buf;
-
-       if (isRGB24)
-       {
-#ifndef MAEMO
-               for (; h1-- > 0; dest += w0 * 3, srcs += 1024)
-               {
-                       bgr888_to_rgb888(dest, srcs, w0 * 3);
-               }
-#else
-               for (; h1-- > 0; dest += w0 * 2, srcs += 1024)
-               {
-                       bgr888_to_rgb565(dest, srcs, w0 * 3);
-               }
-#endif
-       }
-       else
-       {
-               for (; h1-- > 0; dest += w0 * 2, srcs += 1024)
-               {
-                       bgr555_to_rgb565(dest, srcs, w0 * 2);
-               }
+               cbs->pl_vout_set_mode(w0, h1, w0, h1, isRGB24 ? 24 : 16);
        }
 
-       screen_buf = cbs->pl_vout_flip();
+       cbs->pl_vout_flip(base, 1024, isRGB24, w0, h1);
 }
 
 void GPU_updateLace(void)
@@ -907,7 +880,6 @@ void GPU_updateLace(void)
 long GPUopen(unsigned long *, char *, char *)
 {
        cbs->pl_vout_open();
-       screen_buf = cbs->pl_vout_flip();
        return 0;
 }
 
@@ -930,8 +902,12 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
        enableAbbeyHack = cbs_->gpu_unai.abe_hack;
        light = !cbs_->gpu_unai.no_light;
        blend = !cbs_->gpu_unai.no_blend;
+       if (cbs_->pl_vout_set_raw_vram)
+               cbs_->pl_vout_set_raw_vram((void *)GPU_FrameBuffer);
 
        cbs = cbs_;
+       if (cbs->pl_set_gpu_caps)
+               cbs->pl_set_gpu_caps(0);
 }
 
 } /* extern "C" */