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: fix sprite coordinates
[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
fc9f3fb
..
dc7a6c1
100644
(file)
--- a/
plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
+++ b/
plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
@@
-96,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;
@@
-434,8
+433,8
@@
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_12bit(list_s16[2])
+ psx_gpu->offset_x;
+ u32 y =
sign_extend_12bit(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;
@@
-445,8
+444,8
@@
void gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size)
case 0x64 ... 0x67:
{
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_12bit(list_s16[2])
+ psx_gpu->offset_x;
+ u32 y =
sign_extend_12bit(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;
@@
-463,8
+462,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;
+ s32 x =
sign_extend_12bit(list_s16[2])
+ psx_gpu->offset_x;
+ s32 y =
sign_extend_12bit(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;
@@
-475,8
+474,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;
+ s32 x =
sign_extend_12bit(list_s16[2])
+ psx_gpu->offset_x;
+ s32 y =
sign_extend_12bit(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;
@@
-487,8
+486,8
@@
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_12bit(list_s16[2])
+ psx_gpu->offset_x;
+ s32 y =
sign_extend_12bit(list_s16[3])
+ psx_gpu->offset_y;
u32 uv = list_s16[4];
set_clut(psx_gpu, list_s16[5]);
u32 uv = list_s16[4];
set_clut(psx_gpu, list_s16[5]);
@@
-503,8
+502,8
@@
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_12bit(list_s16[2])
+ psx_gpu->offset_x;
+ s32 y =
sign_extend_12bit(list_s16[3])
+ psx_gpu->offset_y;
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;
@@
-515,8
+514,8
@@
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_12bit(list_s16[2])
+ psx_gpu->offset_x;
+ s32 y =
sign_extend_12bit(list_s16[3])
+ psx_gpu->offset_y;
u32 uv = list_s16[4];
set_clut(psx_gpu, list_s16[5]);
u32 uv = list_s16[4];
set_clut(psx_gpu, list_s16[5]);