gpulib: eliminate list scan-ahead

4 files changed, 51 insertions, 12 deletions

diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu.h b/plugins/gpu_neon/psx_gpu/psx_gpu.h
index 4605c39..53a8717 100644
--- a/plugins/gpu_neon/psx_gpu/psx_gpu.h
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu.h
@@ -231,7 +231,7 @@ u32 texture_region_mask(s32 x1, s32 y1, s32 x2, s32 y2);
 void flush_render_block_buffer(psx_gpu_struct *psx_gpu);
 
 void initialize_psx_gpu(psx_gpu_struct *psx_gpu, u16 *vram);
-void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size);
+u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command);
 
 void triangle_benchmark(psx_gpu_struct *psx_gpu);
 
diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_main.c b/plugins/gpu_neon/psx_gpu/psx_gpu_main.c
index 6c17b0a..8ca3ad0 100644
--- a/plugins/gpu_neon/psx_gpu/psx_gpu_main.c
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu_main.c
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
   init_counter();
 #endif
 
-  gpu_parse(psx_gpu, list, size);
+  gpu_parse(psx_gpu, list, size, NULL);
   flush_render_block_buffer(psx_gpu);
 
   clear_stats();
@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
   u32 cycles = get_counter();
 #endif
 
-  gpu_parse(psx_gpu, list, size);
+  gpu_parse(psx_gpu, list, size, NULL);
   flush_render_block_buffer(psx_gpu);
 
 #ifdef NEON_BUILD
diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
index ac35631..3fc040d 100644
--- a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
@@ -199,12 +199,17 @@ void set_triangle_color(psx_gpu_struct *psx_gpu, u32 triangle_color)
   get_vertex_data_xy(vertex_number, offset16);                                 \
   set_vertex_color_constant(vertex_number, color)                              \
 
+#ifndef SET_Ex
+#define SET_Ex(r, v)
+#endif
+
 vertex_struct vertexes[4] __attribute__((aligned(32)));
 
-void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
+u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command)
 {
-  u32 current_command, command_length;
-  
+  u32 current_command = 0, command_length;
+
+  u32 *list_start = list;
   u32 *list_end = list + (size / 4);
 
   for(; list < list_end; list += 1 + command_length)
@@ -212,6 +217,10 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
   	s16 *list_s16 = (void *)list;
   	current_command = *list >> 24;
   	command_length = command_lengths[current_command];
+  	if (list + 1 + command_length > list_end) {
+  	  current_command = (u32)-1;
+  	  break;
+  	}
 
   	switch(current_command)
   	{
@@ -590,7 +599,12 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
         render_block_move(psx_gpu, list_s16[2] & 0x3FF, list_s16[3] & 0x1FF,
          list_s16[4] & 0x3FF, list_s16[5] & 0x1FF, list_s16[6], list_s16[7]);
   			break;
-  
+ 
+#ifdef PCSX
+  		case 0xA0:          //  sys -> vid
+  		case 0xC0:          //  vid -> sys
+  			goto breakloop;
+#else
   		case 0xA0:          //  sys -> vid
       {
         u32 load_x = list_s16[2] & 0x3FF;
@@ -608,10 +622,11 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
          load_width, load_height, load_width);
   			break;
       }
-  
+
   		case 0xC0:          //  vid -> sys
   			break;
-  
+#endif
+
   		case 0xE1:
         set_texture(psx_gpu, list[0] & 0x1FF);
 
@@ -621,6 +636,7 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
           psx_gpu->render_state_base &= ~RENDER_STATE_DITHER;
 
         psx_gpu->display_area_draw_enable = (list[0] >> 10) & 0x1;
+  			SET_Ex(1, list[0]);
   			break;
   
   		case 0xE2:
@@ -653,6 +669,7 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
 
           update_texture_ptr(psx_gpu);
         }
+        SET_Ex(2, list[0]);
         break;
   		}
   
@@ -666,6 +683,7 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
          psx_gpu->viewport_start_y, psx_gpu->viewport_end_x,
          psx_gpu->viewport_end_y);
 #endif
+  			SET_Ex(3, list[0]);
   			break;
   
   		case 0xE4:
@@ -678,6 +696,7 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
          psx_gpu->viewport_start_y, psx_gpu->viewport_end_x,
          psx_gpu->viewport_end_y);
 #endif
+  			SET_Ex(4, list[0]);
   			break;
   
   		case 0xE5:
@@ -687,6 +706,7 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
         psx_gpu->offset_x = offset_x >> 21;
         psx_gpu->offset_y = offset_y >> 21; 
   
+  			SET_Ex(5, list[0]);
   			break;
   		}
 
@@ -706,6 +726,7 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
           psx_gpu->mask_msb = mask_msb;
         }
 
+  			SET_Ex(6, list[0]);
   			break;
       }
   
@@ -713,5 +734,12 @@ void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
   			break;
   	}
   }
+
+#ifdef PCSX
+breakloop:
+#endif
+  if (last_command != NULL)
+    *last_command = current_command;
+  return list - list_start;
 }
 
diff --git a/plugins/gpu_neon/psx_gpu_if.c b/plugins/gpu_neon/psx_gpu_if.c
index 3ff6e48..ff31c27 100644
--- a/plugins/gpu_neon/psx_gpu_if.c
+++ b/plugins/gpu_neon/psx_gpu_if.c
@@ -13,26 +13,37 @@
 extern const unsigned char cmd_lengths[256];
 #define command_lengths cmd_lengths
 
+static unsigned int *ex_regs;
+
+#define PCSX
+#define SET_Ex(r, v) \
+  ex_regs[r] = v
+
 #include "psx_gpu/psx_gpu.c"
 #include "psx_gpu/psx_gpu_parse.c"
 #include "../gpulib/gpu.h"
 
 static psx_gpu_struct egpu __attribute__((aligned(256)));
 
-void do_cmd_list(uint32_t *list, int count)
+int do_cmd_list(uint32_t *list, int count, int *last_cmd)
 {
-  gpu_parse(&egpu, list, count * 4);
+  int ret = gpu_parse(&egpu, list, count * 4, (u32 *)last_cmd);
+
+  ex_regs[1] &= ~0x1ff;
+  ex_regs[1] |= egpu.texture_settings & 0x1ff;
+  return ret;
 }
 
 int renderer_init(void)
 {
   initialize_psx_gpu(&egpu, gpu.vram);
+  ex_regs = gpu.ex_regs;
   return 0;
 }
 
 void renderer_sync_ecmds(uint32_t *ecmds)
 {
-  gpu_parse(&egpu, ecmds + 1, 6 * 4);
+  gpu_parse(&egpu, ecmds + 1, 6 * 4, NULL);
 }
 
 void renderer_update_caches(int x, int y, int w, int h)