}
#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.
{
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:
gpu_unai.Masking | Blending | gpu_unai.PixelMSB
];
gpuDrawPolyF(packet, driver, false);
+ cpu_cycles += gput_poly_base();
} break;
case 0x24:
PP driver = gpuPolySpanDrivers[driver_idx];
gpuDrawPolyFT(packet, driver, false);
+ cpu_cycles += gput_poly_base_t();
} break;
case 0x28:
gpu_unai.Masking | Blending | gpu_unai.PixelMSB
];
gpuDrawPolyF(packet, driver, true); // is_quad = true
+ cpu_cycles += gput_quad_base();
} break;
case 0x2C:
PP driver = gpuPolySpanDrivers[driver_idx];
gpuDrawPolyFT(packet, driver, true); // is_quad = true
+ cpu_cycles += gput_quad_base_t();
} break;
case 0x30:
gpu_unai.Masking | Blending | 129 | gpu_unai.PixelMSB
];
gpuDrawPolyG(packet, driver, false);
+ cpu_cycles += gput_poly_base_g();
} break;
case 0x34:
gpu_unai.Masking | Blending | ((Lighting)?129:0) | gpu_unai.PixelMSB
];
gpuDrawPolyGT(packet, driver, false);
+ cpu_cycles += gput_poly_base_gt();
} break;
case 0x38:
gpu_unai.Masking | Blending | 129 | gpu_unai.PixelMSB
];
gpuDrawPolyG(packet, driver, true); // is_quad = true
+ cpu_cycles += gput_quad_base_g();
} break;
case 0x3C:
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:
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
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) {
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
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) {
case 0x62:
case 0x63: { // Monochrome rectangle (variable size)
PT driver = gpuTileSpanDrivers[(Blending_Mode | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>3)) >> 1];
- gpuDrawT(packet, driver);
+ s32 w = 0, h = 0;
+ gpuDrawT(packet, driver, &w, &h);
+ cpu_cycles += gput_sprite(w, h);
} break;
case 0x64:
case 0x67: { // Textured rectangle (variable size)
gpuSetCLUT (le32_to_u32(gpu_unai.PacketBuffer.U4[2]) >> 16);
u32 driver_idx = Blending_Mode | gpu_unai.TEXT_MODE | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>1);
+ s32 w = 0, h = 0;
//senquack - Only color 808080h-878787h allows skipping lighting calculation:
// This fixes Silent Hill running animation on loading screens:
if ((le32_raw(gpu_unai.PacketBuffer.U4[0]) & HTOLE32(0xF8F8F8)) != HTOLE32(0x808080))
driver_idx |= Lighting;
PS driver = gpuSpriteSpanDrivers[driver_idx];
- gpuDrawS(packet, driver);
+ gpuDrawS(packet, driver, &w, &h);
+ cpu_cycles += gput_sprite(w, h);
} break;
case 0x68:
case 0x6B: { // Monochrome rectangle (1x1 dot)
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);
+ s32 w = 0, h = 0;
+ gpuDrawT(packet, driver, &w, &h);
+ cpu_cycles += gput_sprite(1, 1);
} break;
case 0x70:
case 0x73: { // Monochrome rectangle (8x8)
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);
+ s32 w = 0, h = 0;
+ gpuDrawT(packet, driver, &w, &h);
+ cpu_cycles += gput_sprite(w, h);
} break;
case 0x74:
gpu_unai.PacketBuffer.U4[3] = u32_to_le32(0x00080008);
gpuSetCLUT (le32_to_u32(gpu_unai.PacketBuffer.U4[2]) >> 16);
u32 driver_idx = Blending_Mode | gpu_unai.TEXT_MODE | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>1);
+ s32 w = 0, h = 0;
//senquack - Only color 808080h-878787h allows skipping lighting calculation:
//if ((gpu_unai.PacketBuffer.U1[0]>0x5F) && (gpu_unai.PacketBuffer.U1[1]>0x5F) && (gpu_unai.PacketBuffer.U1[2]>0x5F))
if ((le32_raw(gpu_unai.PacketBuffer.U4[0]) & HTOLE32(0xF8F8F8)) != HTOLE32(0x808080))
driver_idx |= Lighting;
PS driver = gpuSpriteSpanDrivers[driver_idx];
- gpuDrawS(packet, driver);
+ gpuDrawS(packet, driver, &w, &h);
+ cpu_cycles += gput_sprite(w, h);
} break;
case 0x78:
case 0x7B: { // Monochrome rectangle (16x16)
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);
+ s32 w = 0, h = 0;
+ gpuDrawT(packet, driver, &w, &h);
+ cpu_cycles += gput_sprite(w, h);
} break;
case 0x7C:
#ifdef __arm__
if ((gpu_unai.GPU_GP1 & 0x180) == 0 && (gpu_unai.Masking | gpu_unai.PixelMSB) == 0)
{
- gpuSetCLUT (le32_to_u32(gpu_unai.PacketBuffer.U4[2]) >> 16);
- gpuDrawS16(packet);
+ s32 w = 0, h = 0;
+ gpuSetCLUT(le32_to_u32(gpu_unai.PacketBuffer.U4[2]) >> 16);
+ gpuDrawS16(packet, &w, &h);
+ cpu_cycles += gput_sprite(w, h);
break;
}
// fallthrough
gpu_unai.PacketBuffer.U4[3] = u32_to_le32(0x00100010);
gpuSetCLUT (le32_to_u32(gpu_unai.PacketBuffer.U4[2]) >> 16);
u32 driver_idx = Blending_Mode | gpu_unai.TEXT_MODE | gpu_unai.Masking | Blending | (gpu_unai.PixelMSB>>1);
+ s32 w = 0, h = 0;
//senquack - Only color 808080h-878787h allows skipping lighting calculation:
//if ((gpu_unai.PacketBuffer.U1[0]>0x5F) && (gpu_unai.PacketBuffer.U1[1]>0x5F) && (gpu_unai.PacketBuffer.U1[2]>0x5F))
// Strip lower 3 bits of each color and determine if lighting should be used:
if ((le32_raw(gpu_unai.PacketBuffer.U4[0]) & HTOLE32(0xF8F8F8)) != HTOLE32(0x808080))
driver_idx |= Lighting;
PS driver = gpuSpriteSpanDrivers[driver_idx];
- gpuDrawS(packet, driver);
+ gpuDrawS(packet, driver, &w, &h);
+ cpu_cycles += gput_sprite(w, h);
} break;
#ifdef TEST
case 0xC0:
break;
#else
+ case 0x1F: // irq?
case 0x80 ... 0x9F: // vid -> vid
case 0xA0 ... 0xBF: // sys -> vid
case 0xC0 ... 0xDF: // vid -> sys
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;
}
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)