notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psx_gpu: flush render buffer before move/cppy/fill
[pcsx_rearmed.git]
/
plugins
/
gpu_neon
/
psx_gpu
/
psx_gpu_parse.c
diff --git
a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
index
f6143ee
..
7fee2eb
100644
(file)
--- a/
plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
+++ b/
plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
@@
-38,61
+38,53
@@
const u8 command_lengths[256] =
void update_texture_ptr(psx_gpu_struct *psx_gpu)
{
void update_texture_ptr(psx_gpu_struct *psx_gpu)
{
+ u8 *texture_base;
u8 *texture_ptr;
switch((psx_gpu->render_state_base >> 8) & 0x3)
{
default:
case TEXTURE_MODE_4BPP:
u8 *texture_ptr;
switch((psx_gpu->render_state_base >> 8) & 0x3)
{
default:
case TEXTURE_MODE_4BPP:
-#ifdef TEXTURE_CACHE_4BPP
- texture_ptr = psx_gpu->texture_4bpp_cache[psx_gpu->current_texture_page];
+ texture_base = psx_gpu->texture_4bpp_cache[psx_gpu->current_texture_page];
+
+ texture_ptr = texture_base;
texture_ptr += psx_gpu->texture_window_x & 0xF;
texture_ptr += (psx_gpu->texture_window_y & 0xF) << 4;
texture_ptr += (psx_gpu->texture_window_x >> 4) << 8;
texture_ptr += (psx_gpu->texture_window_y >> 4) << 12;
texture_ptr += psx_gpu->texture_window_x & 0xF;
texture_ptr += (psx_gpu->texture_window_y & 0xF) << 4;
texture_ptr += (psx_gpu->texture_window_x >> 4) << 8;
texture_ptr += (psx_gpu->texture_window_y >> 4) << 12;
-#else
- texture_ptr = (u8 *)(psx_gpu->vram_ptr);
- texture_ptr += (psx_gpu->current_texture_page & 0xF) * 128;
- texture_ptr += ((psx_gpu->current_texture_page >> 4) * 256) * 2048;
- texture_ptr += psx_gpu->texture_window_x / 2;
- texture_ptr += (psx_gpu->texture_window_y) * 2048;
-#endif
break;
case TEXTURE_MODE_8BPP:
break;
case TEXTURE_MODE_8BPP:
-#ifdef TEXTURE_CACHE_8BPP
if(psx_gpu->current_texture_page & 0x1)
{
if(psx_gpu->current_texture_page & 0x1)
{
- texture_
ptr
=
+ texture_
base
=
psx_gpu->texture_8bpp_odd_cache[psx_gpu->current_texture_page >> 1];
}
else
{
psx_gpu->texture_8bpp_odd_cache[psx_gpu->current_texture_page >> 1];
}
else
{
- texture_
ptr
=
+ texture_
base
=
psx_gpu->texture_8bpp_even_cache[psx_gpu->current_texture_page >> 1];
}
psx_gpu->texture_8bpp_even_cache[psx_gpu->current_texture_page >> 1];
}
+ texture_ptr = texture_base;
+ texture_ptr += psx_gpu->texture_window_x & 0xF;
texture_ptr += (psx_gpu->texture_window_y & 0xF) << 4;
texture_ptr += (psx_gpu->texture_window_x >> 4) << 8;
texture_ptr += (psx_gpu->texture_window_y >> 4) << 12;
texture_ptr += (psx_gpu->texture_window_y & 0xF) << 4;
texture_ptr += (psx_gpu->texture_window_x >> 4) << 8;
texture_ptr += (psx_gpu->texture_window_y >> 4) << 12;
-#else
- texture_ptr = (u8 *)(psx_gpu->vram_ptr);
- texture_ptr += (psx_gpu->current_texture_page & 0xF) * 128;
- texture_ptr += ((psx_gpu->current_texture_page >> 4) * 256) * 2048;
- texture_ptr += psx_gpu->texture_window_x;
- texture_ptr += (psx_gpu->texture_window_y) * 2048;
-#endif
break;
case TEXTURE_MODE_16BPP:
break;
case TEXTURE_MODE_16BPP:
- texture_ptr = (u8 *)(psx_gpu->vram_ptr);
- texture_ptr += (psx_gpu->current_texture_page & 0xF) * 128;
- texture_ptr += ((psx_gpu->current_texture_page >> 4) * 256) * 2048;
+ texture_base = (u8 *)(psx_gpu->vram_ptr);
+ texture_base += (psx_gpu->current_texture_page & 0xF) * 128;
+ texture_base += ((psx_gpu->current_texture_page >> 4) * 256) * 2048;
+
+ texture_ptr = texture_base;
texture_ptr += psx_gpu->texture_window_x * 2;
texture_ptr += (psx_gpu->texture_window_y) * 2048;
break;
}
texture_ptr += psx_gpu->texture_window_x * 2;
texture_ptr += (psx_gpu->texture_window_y) * 2048;
break;
}
+ psx_gpu->texture_page_base = texture_base;
psx_gpu->texture_page_ptr = texture_ptr;
}
psx_gpu->texture_page_ptr = texture_ptr;
}
@@
-104,8
+96,7
@@
void set_texture(psx_gpu_struct *psx_gpu, u32 texture_settings)
u32 texture_mode = (texture_settings >> 7) & 0x3;
u32 render_state_base = psx_gpu->render_state_base;
u32 texture_mode = (texture_settings >> 7) & 0x3;
u32 render_state_base = psx_gpu->render_state_base;
- if(psx_gpu->current_texture_page != new_texture_page)
- flush_render_block_buffer(psx_gpu);
+ flush_render_block_buffer(psx_gpu);
render_state_base &= ~(0xF << 6);
render_state_base |= ((texture_settings >> 5) & 0xF) << 6;
render_state_base &= ~(0xF << 6);
render_state_base |= ((texture_settings >> 5) & 0xF) << 6;
@@
-162,6
+153,13
@@
void set_triangle_color(psx_gpu_struct *psx_gpu, u32 triangle_color)
#define sign_extend_12bit(value) \
(((s32)((value) << 20)) >> 20) \
#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; \
#define get_vertex_data_xy(vertex_number, offset16) \
vertexes[vertex_number].x = \
sign_extend_12bit(list_s16[offset16]) + psx_gpu->offset_x; \
@@
-219,8
+217,8
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
break;
case 0x02:
break;
case 0x02:
- render_block_fill(psx_gpu, list[0] & 0xFFFFFF, list_s16[2]
, list_s16[3]
,
- list_s16[
4] & 0x3FF, list_s16[5] & 0x3
FF);
+ render_block_fill(psx_gpu, list[0] & 0xFFFFFF, list_s16[2]
& 0x3FF
,
+ list_s16[
3] & 0x1FF, list_s16[4] & 0x3FF, list_s16[5] & 0x1
FF);
break;
case 0x20 ... 0x23:
break;
case 0x20 ... 0x23:
@@
-230,7
+228,7
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
get_vertex_data_xy(0, 2);
get_vertex_data_xy(1, 4);
get_vertex_data_xy(2, 6);
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;
}
render_triangle(psx_gpu, vertexes, current_command);
break;
}
@@
-361,7
+359,8
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
while(1)
{
xy = *list_position;
while(1)
{
xy = *list_position;
- if(xy == 0x55555555)
+
+ if((xy & 0xF000F000) == 0x50005000)
break;
vertexes[0] = vertexes[1];
break;
vertexes[0] = vertexes[1];
@@
-372,6
+371,9
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
list_position++;
num_vertexes++;
list_position++;
num_vertexes++;
+ if(list_position > list_end)
+ break;
+
render_line(psx_gpu, vertexes, current_command, list[0]);
}
render_line(psx_gpu, vertexes, current_command, list[0]);
}
@@
-415,7
+417,7
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
while(1)
{
color = list_position[0];
while(1)
{
color = list_position[0];
- if(
color == 0x55555555
)
+ if(
(color & 0xF000F000) == 0x50005000
)
break;
xy = list_position[1];
break;
xy = list_position[1];
@@
-431,6
+433,9
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
list_position += 2;
num_vertexes++;
list_position += 2;
num_vertexes++;
+ if(list_position > list_end)
+ break;
+
render_line(psx_gpu, vertexes, current_command, 0);
}
render_line(psx_gpu, vertexes, current_command, 0);
}
@@
-442,26
+447,23
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0x60 ... 0x63:
{
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;
u32 width = list_s16[4] & 0x3FF;
u32 height = list_s16[5] & 0x1FF;
- psx_gpu->primitive_color = list[0] & 0xFFFFFF;
-
render_sprite(psx_gpu, x, y, 0, 0, width, height, current_command, list[0]);
break;
}
case 0x64 ... 0x67:
{
render_sprite(psx_gpu, x, y, 0, 0, width, height, current_command, list[0]);
break;
}
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;
u32 uv = list_s16[4];
u32 width = list_s16[6] & 0x3FF;
u32 height = list_s16[7] & 0x1FF;
- psx_gpu->primitive_color = list[0] & 0xFFFFFF;
set_clut(psx_gpu, list_s16[5]);
render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, width, height,
set_clut(psx_gpu, list_s16[5]);
render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, width, height,
@@
-474,10
+476,8
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0x6A:
case 0x6B:
{
case 0x6A:
case 0x6B:
{
- s32 x = list_s16[2] + psx_gpu->offset_x;
- s32 y = list_s16[3] + psx_gpu->offset_y;
-
- psx_gpu->primitive_color = list[0] & 0xFFFFFF;
+ 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;
render_sprite(psx_gpu, x, y, 0, 0, 1, 1, current_command, list[0]);
break;
@@
-488,10
+488,8
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0x72:
case 0x73:
{
case 0x72:
case 0x73:
{
- s32 x = list_s16[2] + psx_gpu->offset_x;
- s32 y = list_s16[3] + psx_gpu->offset_y;
-
- psx_gpu->primitive_color = list[0] & 0xFFFFFF;
+ 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;
render_sprite(psx_gpu, x, y, 0, 0, 8, 8, current_command, list[0]);
break;
@@
-502,11
+500,10
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0x76:
case 0x77:
{
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];
u32 uv = list_s16[4];
- psx_gpu->primitive_color = list[0] & 0xFFFFFF;
set_clut(psx_gpu, list_s16[5]);
render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 8, 8,
set_clut(psx_gpu, list_s16[5]);
render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 8, 8,
@@
-519,10
+516,9
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0x7A:
case 0x7B:
{
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)
;
- psx_gpu->primitive_color = list[0] & 0xFFFFFF;
render_sprite(psx_gpu, x, y, 0, 0, 16, 16, current_command, list[0]);
break;
}
render_sprite(psx_gpu, x, y, 0, 0, 16, 16, current_command, list[0]);
break;
}
@@
-532,11
+528,10
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0x7E:
case 0x7F:
{
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];
u32 uv = list_s16[4];
- psx_gpu->primitive_color = list[0] & 0xFFFFFF;
set_clut(psx_gpu, list_s16[5]);
render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 16, 16,
set_clut(psx_gpu, list_s16[5]);
render_sprite(psx_gpu, x, y, uv & 0xFF, (uv >> 8) & 0xFF, 16, 16,
@@
-551,14
+546,17
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0xA0: // sys -> vid
{
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;
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;
render_block_copy(psx_gpu, (u16 *)&(list_s16[6]), load_x, load_y,
load_width, load_height, load_width);
break;