X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu_unai%2Fgpulib_if.cpp;fp=plugins%2Fgpu_unai%2Fgpulib_if.cpp;h=191108b83c691948d53ba11c2dd4c99256cc8604;hp=20794316b174c6fbaddcf02b6cf00a8bcbde1f00;hb=90ac6fed274c1d573a971c66f8a1338e8918f066;hpb=61a1bbbb76218c857318abbc75c7f8fac1188a41

diff --git a/plugins/gpu_unai/gpulib_if.cpp b/plugins/gpu_unai/gpulib_if.cpp
index 20794316..191108b8 100644
--- a/plugins/gpu_unai/gpulib_if.cpp
+++ b/plugins/gpu_unai/gpulib_if.cpp
@@ -390,14 +390,16 @@ static void gpuGP0Cmd_0xEx(gpu_unai_t &gpu_unai, u32 cmd_word)
 }
 #endif
 
+#include "../gpulib/gpu_timing.h"
 extern const unsigned char cmd_lengths[256];
 
-int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
+int do_cmd_list(u32 *_list, int list_len, int *cpu_cycles_out, int *last_cmd)
 {
   u32 cmd = 0, len, i;
   le32_t *list = (le32_t *)_list;
   le32_t *list_start = list;
   le32_t *list_end = list + list_len;
+  u32 cpu_cycles = 0;
 
   //TODO: set ilace_mask when resolution changes instead of every time,
   // eliminate #ifdef below.
@@ -430,6 +432,8 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
     {
       case 0x02:
         gpuClearImage(packet);
+        cpu_cycles += gput_fill(le16_to_s16(packet.U2[4]) & 0x3ff,
+           le16_to_s16(packet.U2[5]) & 0x1ff);
         break;
 
       case 0x20:
@@ -442,6 +446,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.Masking | Blending | gpu_unai.PixelMSB
         ];
         gpuDrawPolyF(packet, driver, false);
+        cpu_cycles += gput_poly_base();
       } break;
 
       case 0x24:
@@ -466,6 +471,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
 
         PP driver = gpuPolySpanDrivers[driver_idx];
         gpuDrawPolyFT(packet, driver, false);
+        cpu_cycles += gput_poly_base_t();
       } break;
 
       case 0x28:
@@ -478,6 +484,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.Masking | Blending | gpu_unai.PixelMSB
         ];
         gpuDrawPolyF(packet, driver, true); // is_quad = true
+        cpu_cycles += gput_quad_base();
       } break;
 
       case 0x2C:
@@ -502,6 +509,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
 
         PP driver = gpuPolySpanDrivers[driver_idx];
         gpuDrawPolyFT(packet, driver, true); // is_quad = true
+        cpu_cycles += gput_quad_base_t();
       } break;
 
       case 0x30:
@@ -519,6 +527,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.Masking | Blending | 129 | gpu_unai.PixelMSB
         ];
         gpuDrawPolyG(packet, driver, false);
+        cpu_cycles += gput_poly_base_g();
       } break;
 
       case 0x34:
@@ -534,6 +543,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.Masking | Blending | ((Lighting)?129:0) | gpu_unai.PixelMSB
         ];
         gpuDrawPolyGT(packet, driver, false);
+        cpu_cycles += gput_poly_base_gt();
       } break;
 
       case 0x38:
@@ -548,6 +558,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.Masking | Blending | 129 | gpu_unai.PixelMSB
         ];
         gpuDrawPolyG(packet, driver, true); // is_quad = true
+        cpu_cycles += gput_quad_base_g();
       } break;
 
       case 0x3C:
@@ -563,6 +574,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.Masking | Blending | ((Lighting)?129:0) | gpu_unai.PixelMSB
         ];
         gpuDrawPolyGT(packet, driver, true); // is_quad = true
+        cpu_cycles += gput_quad_base_gt();
       } break;
 
       case 0x40:
@@ -573,6 +585,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
         u32 driver_idx = (Blending_Mode | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>3)) >> 1;
         PSD driver = gpuPixelSpanDrivers[driver_idx];
         gpuDrawLineF(packet, driver);
+        cpu_cycles += gput_line(0);
       } break;
 
       case 0x48 ... 0x4F: { // Monochrome line strip
@@ -589,6 +602,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.PacketBuffer.U4[1] = gpu_unai.PacketBuffer.U4[2];
           gpu_unai.PacketBuffer.U4[2] = *list_position++;
           gpuDrawLineF(packet, driver);
+          cpu_cycles += gput_line(0);
 
           num_vertexes++;
           if(list_position >= list_end) {
@@ -612,6 +626,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
         driver_idx |= (1 << 5);
         PSD driver = gpuPixelSpanDrivers[driver_idx];
         gpuDrawLineG(packet, driver);
+        cpu_cycles += gput_line(0);
       } break;
 
       case 0x58 ... 0x5F: { // Gouraud-shaded line strip
@@ -632,6 +647,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           gpu_unai.PacketBuffer.U4[2] = *list_position++;
           gpu_unai.PacketBuffer.U4[3] = *list_position++;
           gpuDrawLineG(packet, driver);
+          cpu_cycles += gput_line(0);
 
           num_vertexes++;
           if(list_position >= list_end) {
@@ -651,6 +667,8 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
       case 0x63: {          // Monochrome rectangle (variable size)
         PT driver = gpuTileSpanDrivers[(Blending_Mode | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>3)) >> 1];
         gpuDrawT(packet, driver);
+        cpu_cycles += gput_sprite(le16_to_u16(packet.U2[4]) & 0x3ff,
+                         le16_to_u16(packet.U2[5]) & 0x1ff);
       } break;
 
       case 0x64:
@@ -678,6 +696,8 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           driver_idx |= Lighting;
         PS driver = gpuSpriteSpanDrivers[driver_idx];
         gpuDrawS(packet, driver);
+        cpu_cycles += gput_sprite(le16_to_u16(packet.U2[6]) & 0x3ff,
+                         le16_to_u16(packet.U2[7]) & 0x1ff);
       } break;
 
       case 0x68:
@@ -687,6 +707,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
         gpu_unai.PacketBuffer.U4[2] = u32_to_le32(0x00010001);
         PT driver = gpuTileSpanDrivers[(Blending_Mode | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>3)) >> 1];
         gpuDrawT(packet, driver);
+        cpu_cycles += gput_sprite(1, 1);
       } break;
 
       case 0x70:
@@ -696,6 +717,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
         gpu_unai.PacketBuffer.U4[2] = u32_to_le32(0x00080008);
         PT driver = gpuTileSpanDrivers[(Blending_Mode | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>3)) >> 1];
         gpuDrawT(packet, driver);
+        cpu_cycles += gput_sprite(8, 8);
       } break;
 
       case 0x74:
@@ -713,6 +735,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           driver_idx |= Lighting;
         PS driver = gpuSpriteSpanDrivers[driver_idx];
         gpuDrawS(packet, driver);
+        cpu_cycles += gput_sprite(8, 8);
       } break;
 
       case 0x78:
@@ -722,6 +745,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
         gpu_unai.PacketBuffer.U4[2] = u32_to_le32(0x00100010);
         PT driver = gpuTileSpanDrivers[(Blending_Mode | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>3)) >> 1];
         gpuDrawT(packet, driver);
+        cpu_cycles += gput_sprite(16, 16);
       } break;
 
       case 0x7C:
@@ -731,6 +755,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
         {
           gpuSetCLUT    (le32_to_u32(gpu_unai.PacketBuffer.U4[2]) >> 16);
           gpuDrawS16(packet);
+          cpu_cycles += gput_sprite(16, 16);
           break;
         }
         // fallthrough
@@ -747,6 +772,7 @@ int do_cmd_list(u32 *_list, int list_len, int *last_cmd)
           driver_idx |= Lighting;
         PS driver = gpuSpriteSpanDrivers[driver_idx];
         gpuDrawS(packet, driver);
+        cpu_cycles += gput_sprite(16, 16);
       } break;
 
 #ifdef TEST
@@ -782,6 +808,7 @@ breakloop:
   gpu.ex_regs[1] &= ~0x1ff;
   gpu.ex_regs[1] |= gpu_unai.GPU_GP1 & 0x1ff;
 
+  *cpu_cycles_out += cpu_cycles;
   *last_cmd = cmd;
   return list - list_start;
 }
@@ -789,7 +816,7 @@ breakloop:
 void renderer_sync_ecmds(u32 *ecmds)
 {
   int dummy;
-  do_cmd_list(&ecmds[1], 6, &dummy);
+  do_cmd_list(&ecmds[1], 6, &dummy, &dummy);
 }
 
 void renderer_update_caches(int x, int y, int w, int h, int state_changed)