gpu_neon: merge cmd size tables

[pcsx_rearmed.git] / plugins / gpu_neon / unai_if.cpp

diff --git a/plugins/gpu_neon/unai_if.cpp b/plugins/gpu_neon/unai_if.cpp
index 0497dda..072993a 100644 (file)
--- a/plugins/gpu_neon/unai_if.cpp
+++ b/plugins/gpu_neon/unai_if.cpp
@@ -32,19 +32,17 @@
 #define s32 int32_t
 #define s64 int64_t
 
 #define s32 int32_t
 #define s64 int64_t
 

-#define INLINE
+#define INLINE static

 
 #define        FRAME_BUFFER_SIZE  (1024*512*2)
 #define        FRAME_WIDTH        1024
 #define        FRAME_HEIGHT       512
 #define        FRAME_OFFSET(x,y)  (((y)<<10)+(x))
 
 
 #define        FRAME_BUFFER_SIZE  (1024*512*2)
 #define        FRAME_WIDTH        1024
 #define        FRAME_HEIGHT       512
 #define        FRAME_OFFSET(x,y)  (((y)<<10)+(x))
 

-//#define VIDEO_WIDTH 320
-
-static bool isSkip = false; /* skip frame (info coming from GPU) */
-static int linesInterlace = 0;  /* internal lines interlace */
-
+#define isSkip 0 /* skip frame (info coming from GPU) */

 #define alt_fps 0
 #define alt_fps 0

+static int linesInterlace;  /* internal lines interlace */
+static int force_interlace;

 
 static bool light = true; /* lighting */
 static bool blend = true; /* blending */
 
 static bool light = true; /* lighting */
 static bool blend = true; /* blending */


@@ -91,12 +89,12 @@ static u32   tInc, tMsk;
 
 union GPUPacket
 {
 
 union GPUPacket
 {

-       u32 *U4;
-       s32 *S4;
-       u16 *U2;
-       s16 *S2;
-       u8  *U1;
-       s8  *S1;
+       u32 U4[16];
+       s32 S4[16];
+       u16 U2[32];
+       s16 S2[32];
+       u8  U1[64];
+       s8  S1[64];

 };
 
 static GPUPacket PacketBuffer;
 };
 
 static GPUPacket PacketBuffer;


@@ -137,8 +135,8 @@ static u32   GPU_GP1;
 // GPU command buffer execution/store
 #include "../gpu_unai/gpu_command.h"
 
 // GPU command buffer execution/store
 #include "../gpu_unai/gpu_command.h"
 

-#define unai_do_prim(cmd, list) \
-  PacketBuffer.U4 = list; \
+#define unai_do_prim(cmd, list, len) \
+  memcpy(PacketBuffer.U4, list, (len) * 4); \

   gpuSendPacketFunction(cmd)
 
 /////////////////////////////////////////////////////////////////////////////
   gpuSendPacketFunction(cmd)
 
 /////////////////////////////////////////////////////////////////////////////


@@ -167,30 +165,38 @@ extern const unsigned char cmd_lengths[256];
 void do_cmd_list(unsigned int *list, int list_len)
 {
   unsigned int cmd, len;
 void do_cmd_list(unsigned int *list, int list_len)
 {
   unsigned int cmd, len;

-

   unsigned int *list_end = list + list_len;
 
   unsigned int *list_end = list + list_len;
 

+  linesInterlace = force_interlace;
+#ifndef __ARM_ARCH_7A__ /* XXX */
+  linesInterlace |= gpu.status.interlace;
+#endif
+

   for (; list < list_end; list += 1 + len)
   {
   for (; list < list_end; list += 1 + len)
   {

-    short *slist = (short *)list;

     cmd = *list >> 24;
     len = cmd_lengths[cmd];
 
     cmd = *list >> 24;
     len = cmd_lengths[cmd];
 

-    unai_do_prim(cmd, list);
-

     switch(cmd)
     {
       case 0x48 ... 0x4F:
       {
         u32 num_vertexes = 1;
         u32 *list_position = &(list[2]);
     switch(cmd)
     {
       case 0x48 ... 0x4F:
       {
         u32 num_vertexes = 1;
         u32 *list_position = &(list[2]);

+        u32 PRIM = cmd;
+
+        memcpy(&PacketBuffer.U4[0], list, 4 * 3);
+        gpuDrawLF(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);

 
         while(1)
         {
           if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
             break;
 
 
         while(1)
         {
           if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
             break;
 

-          list_position++;
+          PacketBuffer.U4[1] = PacketBuffer.U4[2];
+          PacketBuffer.U4[2] = *list_position++;
+          gpuDrawLF(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
+

           num_vertexes++;
         }
 
           num_vertexes++;
         }
 


@@ -204,43 +210,58 @@ void do_cmd_list(unsigned int *list, int list_len)
       {
         u32 num_vertexes = 1;
         u32 *list_position = &(list[2]);
       {
         u32 num_vertexes = 1;
         u32 *list_position = &(list[2]);

+        u32 PRIM = cmd;
+
+        memcpy(&PacketBuffer.U4[0], list, 4 * 4);
+        gpuDrawLG(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);

 
         while(1)
         {
           if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
             break;
 
 
         while(1)
         {
           if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
             break;
 

-          list_position += 2;
+          PacketBuffer.U4[0] = PacketBuffer.U4[2];
+          PacketBuffer.U4[1] = PacketBuffer.U4[3];
+          PacketBuffer.U4[2] = *list_position++;
+          PacketBuffer.U4[3] = *list_position++;
+          gpuDrawLG(gpuPixelDrivers [ (Blending_Mode | Masking | Blending | (PixelMSB>>3)) >> 1]);
+

           num_vertexes++;
         }
 
         if(num_vertexes > 2)
           num_vertexes++;
         }
 
         if(num_vertexes > 2)

-          len += ((num_vertexes * 2) - 2);
+          len += (num_vertexes - 2) * 2;

 
         break;
       }
 
 
         break;
       }
 

+#ifdef TEST

       case 0xA0:          //  sys -> vid
       {
       case 0xA0:          //  sys -> vid
       {

-        u32 load_width = slist[4];
-        u32 load_height = slist[5];
+        u32 load_width = list[2] & 0xffff;
+        u32 load_height = list[2] >> 16;

         u32 load_size = load_width * load_height;
 
         len += load_size / 2;
         break;
       }
         u32 load_size = load_width * load_height;
 
         len += load_size / 2;
         break;
       }

+#endif
+
+      default:
+        unai_do_prim(cmd, list, len + 1);
+        break;

     }
   }
 }
 
 void renderer_sync_ecmds(uint32_t *ecmds)
 {
     }
   }
 }
 
 void renderer_sync_ecmds(uint32_t *ecmds)
 {

-  unai_do_prim(0xe1, &ecmds[1]);
-  unai_do_prim(0xe2, &ecmds[2]);
-  unai_do_prim(0xe3, &ecmds[3]);
-  unai_do_prim(0xe4, &ecmds[4]);
-  unai_do_prim(0xe5, &ecmds[5]);
-  unai_do_prim(0xe6, &ecmds[6]);
+  unai_do_prim(0xe1, &ecmds[1], 1);
+  unai_do_prim(0xe2, &ecmds[2], 1);
+  unai_do_prim(0xe3, &ecmds[3], 1);
+  unai_do_prim(0xe4, &ecmds[4], 1);
+  unai_do_prim(0xe5, &ecmds[5], 1);
+  unai_do_prim(0xe6, &ecmds[6], 1);

 }
 
 void renderer_invalidate_caches(int x, int y, int w, int h)
 }
 
 void renderer_invalidate_caches(int x, int y, int w, int h)


@@ -251,11 +272,20 @@ void renderer_flush_queues(void)
 {
 }
 
 {
 }
 

+void renderer_set_interlace(int enable, int is_odd)
+{
+}
+
+#ifndef TEST
+

 #include "../../frontend/plugin_lib.h"
 
 void renderer_set_config(const struct rearmed_cbs *cbs)
 {
 #include "../../frontend/plugin_lib.h"
 
 void renderer_set_config(const struct rearmed_cbs *cbs)
 {

+  force_interlace = cbs->gpu_unai.lineskip;

   enableAbbeyHack = cbs->gpu_unai.abe_hack;
   light = !cbs->gpu_unai.no_light;
   blend = !cbs->gpu_unai.no_blend;
 }
   enableAbbeyHack = cbs->gpu_unai.abe_hack;
   light = !cbs->gpu_unai.no_light;
   blend = !cbs->gpu_unai.no_blend;
 }

+
+#endif