X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu_neon%2Fpsx_gpu%2Fpsx_gpu_parse.c;h=54f5614fa740cab9b3a6408aa1090a394fac7878;hp=d3616bdad823f7821e0ed429cdb402f81fecbb46;hb=e929dec505f8d3692248fe0d42c84a37c994ad39;hpb=f1359c5758c2e745b1cbec63e21445fa65f7cafe diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c index d3616bda..54f5614f 100644 --- a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c +++ b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c @@ -92,6 +92,7 @@ void update_texture_ptr(psx_gpu_struct *psx_gpu) void set_texture(psx_gpu_struct *psx_gpu, u32 texture_settings) { + texture_settings &= 0x1FF; if(psx_gpu->texture_settings != texture_settings) { u32 new_texture_page = texture_settings & 0x1F; @@ -634,7 +635,7 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) #endif case 0xE1: - set_texture(psx_gpu, list[0] & 0x1FF); + set_texture(psx_gpu, list[0]); if(list[0] & (1 << 9)) psx_gpu->render_state_base |= RENDER_STATE_DITHER; @@ -749,22 +750,31 @@ breakloop: 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_vertices3(v) { \ @@ -834,6 +844,71 @@ static void do_quad_enhanced(psx_gpu_struct *psx_gpu, vertex_struct *vertexes, } } +#define fill_vertex(i, x_, y_, u_, v_, rgb_) \ + vertexes[i].x = x_; \ + vertexes[i].y = y_; \ + vertexes[i].u = u_; \ + vertexes[i].v = v_; \ + vertexes[i].r = rgb_; \ + vertexes[i].g = (rgb_) >> 8; \ + vertexes[i].b = (rgb_) >> 16 + +static void do_esprite_in_triangles(psx_gpu_struct *psx_gpu, int x, int y, + u32 u, u32 v, u32 w, u32 h, u32 cmd_rgb) +{ + vertex_struct *vertex_ptrs[3]; + u32 flags = (cmd_rgb >> 24); + u32 color = cmd_rgb & 0xffffff; + u32 render_state_base_saved = psx_gpu->render_state_base; + int x1, y1; + u8 u1, v1; + + flags &= + (RENDER_FLAGS_MODULATE_TEXELS | RENDER_FLAGS_BLEND | + RENDER_FLAGS_TEXTURE_MAP); + + set_triangle_color(psx_gpu, color); + if(color == 0x808080) + flags |= RENDER_FLAGS_MODULATE_TEXELS; + + psx_gpu->render_state_base &= ~RENDER_STATE_DITHER; + enhancement_enable(); + + x1 = x + w; + y1 = y + h; + u1 = u + w; + v1 = v + h; + // FIXME.. + if (u1 < u) u1 = 0xff; + if (v1 < v) v1 = 0xff; + + // 0-2 + // |/ + // 1 + fill_vertex(0, x, y, u, v, color); + fill_vertex(1, x, y1, u, v1, color); + fill_vertex(2, x1, y, u1, v, color); + if (prepare_triangle(psx_gpu, vertexes, vertex_ptrs)) { + shift_vertices3(vertex_ptrs); + shift_triangle_area(); + render_triangle_p(psx_gpu, vertex_ptrs, flags); + } + + // 0 + // /| + // 1-2 + fill_vertex(0, x1, y, u1, v, color); + fill_vertex(1, x, y1, u, v1, color); + fill_vertex(2, x1, y1, u1, v1, color); + if (prepare_triangle(psx_gpu, vertexes, vertex_ptrs)) { + shift_vertices3(vertex_ptrs); + shift_triangle_area(); + render_triangle_p(psx_gpu, vertex_ptrs, flags); + } + + psx_gpu->render_state_base = render_state_base_saved; +} + u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) { u32 current_command = 0, command_length; @@ -845,6 +920,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c 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) { @@ -876,7 +952,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c 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; @@ -1110,6 +1186,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c u32 height = list_s16[5] & 0x1FF; render_sprite(psx_gpu, x, y, 0, 0, width, height, current_command, list[0]); + do_esprite_in_triangles(psx_gpu, x, y, 0, 0, width, height, list[0]); break; } @@ -1117,14 +1194,16 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c { 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]; + u8 u = list_s16[4]; + u8 v = list_s16[4] >> 8; u32 width = list_s16[6] & 0x3FF; u32 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, + render_sprite(psx_gpu, x, y, u, v, width, height, current_command, list[0]); + do_esprite_in_triangles(psx_gpu, x, y, u, v, width, height, list[0]); break; } @@ -1137,6 +1216,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c 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]); + do_esprite_in_triangles(psx_gpu, x, y, 0, 0, 1, 1, list[0]); break; } @@ -1149,6 +1229,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c 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]); + do_esprite_in_triangles(psx_gpu, x, y, 0, 0, 8, 8, list[0]); break; } @@ -1159,12 +1240,14 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c { 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]; + u8 u = list_s16[4]; + u8 v = list_s16[4] >> 8; set_clut(psx_gpu, list_s16[5]); - render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 8, 8, + render_sprite(psx_gpu, x, y, u, v, 8, 8, current_command, list[0]); + do_esprite_in_triangles(psx_gpu, x, y, u, v, 8, 8, list[0]); break; } @@ -1177,6 +1260,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c 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]); + do_esprite_in_triangles(psx_gpu, x, y, 0, 0, 16, 16, list[0]); break; } @@ -1187,12 +1271,13 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c { 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]; + u8 u = list_s16[4]; + u8 v = list_s16[4] >> 8; set_clut(psx_gpu, list_s16[5]); - render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 16, 16, - current_command, list[0]); + render_sprite(psx_gpu, x, y, u, v, 16, 16, current_command, list[0]); + do_esprite_in_triangles(psx_gpu, x, y, u, v, 16, 16, list[0]); break; } @@ -1230,7 +1315,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c #endif case 0xE1: - set_texture(psx_gpu, list[0] & 0x1FF); + set_texture(psx_gpu, list[0]); if(list[0] & (1 << 9)) psx_gpu->render_state_base |= RENDER_STATE_DITHER; @@ -1280,6 +1365,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c 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 =