AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 04:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP on setting RDP state via own RSP overlay

Browse Source
This commit is contained in:
UnknownShadow200 2025-05-01 22:13:58 +10:00
parent c6fd588088
commit 243af150a8
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/n64/gpu.c
View File

@ -36,6 +36,8 @@ enum {
GPU_CMD_DRAW_TRI = 0x4, GPU_CMD_DRAW_TRI = 0x4,
GPU_CMD_UPLOAD_VTX = 0x5, GPU_CMD_UPLOAD_VTX = 0x5,
GPU_CMD_MATRIX_LOAD = 0x6, GPU_CMD_MATRIX_LOAD = 0x6,
GPU_CMD_PUSH_RDP = 0x7,
}; };
typedef struct { typedef struct {
@ -88,6 +90,15 @@ static inline void gpu_draw_triangle(int i0, int i1, int i2)
); );
} }
#define RDP_CMD_SYNC_PIPE 0xE7000000
#define RDP_CMD_SET_BLEND_COLOR 0xF9000000
__attribute__((always_inline))
static inline void gpu_push_rdp(uint32_t a1, uint64_t a2)
{
rdpq_write(2, gpup_id, GPU_CMD_PUSH_RDP, 0, a1, a2);
}
static float gpu_vp_scale[3]; static float gpu_vp_scale[3];
static float gpu_vp_offset[3]; static float gpu_vp_offset[3];

30
misc/n64/rsp_gpu.S
View File

@ -12,6 +12,8 @@
RSPQ_DefineCommand GPUCmd_DrawTriangle, 8 # 0x4 RSPQ_DefineCommand GPUCmd_DrawTriangle, 8 # 0x4
RSPQ_DefineCommand GPUCmd_UploadVertex, 20 # 0x5 RSPQ_DefineCommand GPUCmd_UploadVertex, 20 # 0x5
RSPQ_DefineCommand GPUCmd_MatrixLoad, 68 # 0x6 RSPQ_DefineCommand GPUCmd_MatrixLoad, 68 # 0x6
RSPQ_DefineCommand GPUCmd_PushRDP, 12 # 0x7
RSPQ_EndOverlayHeader RSPQ_EndOverlayHeader
.align 4 .align 4
@ -85,6 +87,16 @@ GPUCmd_SetLong:
.endfunc .endfunc
.func GPUCmd_PushRDP
GPUCmd_PushRDP:
# RDP command is expected in a0 and a1
move a0, a1
move a1, a2
jal_and_j RDPQ_Write8, RDPQ_Finalize
.endfunc
######################################## ########################################
# GPUCmd_UploadVertex # GPUCmd_UploadVertex
# #
@ -94,7 +106,6 @@ GPUCmd_SetLong:
# * 0x08 (a2): object space Z, W (16-bit) # * 0x08 (a2): object space Z, W (16-bit)
# * 0x0C (a3): RGBA (8-bit each one) # * 0x0C (a3): RGBA (8-bit each one)
# * 0x10: S, T (16-bit) # * 0x10: S, T (16-bit)
# * 0x14: normal X, Y, Z (8-bit each one) (LSB must be 0)
# #
######################################## ########################################
.align 3 .align 3
@ -102,7 +113,7 @@ GPUCmd_SetLong:
GPUCmd_UploadVertex: GPUCmd_UploadVertex:
#define vtx a0 #define vtx a0
#define mtx_ptr s0 #define mtx_ptr s0
#define cmd_ptr s4 #define src_ptr s4
#define v___ $v01 #define v___ $v01
@ -126,12 +137,11 @@ GPUCmd_UploadVertex:
#define z e2 #define z e2
#define w e3 #define w e3
addi cmd_ptr, rspq_dmem_buf_ptr, %lo(RSPQ_DMEM_BUFFER) + 4 addi src_ptr, rspq_dmem_buf_ptr, %lo(RSPQ_DMEM_BUFFER) - 16
sub cmd_ptr, rspq_cmd_size
ldv vpos, 0, cmd_ptr # Load X, Y, Z, W ldv vpos, 0, src_ptr # Load X, Y, Z, W
llv vcol, 8, cmd_ptr # Load RGBA llv vcol, 8, src_ptr # Load RGBA
llv vtex, 12, cmd_ptr # Load U, V llv vtex, 12, src_ptr # Load U, V
addi vtx, %lo(VERTEX_CACHE) addi vtx, %lo(VERTEX_CACHE)
slv vcol, SCREEN_VTX_RGBA, vtx slv vcol, SCREEN_VTX_RGBA, vtx
@ -180,12 +190,8 @@ GPUCmd_UploadVertex:
jr ra jr ra
sb t0, PRIM_VTX_TRCODE(vtx) sb t0, PRIM_VTX_TRCODE(vtx)
#undef cmd_ptr #undef src_ptr
#undef vtx #undef vtx
#undef in_xy
#undef in_zw
#undef in_rgba
#undef vtx_id
#undef x #undef x
#undef y #undef y

8
src/Graphics_N64.c
View File

@ -27,10 +27,12 @@ void Gfx_Create(void) {
__rdpq_mode_change_som(SOM_ZMODE_MASK, SOM_ZMODE_OPAQUE); __rdpq_mode_change_som(SOM_ZMODE_MASK, SOM_ZMODE_OPAQUE);
rdpq_mode_dithering(DITHER_SQUARE_SQUARE); rdpq_mode_dithering(DITHER_SQUARE_SQUARE);
// Set alpha compare threshold
rdpq_set_blend_color(RGBA32(0,0,0, 127));
gpu_init(); gpu_init();
// Set alpha compare threshold
gpu_push_rdp(RDP_CMD_SYNC_PIPE, 0);
gpu_push_rdp(RDP_CMD_SET_BLEND_COLOR, (0 << 24) | (0 << 16) | (0 << 8) | 127);
zbuffer = surface_alloc(FMT_RGBA16, display_get_width(), display_get_height()); zbuffer = surface_alloc(FMT_RGBA16, display_get_width(), display_get_height());
Gfx.MaxTexWidth = 256; Gfx.MaxTexWidth = 256;