#include <stdio.h>
#include "common.h"
+#include "../../gpulib/gpu_timing.h"
#ifndef command_lengths
const u8 command_lengths[256] =
#define SET_Ex(r, v)
#endif
-u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command)
+u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
+ s32 *cpu_cycles_sum_out, s32 *cpu_cycles_last, u32 *last_command)
{
vertex_struct vertexes[4] __attribute__((aligned(16))) = {};
u32 current_command = 0, command_length;
+ u32 cpu_cycles_sum = 0, cpu_cycles = *cpu_cycles_last;
u32 *list_start = list;
u32 *list_end = list + (size / 4);
for(; list < list_end; list += 1 + command_length)
{
- 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)
- {
- case 0x00:
- break;
-
- case 0x02:
+ 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)
+ {
+ case 0x00:
+ break;
+
+ case 0x02:
{
u32 x = list_s16[2] & 0x3FF;
u32 y = list_s16[3] & 0x1FF;
u32 color = list[0] & 0xFFFFFF;
do_fill(psx_gpu, x, y, width, height, color);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_fill(width, height));
+ break;
}
-
- case 0x20 ... 0x23:
+
+ case 0x20 ... 0x23:
{
set_triangle_color(psx_gpu, list[0] & 0xFFFFFF);
get_vertex_data_xy(2, 6);
render_triangle(psx_gpu, vertexes, current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base());
+ break;
}
- case 0x24 ... 0x27:
+ case 0x24 ... 0x27:
{
set_clut(psx_gpu, list_s16[5]);
set_texture(psx_gpu, list_s16[9]);
get_vertex_data_xy_uv(2, 10);
render_triangle(psx_gpu, vertexes, current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base_t());
+ break;
}
- case 0x28 ... 0x2B:
+ case 0x28 ... 0x2B:
{
set_triangle_color(psx_gpu, list[0] & 0xFFFFFF);
render_triangle(psx_gpu, vertexes, current_command);
render_triangle(psx_gpu, &(vertexes[1]), current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base());
+ break;
}
- case 0x2C ... 0x2F:
+ case 0x2C ... 0x2F:
{
set_clut(psx_gpu, list_s16[5]);
set_texture(psx_gpu, list_s16[9]);
render_triangle(psx_gpu, vertexes, current_command);
render_triangle(psx_gpu, &(vertexes[1]), current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base_t());
+ break;
}
- case 0x30 ... 0x33:
+ case 0x30 ... 0x33:
{
get_vertex_data_xy_rgb(0, 0);
get_vertex_data_xy_rgb(1, 4);
get_vertex_data_xy_rgb(2, 8);
render_triangle(psx_gpu, vertexes, current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base_g());
+ break;
}
- case 0x34:
- case 0x35:
- case 0x36:
- case 0x37:
+ case 0x34 ... 0x37:
{
set_clut(psx_gpu, list_s16[5]);
set_texture(psx_gpu, list_s16[11]);
get_vertex_data_xy_uv_rgb(2, 12);
render_triangle(psx_gpu, vertexes, current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base_gt());
+ break;
}
- case 0x38:
- case 0x39:
- case 0x3A:
- case 0x3B:
+ case 0x38 ... 0x3B:
{
get_vertex_data_xy_rgb(0, 0);
get_vertex_data_xy_rgb(1, 4);
render_triangle(psx_gpu, vertexes, current_command);
render_triangle(psx_gpu, &(vertexes[1]), current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base_g());
+ break;
}
- case 0x3C:
- case 0x3D:
- case 0x3E:
- case 0x3F:
+ case 0x3C ... 0x3F:
{
set_clut(psx_gpu, list_s16[5]);
set_texture(psx_gpu, list_s16[11]);
render_triangle(psx_gpu, vertexes, current_command);
render_triangle(psx_gpu, &(vertexes[1]), current_command);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base_gt());
+ break;
}
- case 0x40 ... 0x47:
+ case 0x40 ... 0x47:
{
vertexes[0].x = list_s16[2] + psx_gpu->offset_x;
vertexes[0].y = list_s16[3] + psx_gpu->offset_y;
vertexes[1].y = list_s16[5] + psx_gpu->offset_y;
render_line(psx_gpu, vertexes, current_command, list[0], 0);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
+ break;
}
- case 0x48 ... 0x4F:
+ case 0x48 ... 0x4F:
{
u32 num_vertexes = 1;
u32 *list_position = &(list[2]);
vertexes[1].y = (xy >> 16) + psx_gpu->offset_y;
render_line(psx_gpu, vertexes, current_command, list[0], 0);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
list_position++;
num_vertexes++;
break;
}
- case 0x50 ... 0x57:
+ case 0x50 ... 0x57:
{
vertexes[0].r = list[0] & 0xFF;
vertexes[0].g = (list[0] >> 8) & 0xFF;
vertexes[1].y = list_s16[7] + psx_gpu->offset_y;
render_line(psx_gpu, vertexes, current_command, 0, 0);
- break;
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
+ break;
}
case 0x58 ... 0x5F:
vertexes[1].y = (xy >> 16) + psx_gpu->offset_y;
render_line(psx_gpu, vertexes, current_command, 0, 0);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
list_position += 2;
num_vertexes++;
break;
}
- case 0x60 ... 0x63:
+ case 0x60 ... 0x63:
{
u32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
u32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
- u32 width = list_s16[4] & 0x3FF;
- u32 height = list_s16[5] & 0x1FF;
+ s32 width = list_s16[4] & 0x3FF;
+ s32 height = list_s16[5] & 0x1FF;
- render_sprite(psx_gpu, x, y, 0, 0, width, height, current_command, list[0]);
- break;
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
+ break;
}
- case 0x64 ... 0x67:
+ case 0x64 ... 0x67:
{
u32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
u32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
u32 uv = list_s16[4];
- u32 width = list_s16[6] & 0x3FF;
- u32 height = list_s16[7] & 0x1FF;
+ s32 width = list_s16[6] & 0x3FF;
+ s32 height = list_s16[7] & 0x1FF;
set_clut(psx_gpu, list_s16[5]);
- render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, width, height,
- current_command, list[0]);
- break;
+ render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF,
+ &width, &height, current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
+ break;
}
- case 0x68:
- case 0x69:
- case 0x6A:
- case 0x6B:
+ case 0x68 ... 0x6B:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
+ s32 width = 1, height = 1;
- render_sprite(psx_gpu, x, y, 0, 0, 1, 1, current_command, list[0]);
- break;
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(1, 1));
+ break;
}
- case 0x70:
- case 0x71:
- case 0x72:
- case 0x73:
+ case 0x70 ... 0x73:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
+ s32 width = 8, height = 8;
- render_sprite(psx_gpu, x, y, 0, 0, 8, 8, current_command, list[0]);
- break;
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
+ break;
}
- case 0x74:
- case 0x75:
- case 0x76:
- case 0x77:
+ case 0x74 ... 0x77:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
u32 uv = list_s16[4];
+ s32 width = 8, height = 8;
set_clut(psx_gpu, list_s16[5]);
- render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 8, 8,
- current_command, list[0]);
- break;
+ render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF,
+ &width, &height, current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
+ break;
}
- case 0x78:
- case 0x79:
- case 0x7A:
- case 0x7B:
+ case 0x78 ... 0x7B:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
+ s32 width = 16, height = 16;
- render_sprite(psx_gpu, x, y, 0, 0, 16, 16, current_command, list[0]);
- break;
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
+ break;
}
- case 0x7C:
- case 0x7D:
- case 0x7E:
- case 0x7F:
+ case 0x7C ... 0x7F:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
u32 uv = list_s16[4];
+ s32 width = 16, height = 16;
set_clut(psx_gpu, list_s16[5]);
- render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 16, 16,
- current_command, list[0]);
- break;
+ render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF,
+ &width, &height, current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
+ break;
}
#ifdef PCSX
+ case 0x1F: // irq?
case 0x80 ... 0x9F: // vid -> vid
case 0xA0 ... 0xBF: // sys -> vid
case 0xC0 ... 0xDF: // vid -> sys
render_block_copy(psx_gpu, (u16 *)&(list_s16[6]), load_x, load_y,
load_width, load_height, load_width);
- break;
+ break;
}
case 0xC0 ... 0xDF: // vid -> sys
break;
#endif
- case 0xE1:
+ case 0xE1:
set_texture(psx_gpu, list[0]);
if(list[0] & (1 << 9))
psx_gpu->render_state_base &= ~RENDER_STATE_DITHER;
psx_gpu->display_area_draw_enable = (list[0] >> 10) & 0x1;
- SET_Ex(1, list[0]);
- break;
+ SET_Ex(1, list[0]);
+ break;
- case 0xE2:
+ case 0xE2:
{
// TODO: Clean
u32 texture_window_settings = list[0];
psx_gpu->offset_x = offset_x >> 21;
psx_gpu->offset_y = offset_y >> 21;
- SET_Ex(5, list[0]);
- break;
- }
+ SET_Ex(5, list[0]);
+ break;
+ }
- case 0xE6:
+ case 0xE6:
{
u32 mask_settings = list[0];
u16 mask_msb = mask_settings << 15;
psx_gpu->mask_msb = mask_msb;
}
- SET_Ex(6, list[0]);
- break;
+ SET_Ex(6, list[0]);
+ break;
}
- default:
- break;
- }
+ default:
+ break;
+ }
}
breakloop:
- if (last_command != NULL)
- *last_command = current_command;
+ *cpu_cycles_sum_out += cpu_cycles_sum;
+ *cpu_cycles_last = cpu_cycles;
+ *last_command = current_command;
return list - list_start;
}
static void select_enhancement_buf(psx_gpu_struct *psx_gpu)
{
- s32 x = psx_gpu->saved_viewport_start_x;
- s32 y = psx_gpu->saved_viewport_start_y;
+ s32 x = psx_gpu->saved_viewport_start_x + 16;
+ s32 y = psx_gpu->saved_viewport_start_y + 16;
psx_gpu->enhancement_current_buf_ptr = select_enhancement_buf_ptr(psx_gpu, x, y);
}
}
#endif
-static int disable_main_render;
-
// simple check for a case where no clipping is used
// - now handled by adjusting the viewport
static int check_enhanced_range(psx_gpu_struct *psx_gpu, int x, int y)
vertex_ptrs[i].v = new;
}
+// this sometimes does more harm than good, like in PE2
static void uv_hack(vertex_struct *vertex_ptrs, int vertex_count)
{
int i, u[4], v[4];
if (!prepare_triangle(psx_gpu, vertexes, vertex_ptrs))
return;
- if (!disable_main_render)
+ if (!psx_gpu->hack_disable_main)
render_triangle_p(psx_gpu, vertex_ptrs, current_command);
if (!check_enhanced_range(psx_gpu, vertex_ptrs[0]->x, vertex_ptrs[2]->x))
#endif
u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
- u32 *last_command)
+ s32 *cpu_cycles_sum_out, s32 *cpu_cycles_last, u32 *last_command)
{
vertex_struct vertexes[4] __attribute__((aligned(16))) = {};
u32 current_command = 0, command_length;
+ u32 cpu_cycles_sum = 0, cpu_cycles = *cpu_cycles_last;
u32 *list_start = list;
u32 *list_end = list + (size / 4);
x &= ~0xF;
width = ((width + 0xF) & ~0xF);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_fill(width, height));
if (width == 0 || height == 0)
break;
get_vertex_data_xy(2, 6);
do_triangle_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base());
break;
}
get_vertex_data_xy_uv(2, 10);
do_triangle_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base_t());
break;
}
get_vertex_data_xy(3, 8);
do_quad_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base());
break;
}
get_vertex_data_xy_uv(2, 10);
get_vertex_data_xy_uv(3, 14);
- uv_hack(vertexes, 4);
+ if (psx_gpu->hack_texture_adj)
+ uv_hack(vertexes, 4);
do_quad_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base_t());
break;
}
get_vertex_data_xy_rgb(2, 8);
do_triangle_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base_g());
break;
}
- case 0x34:
- case 0x35:
- case 0x36:
- case 0x37:
+ case 0x34 ... 0x37:
{
set_clut(psx_gpu, list_s16[5]);
set_texture(psx_gpu, list_s16[11]);
get_vertex_data_xy_uv_rgb(2, 12);
do_triangle_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_poly_base_gt());
break;
}
- case 0x38:
- case 0x39:
- case 0x3A:
- case 0x3B:
+ case 0x38 ... 0x3B:
{
get_vertex_data_xy_rgb(0, 0);
get_vertex_data_xy_rgb(1, 4);
get_vertex_data_xy_rgb(3, 12);
do_quad_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base_g());
break;
}
- case 0x3C:
- case 0x3D:
- case 0x3E:
- case 0x3F:
+ case 0x3C ... 0x3F:
{
set_clut(psx_gpu, list_s16[5]);
set_texture(psx_gpu, list_s16[11]);
get_vertex_data_xy_uv_rgb(2, 12);
get_vertex_data_xy_uv_rgb(3, 18);
- uv_hack(vertexes, 4);
+ if (psx_gpu->hack_texture_adj)
+ uv_hack(vertexes, 4);
do_quad_enhanced(psx_gpu, vertexes, current_command);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_quad_base_gt());
break;
}
render_line(psx_gpu, vertexes, current_command, list[0], 0);
if (enhancement_enable(psx_gpu))
render_line(psx_gpu, vertexes, current_command, list[0], 1);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
break;
}
render_line(psx_gpu, vertexes, current_command, list[0], 0);
if (enhancement_enable(psx_gpu))
render_line(psx_gpu, vertexes, current_command, list[0], 1);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
list_position++;
num_vertexes++;
render_line(psx_gpu, vertexes, current_command, 0, 0);
if (enhancement_enable(psx_gpu))
render_line(psx_gpu, vertexes, current_command, 0, 1);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
break;
}
render_line(psx_gpu, vertexes, current_command, 0, 0);
if (enhancement_enable(psx_gpu))
render_line(psx_gpu, vertexes, current_command, 0, 1);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_line(0));
list_position += 2;
num_vertexes++;
{
u32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
u32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
- u32 width = list_s16[4] & 0x3FF;
- u32 height = list_s16[5] & 0x1FF;
+ s32 width = list_s16[4] & 0x3FF;
+ s32 height = list_s16[5] & 0x1FF;
- render_sprite(psx_gpu, x, y, 0, 0, width, height, current_command, list[0]);
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
- if (check_enhanced_range(psx_gpu, x, x + width))
+ if (check_enhanced_range(psx_gpu, x, x + width)) {
+ width = list_s16[4] & 0x3FF;
+ height = list_s16[5] & 0x1FF;
do_sprite_enhanced(psx_gpu, x, y, 0, 0, width, height, list[0]);
+ }
break;
}
u32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
u8 u = list_s16[4];
u8 v = list_s16[4] >> 8;
- u32 width = list_s16[6] & 0x3FF;
- u32 height = list_s16[7] & 0x1FF;
+ s32 width = list_s16[6] & 0x3FF;
+ s32 height = list_s16[7] & 0x1FF;
set_clut(psx_gpu, list_s16[5]);
- render_sprite(psx_gpu, x, y, u, v, width, height,
- current_command, list[0]);
+ render_sprite(psx_gpu, x, y, u, v,
+ &width, &height, current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
- if (check_enhanced_range(psx_gpu, x, x + width))
+ if (check_enhanced_range(psx_gpu, x, x + width)) {
+ width = list_s16[6] & 0x3FF;
+ height = list_s16[7] & 0x1FF;
do_sprite_enhanced(psx_gpu, x, y, u, v, width, height, list[0]);
+ }
break;
}
- case 0x68:
- case 0x69:
- case 0x6A:
- case 0x6B:
+ case 0x68 ... 0x6B:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
+ s32 width = 1, height = 1;
- render_sprite(psx_gpu, x, y, 0, 0, 1, 1, current_command, list[0]);
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(1, 1));
if (check_enhanced_range(psx_gpu, x, x + 1))
do_sprite_enhanced(psx_gpu, x, y, 0, 0, 1, 1, list[0]);
break;
}
- case 0x70:
- case 0x71:
- case 0x72:
- case 0x73:
+ case 0x70 ... 0x73:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
+ s32 width = 8, height = 8;
- render_sprite(psx_gpu, x, y, 0, 0, 8, 8, current_command, list[0]);
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
if (check_enhanced_range(psx_gpu, x, x + 8))
do_sprite_enhanced(psx_gpu, x, y, 0, 0, 8, 8, list[0]);
break;
}
- case 0x74:
- case 0x75:
- case 0x76:
- case 0x77:
+ case 0x74 ... 0x77:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
u8 u = list_s16[4];
u8 v = list_s16[4] >> 8;
+ s32 width = 8, height = 8;
set_clut(psx_gpu, list_s16[5]);
- render_sprite(psx_gpu, x, y, u, v, 8, 8,
- current_command, list[0]);
+ render_sprite(psx_gpu, x, y, u, v,
+ &width, &height, current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
if (check_enhanced_range(psx_gpu, x, x + 8))
do_sprite_enhanced(psx_gpu, x, y, u, v, 8, 8, list[0]);
break;
}
- case 0x78:
- case 0x79:
- case 0x7A:
- case 0x7B:
+ case 0x78 ... 0x7B:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
+ s32 width = 16, height = 16;
- render_sprite(psx_gpu, x, y, 0, 0, 16, 16, current_command, list[0]);
+ render_sprite(psx_gpu, x, y, 0, 0, &width, &height,
+ current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
if (check_enhanced_range(psx_gpu, x, x + 16))
do_sprite_enhanced(psx_gpu, x, y, 0, 0, 16, 16, list[0]);
break;
}
- case 0x7C:
- case 0x7D:
- case 0x7E:
- case 0x7F:
+ case 0x7C ... 0x7F:
{
s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
u8 u = list_s16[4];
u8 v = list_s16[4] >> 8;
+ s32 width = 16, height = 16;
set_clut(psx_gpu, list_s16[5]);
- render_sprite(psx_gpu, x, y, u, v, 16, 16, current_command, list[0]);
+ render_sprite(psx_gpu, x, y, u, v,
+ &width, &height, current_command, list[0]);
+ gput_sum(cpu_cycles_sum, cpu_cycles, gput_sprite(width, height));
if (check_enhanced_range(psx_gpu, x, x + 16))
do_sprite_enhanced(psx_gpu, x, y, u, v, 16, 16, list[0]);
psx_gpu->saved_viewport_end_y = viewport_end_y;
select_enhancement_buf(psx_gpu);
-
+#if 0
+ if (!psx_gpu->enhancement_current_buf_ptr)
+ log_anomaly("vp %3d,%3d %3d,%d - no buf\n",
+ psx_gpu->viewport_start_x, psx_gpu->viewport_start_y,
+ viewport_end_x, viewport_end_y);
+#endif
#ifdef TEXTURE_CACHE_4BPP
psx_gpu->viewport_mask =
texture_region_mask(psx_gpu->viewport_start_x,
enhancement_disable();
breakloop:
- if (last_command != NULL)
- *last_command = current_command;
+ *cpu_cycles_sum_out += cpu_cycles_sum;
+ *cpu_cycles_last = cpu_cycles;
+ *last_command = current_command;
return list - list_start;
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff