vertexes[1].x = list_s16[4] + psx_gpu->offset_x;
vertexes[1].y = list_s16[5] + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, list[0]);
+ render_line(psx_gpu, vertexes, current_command, list[0], 0);
break;
}
vertexes[1].x = (xy & 0xFFFF) + psx_gpu->offset_x;
vertexes[1].y = (xy >> 16) + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, list[0]);
+ render_line(psx_gpu, vertexes, current_command, list[0], 0);
list_position++;
num_vertexes++;
vertexes[1].x = list_s16[6] + psx_gpu->offset_x;
vertexes[1].y = list_s16[7] + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, 0);
+ render_line(psx_gpu, vertexes, current_command, 0, 0);
break;
}
vertexes[1].x = (xy & 0xFFFF) + psx_gpu->offset_x;
vertexes[1].y = (xy >> 16) + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, 0);
+ render_line(psx_gpu, vertexes, current_command, 0, 0);
list_position += 2;
num_vertexes++;
return list - list_start;
}
+#define select_enhancement_buf(psx_gpu) { \
+ u32 _x, _b; \
+ _x = psx_gpu->saved_viewport_start_x + 8; \
+ for (_b = 0; _x >= psx_gpu->enhancement_x_threshold; _b++) \
+ _x -= psx_gpu->enhancement_x_threshold; \
+ psx_gpu->enhancement_current_buf_ptr = \
+ psx_gpu->enhancement_buf_ptr + _b * 1024 * 1024; \
+}
+
#define enhancement_disable() { \
psx_gpu->vram_out_ptr = psx_gpu->vram_ptr; \
psx_gpu->viewport_start_x = psx_gpu->saved_viewport_start_x; \
psx_gpu->viewport_start_y = psx_gpu->saved_viewport_start_y; \
psx_gpu->viewport_end_x = psx_gpu->saved_viewport_end_x; \
psx_gpu->viewport_end_y = psx_gpu->saved_viewport_end_y; \
- psx_gpu->render_mode &= ~RENDER_DOUBLE_MODE; \
psx_gpu->uvrgb_phase = 0x8000; \
}
#define enhancement_enable() { \
- psx_gpu->vram_out_ptr = psx_gpu->enhancement_buf_ptr; \
+ psx_gpu->vram_out_ptr = psx_gpu->enhancement_current_buf_ptr; \
psx_gpu->viewport_start_x = psx_gpu->saved_viewport_start_x * 2; \
psx_gpu->viewport_start_y = psx_gpu->saved_viewport_start_y * 2; \
psx_gpu->viewport_end_x = psx_gpu->saved_viewport_end_x * 2; \
psx_gpu->viewport_end_y = psx_gpu->saved_viewport_end_y * 2; \
- psx_gpu->render_mode |= RENDER_DOUBLE_MODE; \
psx_gpu->uvrgb_phase = 0x1000; \
}
#define shift_triangle_area() \
psx_gpu->triangle_area *= 4
+extern void scale2x_tiles8(void *dst, const void *src, int w8, int h);
+
static int disable_main_render;
static void do_triangle_enhanced(psx_gpu_struct *psx_gpu,
psx_gpu->saved_viewport_start_y = psx_gpu->viewport_start_y;
psx_gpu->saved_viewport_end_x = psx_gpu->viewport_end_x;
psx_gpu->saved_viewport_end_y = psx_gpu->viewport_end_y;
+ select_enhancement_buf(psx_gpu);
for(; list < list_end; list += 1 + command_length)
{
do_fill(psx_gpu, x, y, width, height, color);
- psx_gpu->vram_out_ptr = psx_gpu->enhancement_buf_ptr;
+ psx_gpu->vram_out_ptr = psx_gpu->enhancement_current_buf_ptr;
x *= 2;
y *= 2;
width *= 2;
vertexes[1].x = list_s16[4] + psx_gpu->offset_x;
vertexes[1].y = list_s16[5] + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, list[0]);
+ render_line(psx_gpu, vertexes, current_command, list[0], 0);
+ enhancement_enable();
+ render_line(psx_gpu, vertexes, current_command, list[0], 1);
break;
}
vertexes[1].x = (xy & 0xFFFF) + psx_gpu->offset_x;
vertexes[1].y = (xy >> 16) + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, list[0]);
+ enhancement_disable();
+ render_line(psx_gpu, vertexes, current_command, list[0], 0);
+ enhancement_enable();
+ render_line(psx_gpu, vertexes, current_command, list[0], 1);
list_position++;
num_vertexes++;
vertexes[1].x = list_s16[6] + psx_gpu->offset_x;
vertexes[1].y = list_s16[7] + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, 0);
+ render_line(psx_gpu, vertexes, current_command, 0, 0);
+ enhancement_enable();
+ render_line(psx_gpu, vertexes, current_command, 0, 1);
break;
}
vertexes[1].x = (xy & 0xFFFF) + psx_gpu->offset_x;
vertexes[1].y = (xy >> 16) + psx_gpu->offset_y;
- render_line(psx_gpu, vertexes, current_command, 0);
+ enhancement_disable();
+ render_line(psx_gpu, vertexes, current_command, 0, 0);
+ enhancement_enable();
+ render_line(psx_gpu, vertexes, current_command, 0, 1);
list_position += 2;
num_vertexes++;
}
case 0x80: // vid -> vid
- render_block_move(psx_gpu, list_s16[2] & 0x3FF, list_s16[3] & 0x1FF,
- list_s16[4] & 0x3FF, list_s16[5] & 0x1FF,
- ((list_s16[6] - 1) & 0x3FF) + 1, ((list_s16[7] - 1) & 0x1FF) + 1);
+ {
+ u32 sx = list_s16[2] & 0x3FF;
+ u32 sy = list_s16[3] & 0x1FF;
+ u32 dx = list_s16[4] & 0x3FF;
+ u32 dy = list_s16[5] & 0x1FF;
+ u32 w = ((list_s16[6] - 1) & 0x3FF) + 1;
+ u32 h = ((list_s16[7] - 1) & 0x1FF) + 1;
+
+ render_block_move(psx_gpu, sx, sy, dx, dy, w, h);
+ if (dy + h > 512)
+ h = 512 - dy;
+ sx = sx & ~7; // FIXME?
+ dx = dx * 2 & ~7;
+ dy *= 2;
+ scale2x_tiles8(psx_gpu->enhancement_buf_ptr + dy * 1024 + dx,
+ psx_gpu->vram_ptr + sy * 1024 + sx, w / 8, h);
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;
- 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;
- }
-
- case 0xC0: // vid -> sys
- break;
-#endif
case 0xE1:
set_texture(psx_gpu, list[0]);
psx_gpu->viewport_start_y = (list[0] >> 10) & 0x1FF;
psx_gpu->saved_viewport_start_x = psx_gpu->viewport_start_x;
psx_gpu->saved_viewport_start_y = psx_gpu->viewport_start_y;
+ select_enhancement_buf(psx_gpu);
#ifdef TEXTURE_CACHE_4BPP
psx_gpu->viewport_mask =