X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fgpu_neon%2Fpsx_gpu%2Fpsx_gpu_parse.c;h=5ef5f20f590530c8d3d03ca567a9740f0d38dbd5;hb=7a8d521fba9c86ae7b51369ce061bf63112b745f;hp=4260bc70330b7885f3f720635143ebdea53600ec;hpb=fc6cef7d739c850a10bca2a19855654aa78897a8;p=pcsx_rearmed.git diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c index 4260bc70..5ef5f20f 100644 --- a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c +++ b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c @@ -45,7 +45,6 @@ void update_texture_ptr(psx_gpu_struct *psx_gpu) switch((psx_gpu->render_state_base >> 8) & 0x3) { - default: case TEXTURE_MODE_4BPP: texture_base = psx_gpu->texture_4bpp_cache[psx_gpu->current_texture_page]; @@ -75,6 +74,7 @@ void update_texture_ptr(psx_gpu_struct *psx_gpu) texture_ptr += (psx_gpu->texture_window_y >> 4) << 12; break; + default: case TEXTURE_MODE_16BPP: texture_base = (u8 *)(psx_gpu->vram_ptr); texture_base += (psx_gpu->current_texture_page & 0xF) * 128; @@ -435,7 +435,10 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) num_vertexes++; if(list_position >= list_end) - break; + { + current_command = (u32)-1; + goto breakloop; + } xy = *list_position; if((xy & 0xF000F000) == 0x50005000) @@ -496,7 +499,10 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) num_vertexes++; if(list_position >= list_end) - break; + { + current_command = (u32)-1; + goto breakloop; + } color = list_position[0]; if((color & 0xF000F000) == 0x50005000) @@ -688,11 +694,21 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) } SET_Ex(2, list[0]); break; - } + } + + case 0xE3: + { + s16 viewport_start_x = list[0] & 0x3FF; + s16 viewport_start_y = (list[0] >> 10) & 0x1FF; + + if(viewport_start_x == psx_gpu->viewport_start_x && + viewport_start_y == psx_gpu->viewport_start_y) + { + break; + } - case 0xE3: - psx_gpu->viewport_start_x = list[0] & 0x3FF; - psx_gpu->viewport_start_y = (list[0] >> 10) & 0x1FF; + psx_gpu->viewport_start_x = viewport_start_x; + psx_gpu->viewport_start_y = viewport_start_y; #ifdef TEXTURE_CACHE_4BPP psx_gpu->viewport_mask = @@ -700,12 +716,23 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) psx_gpu->viewport_start_y, psx_gpu->viewport_end_x, psx_gpu->viewport_end_y); #endif - SET_Ex(3, list[0]); - break; - - case 0xE4: - psx_gpu->viewport_end_x = list[0] & 0x3FF; - psx_gpu->viewport_end_y = (list[0] >> 10) & 0x1FF; + SET_Ex(3, list[0]); + break; + } + + case 0xE4: + { + s16 viewport_end_x = list[0] & 0x3FF; + s16 viewport_end_y = (list[0] >> 10) & 0x1FF; + + if(viewport_end_x == psx_gpu->viewport_end_x && + viewport_end_y == psx_gpu->viewport_end_y) + { + break; + } + + psx_gpu->viewport_end_x = viewport_end_x; + psx_gpu->viewport_end_y = viewport_end_y; #ifdef TEXTURE_CACHE_4BPP psx_gpu->viewport_mask = @@ -713,10 +740,11 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) psx_gpu->viewport_start_y, psx_gpu->viewport_end_x, psx_gpu->viewport_end_y); #endif - SET_Ex(4, list[0]); - break; + SET_Ex(4, list[0]); + break; + } - case 0xE5: + case 0xE5: { s32 offset_x = list[0] << 21; s32 offset_y = list[0] << 10; @@ -752,9 +780,7 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) } } -#ifdef PCSX breakloop: -#endif if (last_command != NULL) *last_command = current_command; return list - list_start; @@ -762,17 +788,42 @@ breakloop: #ifdef PCSX -static void *select_enhancement_buf_ptr(psx_gpu_struct *psx_gpu, u32 x) +#define ENH_BUF_TABLE_STEP (1024 / sizeof(psx_gpu->enhancement_buf_by_x16)) + +static void update_enhancement_buf_table_from_hres(psx_gpu_struct *psx_gpu) +{ + u32 b, x, s; + + b = 0; + s = psx_gpu->enhancement_x_threshold; + for (x = 0; x < sizeof(psx_gpu->enhancement_buf_by_x16); x++) + { + if (b < 3 && x * ENH_BUF_TABLE_STEP >= s - ENH_BUF_TABLE_STEP - 1) + { + s += psx_gpu->enhancement_x_threshold; + b++; + } + psx_gpu->enhancement_buf_by_x16[x] = b; + } +} + +static void update_enhancement_buf_table_from_x(psx_gpu_struct *psx_gpu, + u32 x0, u32 len) { - u32 b; - for (b = 0; x >= psx_gpu->enhancement_x_threshold; b++) - x -= psx_gpu->enhancement_x_threshold; - return psx_gpu->enhancement_buf_ptr + b * 1024 * 1024; + u32 x, b; + + for (x = x0, b = 0; x >= len; b++) + x -= len; + if (b > 3) + b = 3; + + memset(psx_gpu->enhancement_buf_by_x16 + x0 / ENH_BUF_TABLE_STEP, + b, (len + ENH_BUF_TABLE_STEP - 1) / ENH_BUF_TABLE_STEP); } #define select_enhancement_buf(psx_gpu) \ psx_gpu->enhancement_current_buf_ptr = \ - select_enhancement_buf_ptr(psx_gpu, psx_gpu->saved_viewport_start_x + 8) + select_enhancement_buf_ptr(psx_gpu, psx_gpu->saved_viewport_start_x) #define enhancement_disable() { \ psx_gpu->vram_out_ptr = psx_gpu->vram_ptr; \ @@ -817,7 +868,72 @@ extern void scale2x_tiles8(void *dst, const void *src, int w8, int h); #ifndef NEON_BUILD // TODO? -void scale2x_tiles8(void *dst, const void *src, int w8, int h) {} +void scale2x_tiles8(void *dst, const void *src, int w8, int h) +{ + uint16_t* d = (uint16_t*)dst; + const uint16_t* s = (const uint16_t*)src; + + while ( h-- ) + { + uint16_t* d_save = d; + const uint16_t* s_save = s; + int w = w8; + + while ( w-- ) + { + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + + d[ 0 ] = *s; + d[ 1 ] = *s; + d[ 1024 ] = *s; + d[ 1025 ] = *s; + d += 2; s++; + } + + d = d_save + 2048; + s = s_save + 1024; /* or 512? */ + } +} #endif static int disable_main_render; @@ -939,12 +1055,12 @@ static void do_sprite_enhanced(psx_gpu_struct *psx_gpu, int x, int y, u32 flags = (cmd_rgb >> 24); u32 color = cmd_rgb & 0xffffff; - psx_gpu->vram_out_ptr = psx_gpu->enhancement_current_buf_ptr; render_sprite_4x(psx_gpu, x, y, u, v, w, h, flags, color); } #endif -u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_command) +u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, + u32 *last_command) { u32 current_command = 0, command_length; @@ -987,7 +1103,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_current_buf_ptr; + psx_gpu->vram_out_ptr = select_enhancement_buf_ptr(psx_gpu, x); x *= 2; y *= 2; width *= 2; @@ -1146,7 +1262,10 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c num_vertexes++; if(list_position >= list_end) - break; + { + current_command = (u32)-1; + goto breakloop; + } xy = *list_position; if((xy & 0xF000F000) == 0x50005000) @@ -1212,7 +1331,10 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c num_vertexes++; if(list_position >= list_end) - break; + { + current_command = (u32)-1; + goto breakloop; + } color = list_position[0]; if((color & 0xF000F000) == 0x50005000) @@ -1403,10 +1525,29 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c } case 0xE3: - psx_gpu->viewport_start_x = list[0] & 0x3FF; - 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; + { + s16 viewport_start_x = list[0] & 0x3FF; + s16 viewport_start_y = (list[0] >> 10) & 0x1FF; + u32 w; + s32 d; + + if(viewport_start_x == psx_gpu->viewport_start_x && + viewport_start_y == psx_gpu->viewport_start_y) + { + break; + } + psx_gpu->viewport_start_x = viewport_start_x; + psx_gpu->viewport_start_y = viewport_start_y; + psx_gpu->saved_viewport_start_x = viewport_start_x; + psx_gpu->saved_viewport_start_y = viewport_start_y; + + w = (u32)psx_gpu->viewport_end_x - (u32)viewport_start_x + 1; + d = psx_gpu->enhancement_x_threshold - w; + if(-16 <= d && d <= 16) + { + update_enhancement_buf_table_from_x(psx_gpu, + viewport_start_x, w); + } select_enhancement_buf(psx_gpu); #ifdef TEXTURE_CACHE_4BPP @@ -1417,12 +1558,34 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c #endif SET_Ex(3, list[0]); break; - + } + case 0xE4: - psx_gpu->viewport_end_x = list[0] & 0x3FF; - psx_gpu->viewport_end_y = (list[0] >> 10) & 0x1FF; - psx_gpu->saved_viewport_end_x = psx_gpu->viewport_end_x; - psx_gpu->saved_viewport_end_y = psx_gpu->viewport_end_y; + { + s16 viewport_end_x = list[0] & 0x3FF; + s16 viewport_end_y = (list[0] >> 10) & 0x1FF; + u32 w; + s32 d; + + if(viewport_end_x == psx_gpu->viewport_end_x && + viewport_end_y == psx_gpu->viewport_end_y) + { + break; + } + + psx_gpu->viewport_end_x = viewport_end_x; + psx_gpu->viewport_end_y = viewport_end_y; + psx_gpu->saved_viewport_end_x = viewport_end_x; + psx_gpu->saved_viewport_end_y = viewport_end_y; + + w = (u32)viewport_end_x - (u32)psx_gpu->viewport_start_x + 1; + d = psx_gpu->enhancement_x_threshold - w; + if(-16 <= d && d <= 16) + { + update_enhancement_buf_table_from_x(psx_gpu, + psx_gpu->viewport_start_x, w); + } + select_enhancement_buf(psx_gpu); #ifdef TEXTURE_CACHE_4BPP psx_gpu->viewport_mask = @@ -1432,6 +1595,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size, u32 *last_c #endif SET_Ex(4, list[0]); break; + } case 0xE5: {