gpulib: eliminate list scan-ahead

[pcsx_rearmed.git] / plugins / dfxvideo / gpulib_if.c

diff --git a/plugins/dfxvideo/gpulib_if.c b/plugins/dfxvideo/gpulib_if.c
index 82bc38d..12aa0a3 100644 (file)
--- a/plugins/dfxvideo/gpulib_if.c
+++ b/plugins/dfxvideo/gpulib_if.c
@@ -296,16 +296,27 @@ int renderer_init(void)
 
 extern const unsigned char cmd_lengths[256];
 
-void do_cmd_list(unsigned int *list, int list_len)
+int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
 {
-  unsigned int cmd, len;
-
+  unsigned int cmd = 0, len;
+  unsigned int *list_start = list;
   unsigned int *list_end = list + list_len;
 
   for (; list < list_end; list += 1 + len)
   {
     cmd = *list >> 24;
     len = cmd_lengths[cmd];
+    if (list + 1 + len > list_end) {
+      cmd = -1;
+      break;
+    }
+
+#ifndef TEST
+    if (cmd == 0xa0 || cmd == 0xc0)
+      break; // image i/o, forward to upper layer
+    else if ((cmd & 0xf8) == 0xe0)
+      gpu.ex_regs[cmd & 7] = list[0];
+#endif
 
     primTableJ[cmd]((void *)list);
 
@@ -313,8 +324,8 @@ void do_cmd_list(unsigned int *list, int list_len)
     {
       case 0x48 ... 0x4F:
       {
-        u32 num_vertexes = 1;
-        u32 *list_position = &(list[2]);
+        u32 num_vertexes = 2;
+        u32 *list_position = &(list[3]);
 
         while(1)
         {
@@ -325,16 +336,14 @@ void do_cmd_list(unsigned int *list, int list_len)
           num_vertexes++;
         }
 
-        if(num_vertexes > 2)
-          len += (num_vertexes - 2);
-
+        len += (num_vertexes - 2);
         break;
       }
 
       case 0x58 ... 0x5F:
       {
-        u32 num_vertexes = 1;
-        u32 *list_position = &(list[2]);
+        u32 num_vertexes = 2;
+        u32 *list_position = &(list[4]);
 
         while(1)
         {
@@ -345,9 +354,7 @@ void do_cmd_list(unsigned int *list, int list_len)
           num_vertexes++;
         }
 
-        if(num_vertexes > 2)
-          len += (num_vertexes - 2) * 2;
-
+        len += (num_vertexes - 2) * 2;
         break;
       }
 
@@ -365,6 +372,12 @@ void do_cmd_list(unsigned int *list, int list_len)
 #endif
     }
   }
+
+  gpu.ex_regs[1] &= ~0x1ff;
+  gpu.ex_regs[1] |= lGPUstatusRet & 0x1ff;
+
+  *last_cmd = cmd;
+  return list - list_start;
 }
 
 void renderer_sync_ecmds(uint32_t *ecmds)