fix gun handling in enhancement mode

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

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index f0539c0..df5e0cf 100644 (file)
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -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);}
 
@@ -821,12 +819,11 @@ void  GPU_updateLace(void)
 #else
 
 #include "../../frontend/plugin_lib.h"
-#include "../../frontend/cspace.h"
+#include "../gpulib/cspace.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)
@@ -834,12 +831,10 @@ static void blit(void)
        u16 *base = (u16 *)GPU_FrameBuffer;
        s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
        s16 h0, x0, y0, w0, h1;
-       u32 fb_offs;
-       u8  *dest;
 
        x0 = DisplayArea[0] & ~1; // alignment needed by blitter
        y0 = DisplayArea[1];
-       fb_offs = FRAME_OFFSET(x0, y0);
+       base += FRAME_OFFSET(x0, y0);
 
        w0 = DisplayArea[2];
        h0 = DisplayArea[3];  // video mode
@@ -855,59 +850,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);
+               cbs->pl_vout_set_mode(w0, h1, w0, h1, isRGB24 ? 24 : 16);
        }
-       dest = (u8 *)screen_buf;
 
-       if (isRGB24)
-       {
-#ifndef MAEMO
-               for (; h1-- > 0; dest += w0 * 3, fb_offs += 1024)
-               {
-                       fb_offs &= 1024*512-1;
-                       bgr888_to_rgb888(dest, base + fb_offs, w0 * 3);
-               }
-#else
-               for (; h1-- > 0; dest += w0 * 2, fb_offs += 1024)
-               {
-                       fb_offs &= 1024*512-1;
-                       bgr888_to_rgb565(dest, base + fb_offs, w0 * 3);
-               }
-#endif
-       }
-       else
-       {
-               for (; h1-- > 0; dest += w0 * 2, fb_offs += 1024)
-               {
-                       fb_offs &= 1024*512-1;
-                       bgr555_to_rgb565(dest, base + fb_offs, w0 * 2);
-               }
-       }
-
-       screen_buf = cbs->pl_vout_flip();
-}
-
-static void blit_raw(void)
-{
-       s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
-       s16 h0, w0, h1;
-
-       w0 = DisplayArea[2];
-       h0 = DisplayArea[3];  // video mode
-       h1 = DisplayArea[5] - DisplayArea[4]; // display needed
-       if (h0 == 480) h1 = Min2(h1*2,480);
-
-       if (h1 <= 0)
-               return;
-
-       if (w0 != old_res_horz || h1 != old_res_vert || isRGB24 != old_rgb24)
-       {
-               old_res_horz = w0;
-               old_res_vert = h1;
-               old_rgb24 = (s16)isRGB24;
-               screen_buf = cbs->pl_vout_set_mode(w0, h1, isRGB24 ? 24 : 16);
-       }
-       cbs->pl_vout_raw_flip(DisplayArea[0], DisplayArea[1]);
+       cbs->pl_vout_flip(base, 1024, isRGB24, w0, h1);
 }
 
 void GPU_updateLace(void)
@@ -919,10 +865,7 @@ void GPU_updateLace(void)
                return;
 
        if (!wasSkip) {
-               if (cbs->pl_vout_raw_flip != NULL)
-                       blit_raw();
-               else
-                       blit();
+               blit();
                fb_dirty = false;
                skCount = 0;
        }
@@ -938,7 +881,6 @@ void GPU_updateLace(void)
 long GPUopen(unsigned long *, char *, char *)
 {
        cbs->pl_vout_open();
-       screen_buf = cbs->pl_vout_flip();
        return 0;
 }
 
@@ -965,6 +907,8 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
                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" */