diff --git a/code/duffle/gp.h b/code/duffle/gp.h index a509311..19ccbec 100644 --- a/code/duffle/gp.h +++ b/code/duffle/gp.h @@ -74,6 +74,7 @@ typedef def_enum(U32, gp_Commands) { #define gp_SetArea_BottomRight (gcmd_SetDrawArea_BotRight << gcmd_offset) typedef def_struct(RGB8) { BYTE r; BYTE g; BYTE b; }; +#define rgba8(r, g, b) (RGB8){ r, g, b } typedef BYTE gp_Pixel16[1]; typedef BYTE gp_Pixel24[3]; @@ -85,6 +86,7 @@ typedef BYTE gp_Pixel24[3]; typedef def_struct(gp_Vec2) { U16 y; U16 x; }; + #if 1 void gp_screen_init(void) __asm__("gp_screen_init_asm"); #else diff --git a/code/duffle/math.h b/code/duffle/math.h index 3f2880e..e9b887e 100644 --- a/code/duffle/math.h +++ b/code/duffle/math.h @@ -23,3 +23,5 @@ typedef def_struct(Range_2S32) { Vec_2S32 p0; Vec_2S32 p1; }; typedef def_struct(Rect_S16) { S16 x; S16 y; S16 width; S16 height; }; typedef def_struct(Rect_S32) { S32 x; S32 y; S32 width; S32 height; }; + +#define vec_2s16(x, y) (Vec_2S16){ x, y } diff --git a/code/graphics_hello_psyq/hello_gpu.c b/code/graphics_hello_psyq/hello_gpu.c index 2421485..c29b39d 100644 --- a/code/graphics_hello_psyq/hello_gpu.c +++ b/code/graphics_hello_psyq/hello_gpu.c @@ -1,8 +1,8 @@ #include "stdio.h" #include #include "assert.h" -#include "libgpu.h" -#include "libetc.h" +// #include "libgpu.h" +// #include "libetc.h" #include "duffle/dsl.h" #include "duffle/memory.h" @@ -39,6 +39,13 @@ typedef def_struct(QuadFlat) { A4_Vec_2S16 points; }; }; +typedef def_struct(QuadGouraud) { + U32 tag; RGB8 c0; BYTE code; + Vec_2S16 p0; RGB8 c1; BYTE pad1; + Vec_2S16 p1; RGB8 c2; BYTE pad2; + Vec_2S16 p2; RGB8 c3; BYTE pad3; + Vec_2S16 p3; +}; typedef def_struct(Tile) { U32 tag; RGB8 color; @@ -47,7 +54,7 @@ typedef def_struct(Tile) { }; #define PrimitiveBuff_Len 2048 -#define OrderingTbl_Len 16 +#define OrderingTbl_Len 32 typedef U32 OrderingTable_Buffer[OrderingTbl_Len]; typedef def_farray(OrderingTable_Buffer, 2); @@ -80,47 +87,44 @@ BYTE* prim__alloc(SSIZE type_width, dbg_args(Str8 type_name)) { void gp_screen_init_c11(DoubleBuffer* screen_buf, S16* active_buf_id) { - ResetGraph(0); - SetDispMask(1); // gp_DisplayEnabled + reset_graph(0); + set_display_enabled(1); // gp_DisplayEnabled + + // Set the current initial buffer + * active_buf_id = 0; // Just setting env data, not interacting with console hw. // First buffer area - SetDefDispEnv((DISPENV*)& screen_buf->display[0], 0, 0, ScreenRes_X, ScreenRes_Y); - SetDefDrawEnv((DRAWENV*)& screen_buf->draw [0], 0, ScreenRes_Y, ScreenRes_X, ScreenRes_Y); + displayenv_init(& screen_buf->display[0], 0, 0, ScreenRes_X, ScreenRes_Y); + drawenv_init (& screen_buf->draw [0], 0, ScreenRes_Y, ScreenRes_X, ScreenRes_Y); // Second buffer area - SetDefDispEnv((DISPENV*)& screen_buf->display[1], 0, ScreenRes_Y, ScreenRes_X, ScreenRes_Y); - SetDefDrawEnv((DRAWENV*)& screen_buf->draw [1], 0, 0, ScreenRes_X, ScreenRes_Y); + displayenv_init(& screen_buf->display[1], 0, ScreenRes_Y, ScreenRes_X, ScreenRes_Y); + drawenv_init (& screen_buf->draw [1], 0, 0, ScreenRes_X, ScreenRes_Y); // Set the back/drawing buffer screen_buf->draw[0].enable_auto_clear = true; screen_buf->draw[1].enable_auto_clear = true; // Set the background clear color - screen_buf->draw[0].initial_bg_color = (RGB8){ .r = 63, .g = 0, .b = 127 }; - screen_buf->draw[1].initial_bg_color = (RGB8){ .r = 127, .g = 63, .b = 0 }; - // Set the current initial buffer - * active_buf_id = 0; - - PutDispEnv((DISPENV*)& screen_buf->display[* active_buf_id]); - - DRAWENV* env = (DRAWENV*)& screen_buf->draw[* active_buf_id]; - PutDrawEnv(env); + screen_buf->draw[0].initial_bg_color = rgba8( .r = 63, .g = 0, .b = 127 ); + screen_buf->draw[1].initial_bg_color = rgba8( .r = 127, .g = 63, .b = 0 ); + displayenv_put(& screen_buf->display[* active_buf_id]); + drawenv_put (& screen_buf->draw [* active_buf_id]); // Initialize and setup the GTE geometry offsets - InitGeom(); - - SetGeomOffset(ScreenRes_CenterX, ScreenRes_CenterY); - SetGeomScreen(ScreenRes_CenterX); + geom_init(); + geom_set_offset(ScreenRes_CenterX, ScreenRes_CenterY); + geom_set_screen(ScreenZ); } void gp_display_frame(DoubleBuffer* screen_buf, S16* active_buf_id, U32* ordering_buf, PrimitiveArena* pa) { - DrawSync(0); - VSync(0); - PutDispEnv((DISPENV*)& screen_buf->display[* active_buf_id]); - PutDrawEnv((DRAWENV*)& screen_buf->draw [* active_buf_id]); + draw_sync(0); + vsync(0); + displayenv_put(& screen_buf->display[* active_buf_id]); + drawenv_put (& screen_buf->draw [* active_buf_id]); { - DrawOTag((u_long*) (ordering_buf + OrderingTbl_Len - 1)); + draw_orderingtbl(ordering_buf + OrderingTbl_Len - 1); + pa->used = 0; } * active_buf_id = ! (* active_buf_id); // Swap current buffer - pa->used = 0; } void render(void) { @@ -128,19 +132,37 @@ void render(void) { void update(PrimitiveArena* pa, U32* ordering_buf) { - ClearOTagR((u_long*) ordering_buf, OrderingTbl_Len); + orderingtbl_clear_reverse(ordering_buf, OrderingTbl_Len); - Tile* tile = prim_alloc(Tile); setTile((TILE*) tile); + Tile* tile = prim_alloc(Tile); set_tile(tile); tile->rect = (Rect_S16){ 82, 32, 64, 64 }; tile->color = (RGB8){ 0, 255, 0}; - addPrim(ordering_buf, tile); + orderingtbl_add_primitive(ordering_buf, tile); - TriFlat* tri = prim_alloc(TriFlat); setPolyF3(tri); - tri->p0 = (Vec_2S16){ 64, 100}; - tri->p1 = (Vec_2S16){200, 150}; - tri->p2 = (Vec_2S16){ 50, 220}; - tri->color = (RGB8){ 255, 0, 255 }; - addPrim(ordering_buf, tri); + TriFlat* tri = prim_alloc(TriFlat); set_tri_flat(tri); + tri->p0 = vec_2s16(64, 100); + tri->p1 = vec_2s16(200, 150); + tri->p2 = vec_2s16(50, 220); + tri->color = rgba8(255, 0, 255); + orderingtbl_add_primitive(ordering_buf, tri); + + QuadGouraud* quad = prim_alloc(QuadGouraud); set_quad_gouraud(quad); + quad->p0 = vec_2s16(140, 50); + quad->p1 = vec_2s16(200, 40); + quad->p2 = vec_2s16(170, 120); + quad->p3 = vec_2s16(220, 80); + quad->c0 = rgba8(255, 0, 0); + quad->c1 = rgba8(0, 255, 0); + quad->c3 = rgba8(0, 0, 255); + orderingtbl_add_primitive(ordering_buf, quad); + + QuadFlat* quadf = prim_alloc(QuadFlat); set_quad_flat(quadf); + quadf->p0 = vec_2s16(140 + 15, 50 + 9); + quadf->p1 = vec_2s16(200 + 15, 40 + 9); + quadf->p2 = vec_2s16(170 + 15, 120 + 9); + quadf->p3 = vec_2s16(220 + 15, 80 + 9); + quadf->color = rgba8(22, 22, 22); + orderingtbl_add_primitive(ordering_buf, quadf); } int main(void) diff --git a/code/graphics_hello_psyq/hello_gpu.h b/code/graphics_hello_psyq/hello_gpu.h index 55bffe0..95e938e 100644 --- a/code/graphics_hello_psyq/hello_gpu.h +++ b/code/graphics_hello_psyq/hello_gpu.h @@ -34,5 +34,75 @@ typedef def_struct(DoubleBuffer) { #define ScreenRes_X 320 #define ScreenRes_Y 240 +#define ScreenZ 400 #define ScreenRes_CenterX (ScreenRes_X >> 1) #define ScreenRes_CenterY (ScreenRes_Y >> 1) + + +DisplayEnv* displayenv_init(DisplayEnv* env, S32 x, S32 y, S32 w, S32 h) __asm__("SetDefDispEnv"); +DrawEnv* drawenv_init (DrawEnv* env, S32 x, S32 y, S32 w, S32 h) __asm__("SetDefDrawEnv"); + +DisplayEnv* displayenv_put(DisplayEnv* env) __asm__("PutDispEnv"); +DrawEnv* drawenv_put (DrawEnv* env) __asm__("PutDrawEnv"); + +U32 geom_init(void) __asm__("InitGeom"); +void geom_set_offset(U32 x, U32 y) __asm__("SetGeomOffset"); +void geom_set_screen(U32 h) __asm__("SetGeomScreen"); + +U32* orderingtbl_clear_reverse(U32* ot, SSIZE len) __asm__("ClearOTagR"); + +U32 reset_graph(U32 mode) __asm__("ResetGraph"); +void set_display_enabled(U32 mask) __asm__("SetDispMask"); + +U32 draw_sync(U32 mode) __asm__("DrawSync"); +U32 vsync(U32 mode) __asm("VSync"); + +void draw_orderingtbl(U32* buf) __asm__("DrawOTag"); + +typedef def_struct(PolyTag) { + U32 addr: 24; + U32 len: 8; + RGB8 color; + BYTE code; +}; + +/* + * Primitive Handling Macros + */ +#define set_len( p, _len) (((PolyTag*)(p))->len = (BYTE)(_len)) +#define set_addr(p, _addr) (((PolyTag*)(p))->addr = (U32 )(_addr)) +#define set_code(p, _code) (((PolyTag*)(p))->code = (BYTE)(_code)) + +#define get_len(p) (BYTE)(((PolyTag*)(p))->len) +#define get_code(p) (BYTE)(((PolyTag*)(p))->code) +#define get_addr(p) (U32 )(((PolyTag*)(p))->addr) + +#define orderingtbl_add_primitive(ot, p) set_addr(p, get_addr(ot)), set_addr(ot, p) +#define orderingtbl_add_primitives(ot, p0, p1) set_addr(p1, get_addr(ot)), set_addr(ot, p0) + +/* Primitive Lentgh Code */ +/*-------------------------------------------------------------------- */ +/* */ +#define set_tri_flat(p) set_len(p, 4), set_code(p, 0x20) +// #define setPolyFT3(p) set_len(p, 7), set_code(p, 0x24) +// #define setPolyG3(p) set_len(p, 6), set_code(p, 0x30) +// #define setPolyGT3(p) set_len(p, 9), set_code(p, 0x34) +#define set_quad_flat(p) set_len(p, 5), set_code(p, 0x28) +// #define setPolyFT4(p) set_len(p, 9), set_code(p, 0x2c) +#define set_quad_gouraud(p) set_len(p, 8), set_code(p, 0x38) +// #define setPolyGT4(p) set_len(p, 12), set_code(p, 0x3c) + +// #define setSprt8(p) setlen(p, 3), setcode(p, 0x74) +// #define setSprt16(p) setlen(p, 3), setcode(p, 0x7c) +// #define setSprt(p) setlen(p, 4), setcode(p, 0x64) + +// #define setTile1(p) set_len(p, 2), set_code(p, 0x68) +// #define setTile8(p) set_len(p, 2), set_code(p, 0x70) +// #define setTile16(p) set_len(p, 2), set_code(p, 0x78) +#define set_tile(p) set_len(p, 3), set_code(p, 0x60) +// #define setLineF2(p) set_len(p, 3), set_code(p, 0x40) +// #define setLineG2(p) set_len(p, 4), set_code(p, 0x50) +// #define setLineF3(p) set_len(p, 5), set_code(p, 0x48),(p)->pad = 0x55555555 +// #define setLineG3(p) set_len(p, 7), set_code(p, 0x58),(p)->pad = 0x55555555, (p)->p2 = 0 +// #define setLineF4(p) set_len(p, 6), set_code(p, 0x4c),(p)->pad = 0x55555555 +// #define setLineG4(p) set_len(p, 9), set_code(p, 0x5c),(p)->pad = 0x55555555, (p)->p2 = 0, (p)->p3 = 0