print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add missing syncs for G_PM_NPRIMITIVE (#345)

Browse Source
This commit is contained in:
Fazana
2022-03-25 17:08:09 +00:00
committed by GitHub
parent 3ac257e6fb
commit 4b9a0b89a0
18 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actors/bubble/model.inc.c
View File

@@ -27,6 +27,7 @@ const Gfx bubble_seg4_dl_0401DD60[] = {
gsSPVertex(bubble_seg4_vertex_0401CD20, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};
@@ -40,6 +41,7 @@ const Gfx bubble_seg4_dl_0401DDE0[] = {
gsSPVertex(bubble_seg4_vertex_0401CD20, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

2
actors/coin/model.inc.c
View File

@@ -123,6 +123,7 @@ const Gfx coin_seg3_dl_start[] = {
const Gfx coin_seg3_dl_end[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING),
gsSPEndDisplayList(),
@@ -503,6 +504,7 @@ const Gfx coin_seg3_sub_dl_begin[] = {
const Gfx coin_seg3_sub_dl_end[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING),
gsSPEndDisplayList(),

1
actors/leaves/model.inc.c
View File

@@ -24,6 +24,7 @@ const Gfx leaves_seg3_dl_0301CDE0[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

2
actors/mr_i_eyeball/model.inc.c
View File

@@ -36,11 +36,13 @@ const Gfx mr_i_eyeball_seg6_dl_06002080[] = {
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsDPPipeSync(),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mr_i_eyeball_seg6_texture_06001080),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

1
actors/mr_i_iris/model.inc.c
View File

@@ -40,6 +40,7 @@ const Gfx mr_i_iris_seg6_dl_06004170[] = {
gsSPVertex(mr_i_iris_seg6_vertex_06002130, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

1
actors/sand/model.inc.c
View File

@@ -23,6 +23,7 @@ const Gfx sand_seg3_dl_particle[] = {
gsSPVertex(sand_seg3_vertex_billboard_16x16, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING),
gsSPEndDisplayList(),

1
actors/sparkle/model.inc.c
View File

@@ -50,6 +50,7 @@ const Gfx sparkles_seg4_dl_0402A490[] = {
gsSPVertex(sparkles_seg4_vertex_04027450, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

1
actors/sparkle_animation/model.inc.c
View File

@@ -47,6 +47,7 @@ const Gfx sparkles_animation_seg4_dl_04035288[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsSPSetGeometryMode(G_LIGHTING),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

1
actors/transparent_star/model.inc.c
View File

@@ -46,6 +46,7 @@ const Gfx transparent_star_seg3_dl_body[] = {
gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
gsDPSetEnvColor(255, 255, 255, 120),
gsSPDisplayList(transparent_star_seg3_sub_dl_body),
gsDPPipeSync(),
gsDPSetEnvColor(255, 255, 255, 255),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),

1
actors/walk_smoke/model.inc.c
View File

@@ -56,6 +56,7 @@ const Gfx smoke_seg4_dl_040216A0[] = {
gsSPVertex(smoke_seg4_vertex_0401DE60, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING),
gsSPEndDisplayList(),

1
actors/water_splash/model.inc.c
View File

@@ -61,6 +61,7 @@ const Gfx water_splash_seg4_dl_040325C8[] = {
gsSPVertex(water_splash_seg4_vertex_0402A588, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_LIGHTING),
gsSPEndDisplayList(),

1
bin/effect.c
View File

@@ -130,6 +130,7 @@ const Gfx tiny_bubble_dl_0B006A50[] = {
// 0x0B006AB0 - 0x0B006AD8
const Gfx tiny_bubble_dl_0B006AB0[] = {
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK | G_SHADING_SMOOTH),

1
bin/segment2.c
View File

@@ -2328,6 +2328,7 @@ const Gfx dl_draw_triangle[] = {
gsSPVertex(vertex_triangle, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPSetGeometryMode(G_LIGHTING),
gsDPPipeSync(),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),

3
levels/menu/leveldata.c
View File

@@ -436,6 +436,7 @@ static const Gfx dl_menu_hand[] = {
gsSPVertex(vertex_menu_hand, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
@@ -1786,6 +1787,7 @@ const Gfx dl_menu_rgba16_wood_course_end[] = {
gsDPSetTileSize(0, 0, 0, (64 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPVertex(vertex_menu_course_upper, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsDPPipeSync(),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, texture_menu_course_lower),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
@@ -1796,6 +1798,7 @@ const Gfx dl_menu_rgba16_wood_course_end[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

2
src/game/game_init.c
View File

@@ -102,7 +102,7 @@ struct DemoInput gRecordedDemoInput = { 0 };
*/
const Gfx init_rdp[] = {
gsDPPipeSync(),
gsDPPipelineMode(G_PM_1PRIMITIVE),
gsDPPipelineMode(G_PM_NPRIMITIVE),
gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),

1
src/game/ingame_menu.c
View File

@@ -1697,6 +1697,7 @@ void render_pause_castle_menu_box(s16 x, s16 y) {
create_dl_translation_matrix(MENU_MTX_PUSH, x + 6, y - 28, 0);
create_dl_rotation_matrix(MENU_MTX_NOPUSH, DEFAULT_DIALOG_BOX_ANGLE, 0, 0, 1.0f);
gDPPipeSync(gDisplayListHead++);
gDPSetEnvColor(gDisplayListHead++, 255, 255, 255, gDialogTextAlpha);
gSPDisplayList(gDisplayListHead++, dl_draw_triangle);
gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);

3
src/game/puppyprint.c
View File

@@ -828,6 +828,7 @@ void prepare_blank_box(void) {
}
void finish_blank_box(void) {
gDPPipeSync(gDisplayListHead++);
print_set_envcolour(255, 255, 255, 255);
gSPDisplayList(gDisplayListHead++, dl_hud_img_end);
}
@@ -837,6 +838,7 @@ void finish_blank_box(void) {
// Otherwise, if there's transparency, it uses that rendermode, which is slower than using opaque rendermodes.
void render_blank_box(s32 x1, s32 y1, s32 x2, s32 y2, s32 r, s32 g, s32 b, s32 a) {
s32 cycleadd = 0;
gDPPipeSync(gDisplayListHead++);
if (((absi(x1 - x2) % 4) == 0) && (a == 255)) {
gDPSetCycleType( gDisplayListHead++, G_CYC_FILL);
gDPSetRenderMode(gDisplayListHead++, G_RM_NOOP, G_RM_NOOP);
@@ -851,7 +853,6 @@ void render_blank_box(s32 x1, s32 y1, s32 x2, s32 y2, s32 r, s32 g, s32 b, s32 a
cycleadd = 0;
}
gDPPipeSync(gDisplayListHead++);
gDPSetFillColor(gDisplayListHead++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
print_set_envcolour(r, g, b, a);
gDPFillRectangle(gDisplayListHead++, x1, y1, x2 - cycleadd, y2 - cycleadd);

2
src/goddard/renderer.c
View File

@@ -329,6 +329,7 @@ static Gfx gd_dl_star_common[] = {
gsSPVertex(gd_vertex_star, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_INTER, G_RM_NOOP2),
gsSPEndDisplayList(),
@@ -516,6 +517,7 @@ static Gfx gd_dl_sparkle[] = {
gsSPVertex(gd_vertex_sparkle, 4, 0),
gsSP2Triangles(0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_INTER, G_RM_NOOP2),
gsSPEndDisplayList(),