notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b0163e0
)
gpu_neon: reserved bpp is 16bpp, not 4bpp
author
notaz
<notasas@gmail.com>
Mon, 31 Jan 2022 00:07:25 +0000
(
02:07
+0200)
committer
notaz
<notasas@gmail.com>
Tue, 1 Feb 2022 01:01:29 +0000
(
03:01
+0200)
plugins/gpu_neon/psx_gpu/psx_gpu.c
patch
|
blob
|
blame
|
history
plugins/gpu_neon/psx_gpu/psx_gpu_4x.c
patch
|
blob
|
blame
|
history
plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
patch
|
blob
|
blame
|
history
diff --git
a/plugins/gpu_neon/psx_gpu/psx_gpu.c
b/plugins/gpu_neon/psx_gpu/psx_gpu.c
index
e113f06
..
a5e7aa1
100644
(file)
--- a/
plugins/gpu_neon/psx_gpu/psx_gpu.c
+++ b/
plugins/gpu_neon/psx_gpu/psx_gpu.c
@@
-2885,7
+2885,7
@@
blend_blocks_builder(textured, unblended, on);
render_blocks_switch_block_texture_mode(4bpp), \
render_blocks_switch_block_texture_mode(8bpp), \
render_blocks_switch_block_texture_mode(16bpp), \
render_blocks_switch_block_texture_mode(4bpp), \
render_blocks_switch_block_texture_mode(8bpp), \
render_blocks_switch_block_texture_mode(16bpp), \
- render_blocks_switch_block_texture_mode(
4bpp)
\
+ render_blocks_switch_block_texture_mode(
16bpp)
\
render_block_handler_struct render_triangle_block_handlers[] =
render_block_handler_struct render_triangle_block_handlers[] =
@@
-4251,7
+4251,7
@@
void setup_sprite_untextured_simple(psx_gpu_struct *psx_gpu, s32 x, s32 y,
render_sprite_blocks_switch_block_texture_mode(4bpp), \
render_sprite_blocks_switch_block_texture_mode(8bpp), \
render_sprite_blocks_switch_block_texture_mode(16bpp), \
render_sprite_blocks_switch_block_texture_mode(4bpp), \
render_sprite_blocks_switch_block_texture_mode(8bpp), \
render_sprite_blocks_switch_block_texture_mode(16bpp), \
- render_sprite_blocks_switch_block_texture_mode(
4bpp)
\
+ render_sprite_blocks_switch_block_texture_mode(
16bpp)
\
render_block_handler_struct render_sprite_block_handlers[] =
render_block_handler_struct render_sprite_block_handlers[] =
diff --git
a/plugins/gpu_neon/psx_gpu/psx_gpu_4x.c
b/plugins/gpu_neon/psx_gpu/psx_gpu_4x.c
index
83c6680
..
85e972c
100644
(file)
--- a/
plugins/gpu_neon/psx_gpu/psx_gpu_4x.c
+++ b/
plugins/gpu_neon/psx_gpu/psx_gpu_4x.c
@@
-291,7
+291,7
@@
static void setup_sprite_untextured_4x(psx_gpu_struct *psx_gpu, s32 x, s32 y,
render_sprite_blocks_switch_block_texture_mode_4x(4bpp), \
\r
render_sprite_blocks_switch_block_texture_mode_4x(8bpp), \
\r
render_sprite_blocks_switch_block_texture_mode_4x(16bpp), \
\r
render_sprite_blocks_switch_block_texture_mode_4x(4bpp), \
\r
render_sprite_blocks_switch_block_texture_mode_4x(8bpp), \
\r
render_sprite_blocks_switch_block_texture_mode_4x(16bpp), \
\r
- render_sprite_blocks_switch_block_texture_mode_4x(
4bpp)
\
\r
+ render_sprite_blocks_switch_block_texture_mode_4x(
16bpp)
\
\r
\r
\r
render_block_handler_struct render_sprite_block_handlers_4x[] =
\r
\r
\r
render_block_handler_struct render_sprite_block_handlers_4x[] =
\r
diff --git
a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
index
87d8c38
..
5ef5f20
100644
(file)
--- 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)
{
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];
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;
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;
case TEXTURE_MODE_16BPP:
texture_base = (u8 *)(psx_gpu->vram_ptr);
texture_base += (psx_gpu->current_texture_page & 0xF) * 128;