#define sign_extend_12bit(value) \
(((s32)((value) << 20)) >> 20) \
+#define sign_extend_11bit(value) \
+ (((s32)((value) << 21)) >> 21) \
+
+#define sign_extend_10bit(value) \
+ (((s32)((value) << 22)) >> 22) \
+
+
#define get_vertex_data_xy(vertex_number, offset16) \
vertexes[vertex_number].x = \
sign_extend_12bit(list_s16[offset16]) + psx_gpu->offset_x; \
break;
case 0x02:
- render_block_fill(psx_gpu, list[0] & 0xFFFFFF, list_s16[2], list_s16[3],
- list_s16[4] & 0x3FF, list_s16[5] & 0x3FF);
+ render_block_fill(psx_gpu, list[0] & 0xFFFFFF, list_s16[2] & 0x3FF,
+ list_s16[3] & 0x1FF, list_s16[4] & 0x3FF, list_s16[5] & 0x1FF);
break;
case 0x20 ... 0x23:
get_vertex_data_xy(0, 2);
get_vertex_data_xy(1, 4);
get_vertex_data_xy(2, 6);
-
+
render_triangle(psx_gpu, vertexes, current_command);
break;
}
while(1)
{
xy = *list_position;
- if(xy == 0x55555555)
+
+ if((xy & 0xF000F000) == 0x50005000)
break;
vertexes[0] = vertexes[1];
list_position++;
num_vertexes++;
+ if(list_position > list_end)
+ break;
+
render_line(psx_gpu, vertexes, current_command, list[0]);
}
while(1)
{
color = list_position[0];
- if(color == 0x55555555)
+ if((color & 0xF000F000) == 0x50005000)
break;
xy = list_position[1];
list_position += 2;
num_vertexes++;
+ if(list_position > list_end)
+ break;
+
render_line(psx_gpu, vertexes, current_command, 0);
}
case 0x60 ... 0x63:
{
- u32 x = list_s16[2] + psx_gpu->offset_x;
- u32 y = list_s16[3] + psx_gpu->offset_y;
+ 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;
case 0x64 ... 0x67:
{
- u32 x = list_s16[2] + psx_gpu->offset_x;
- u32 y = list_s16[3] + psx_gpu->offset_y;
+ 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;
case 0x6A:
case 0x6B:
{
- s32 x = list_s16[2] + psx_gpu->offset_x;
- s32 y = list_s16[3] + psx_gpu->offset_y;
+ s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
+ s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
render_sprite(psx_gpu, x, y, 0, 0, 1, 1, current_command, list[0]);
break;
case 0x72:
case 0x73:
{
- s32 x = list_s16[2] + psx_gpu->offset_x;
- s32 y = list_s16[3] + psx_gpu->offset_y;
+ s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
+ s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
render_sprite(psx_gpu, x, y, 0, 0, 8, 8, current_command, list[0]);
break;
case 0x76:
case 0x77:
{
- s32 x = list_s16[2] + psx_gpu->offset_x;
- s32 y = list_s16[3] + psx_gpu->offset_y;
+ 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];
set_clut(psx_gpu, list_s16[5]);
case 0x7A:
case 0x7B:
{
- s32 x = list_s16[2] + psx_gpu->offset_x;
- s32 y = list_s16[3] + psx_gpu->offset_y;
+ s32 x = sign_extend_11bit(list_s16[2] + psx_gpu->offset_x);
+ s32 y = sign_extend_11bit(list_s16[3] + psx_gpu->offset_y);
render_sprite(psx_gpu, x, y, 0, 0, 16, 16, current_command, list[0]);
break;
case 0x7E:
case 0x7F:
{
- s32 x = list_s16[2] + psx_gpu->offset_x;
- s32 y = list_s16[3] + psx_gpu->offset_y;
+ 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];
set_clut(psx_gpu, list_s16[5]);
case 0xA0: // sys -> vid
{
- u32 load_x = list_s16[2];
- u32 load_y = list_s16[3];
- u32 load_width = list_s16[4];
- u32 load_height = list_s16[5];
+ u32 load_x = list_s16[2] & 0x3FF;
+ u32 load_y = list_s16[3] & 0x1FF;
+ u32 load_width = list_s16[4] & 0x3FF;
+ u32 load_height = list_s16[5] & 0x1FF;
u32 load_size = load_width * load_height;
command_length += load_size / 2;
-
+
+ if(load_size & 1)
+ command_length++;
+
render_block_copy(psx_gpu, (u16 *)&(list_s16[6]), load_x, load_y,
load_width, load_height, load_width);
break;