From 86f7e0deedf0455bbfd1329596191b5e9aa9b468 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Thu, 10 Apr 2025 20:06:50 +0200 Subject: [PATCH] Stop using magic numbers for sceGuSync --- src/gu/pspgu.h | 2 +- src/samples/gu/beginobject/beginobject.c | 4 ++-- src/samples/gu/blend/blend.c | 4 ++-- src/samples/gu/blit/blit.c | 4 ++-- src/samples/gu/celshading/celshading.c | 4 ++-- src/samples/gu/clut/clut.c | 4 ++-- src/samples/gu/copy/copy.c | 4 ++-- src/samples/gu/cube/cube.c | 4 ++-- src/samples/gu/envmap/envmap.c | 4 ++-- src/samples/gu/integerdrawing/integerdrawing.c | 4 ++-- src/samples/gu/lights/lights.c | 4 ++-- src/samples/gu/lines/lines.c | 4 ++-- src/samples/gu/logic/logic.c | 4 ++-- src/samples/gu/mipmapping/mipmapping.c | 4 ++-- src/samples/gu/morph/morph.c | 4 ++-- src/samples/gu/morphskin/morphskin.c | 4 ++-- src/samples/gu/ortho/ortho.c | 4 ++-- src/samples/gu/reflection/reflection.c | 4 ++-- src/samples/gu/rendertarget/rendertarget.c | 4 ++-- src/samples/gu/shadowprojection/shadowprojection.c | 6 +++--- src/samples/gu/signals/signals.c | 8 ++++---- src/samples/gu/skinning/skinning.c | 4 ++-- src/samples/gu/speed/speed.c | 4 ++-- src/samples/gu/spharm/cube.c | 6 +++--- src/samples/gu/splinesurface/splinesurface.c | 4 ++-- src/samples/gu/sprite/sprite.c | 4 ++-- src/samples/gu/text/main.c | 4 ++-- src/samples/gu/timing/timing.c | 4 ++-- src/samples/gu/vertex/vertex.c | 6 +++--- src/samples/gu/zbufferfog/zbufferfog.c | 4 ++-- src/samples/savedata/utility/main.c | 4 ++-- src/samples/utility/gamesharing/main.c | 4 ++-- src/samples/utility/htmlviewer/main.c | 4 ++-- src/samples/utility/msgdialog/main.c | 4 ++-- src/samples/utility/netdialog/main.c | 4 ++-- src/samples/utility/osk/main.c | 4 ++-- 36 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/gu/pspgu.h b/src/gu/pspgu.h index 637af41a..d7c1eb70 100644 --- a/src/gu/pspgu.h +++ b/src/gu/pspgu.h @@ -580,7 +580,7 @@ void* sceGuSwapBuffers(void); * * @par Example: Wait for the currently executing display list * @code - * sceGuSync(0,0); + * sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); * @endcode * * Available what are: diff --git a/src/samples/gu/beginobject/beginobject.c b/src/samples/gu/beginobject/beginobject.c index a1187a12..27d4bc8b 100644 --- a/src/samples/gu/beginobject/beginobject.c +++ b/src/samples/gu/beginobject/beginobject.c @@ -141,7 +141,7 @@ int main(int argc, char* argv[]) { sceGuEnable(GU_CLIP_PLANES); sceGuSetCallback(GU_CALLBACK_SIGNAL, gucallback); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -217,7 +217,7 @@ int main(int argc, char* argv[]) { } sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); pspDebugScreenSetOffset((int)buffer); pspDebugScreenSetXY(0,0); diff --git a/src/samples/gu/blend/blend.c b/src/samples/gu/blend/blend.c index 9153fcc3..bcb6067d 100644 --- a/src/samples/gu/blend/blend.c +++ b/src/samples/gu/blend/blend.c @@ -111,7 +111,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_BLEND); sceGuClear(GU_COLOR_BUFFER_BIT|GU_DEPTH_BUFFER_BIT); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -180,7 +180,7 @@ int main(int argc, char* argv[]) // wait for next frame sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/blit/blit.c b/src/samples/gu/blit/blit.c index 160930a7..d1883831 100644 --- a/src/samples/gu/blit/blit.c +++ b/src/samples/gu/blit/blit.c @@ -149,7 +149,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_TEXTURE_2D); sceGuClear(GU_COLOR_BUFFER_BIT|GU_DEPTH_BUFFER_BIT); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(1); @@ -214,7 +214,7 @@ int main(int argc, char* argv[]) simpleBlit(0,0,SCR_WIDTH,SCR_HEIGHT,0,0); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); float curr_fps = 1.0f / curr_ms; diff --git a/src/samples/gu/celshading/celshading.c b/src/samples/gu/celshading/celshading.c index f28188ac..3731b66d 100644 --- a/src/samples/gu/celshading/celshading.c +++ b/src/samples/gu/celshading/celshading.c @@ -132,7 +132,7 @@ int main(int argc, char* argv[]) { sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -207,7 +207,7 @@ int main(int argc, char* argv[]) { } sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceCtrlReadBufferPositive(&pad, 1); diff --git a/src/samples/gu/clut/clut.c b/src/samples/gu/clut/clut.c index e0b7476a..25d5693a 100644 --- a/src/samples/gu/clut/clut.c +++ b/src/samples/gu/clut/clut.c @@ -94,7 +94,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_TEXTURE_2D); sceGuClear(GU_COLOR_BUFFER_BIT|GU_DEPTH_BUFFER_BIT); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -146,7 +146,7 @@ int main(int argc, char* argv[]) // wait for next frame sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/copy/copy.c b/src/samples/gu/copy/copy.c index 2f807722..12bc469e 100644 --- a/src/samples/gu/copy/copy.c +++ b/src/samples/gu/copy/copy.c @@ -63,7 +63,7 @@ int main(int argc, char* argv[]) sceGuFrontFace(GU_CW); sceGuClear(GU_COLOR_BUFFER_BIT|GU_DEPTH_BUFFER_BIT); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(1); @@ -98,7 +98,7 @@ int main(int argc, char* argv[]) sceGuTexSync(); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); float curr_fps = 1.0f / curr_ms; diff --git a/src/samples/gu/cube/cube.c b/src/samples/gu/cube/cube.c index 787b57b3..7f59880d 100644 --- a/src/samples/gu/cube/cube.c +++ b/src/samples/gu/cube/cube.c @@ -116,7 +116,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_TEXTURE_2D); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -169,7 +169,7 @@ int main(int argc, char* argv[]) sceGumDrawArray(GU_TRIANGLES,GU_TEXTURE_32BITF|GU_COLOR_8888|GU_VERTEX_32BITF|GU_TRANSFORM_3D,12*3,0,vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/envmap/envmap.c b/src/samples/gu/envmap/envmap.c index b431e347..2caf7e47 100644 --- a/src/samples/gu/envmap/envmap.c +++ b/src/samples/gu/envmap/envmap.c @@ -95,7 +95,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_LIGHTING); sceGuEnable(GU_LIGHT0); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -196,7 +196,7 @@ int main(int argc, char* argv[]) oldButtons = pad.Buttons; sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); // sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/integerdrawing/integerdrawing.c b/src/samples/gu/integerdrawing/integerdrawing.c index c0ba81bd..373c72f4 100644 --- a/src/samples/gu/integerdrawing/integerdrawing.c +++ b/src/samples/gu/integerdrawing/integerdrawing.c @@ -215,7 +215,7 @@ int main(int argc, char* argv[]) { sceGuAmbientColor(0xffffffff); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -269,7 +269,7 @@ int main(int argc, char* argv[]) { old = pad.Buttons; sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); pspDebugScreenSetOffset((int)buffer); pspDebugScreenSetXY(0, 0); diff --git a/src/samples/gu/lights/lights.c b/src/samples/gu/lights/lights.c index ad29b38e..111437cc 100644 --- a/src/samples/gu/lights/lights.c +++ b/src/samples/gu/lights/lights.c @@ -98,7 +98,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_LIGHT2); sceGuEnable(GU_LIGHT3); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -171,7 +171,7 @@ int main(int argc, char* argv[]) sceGumDrawArray(GU_TRIANGLES,NP_VERTEX_FORMAT|GU_INDEX_16BIT|GU_TRANSFORM_3D,sizeof(torus_indices)/sizeof(unsigned short),torus_indices,torus_vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/lines/lines.c b/src/samples/gu/lines/lines.c index a7762bae..8eddbad5 100644 --- a/src/samples/gu/lines/lines.c +++ b/src/samples/gu/lines/lines.c @@ -103,7 +103,7 @@ int main(int argc, char* argv[]) sceGuScissor(0,0,SCR_WIDTH,SCR_HEIGHT); sceGuEnable(GU_SCISSOR_TEST); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -197,7 +197,7 @@ int main(int argc, char* argv[]) // wait for next frame sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/logic/logic.c b/src/samples/gu/logic/logic.c index 248fcf0e..2675c5e3 100644 --- a/src/samples/gu/logic/logic.c +++ b/src/samples/gu/logic/logic.c @@ -81,7 +81,7 @@ int main(int argc, char* argv[]) sceGuScissor(0,0,SCR_WIDTH,SCR_HEIGHT); sceGuEnable(GU_SCISSOR_TEST); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -140,7 +140,7 @@ int main(int argc, char* argv[]) sceGuDisable(GU_COLOR_LOGIC_OP); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); gettimeofday(&tv,0); if ((tv.tv_sec-base_time.tv_sec) > TIME_SLICE) diff --git a/src/samples/gu/mipmapping/mipmapping.c b/src/samples/gu/mipmapping/mipmapping.c index bc791297..620b1138 100644 --- a/src/samples/gu/mipmapping/mipmapping.c +++ b/src/samples/gu/mipmapping/mipmapping.c @@ -74,7 +74,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_TEXTURE_2D); //sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -136,7 +136,7 @@ int main(int argc, char* argv[]) sceGumDrawArray(GU_TRIANGLES,GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_3D,2*3,0,vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/morph/morph.c b/src/samples/gu/morph/morph.c index ec59bdb8..9bc4090f 100644 --- a/src/samples/gu/morph/morph.c +++ b/src/samples/gu/morph/morph.c @@ -127,7 +127,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_LIGHTING); sceGuEnable(GU_LIGHT0); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -182,7 +182,7 @@ int main(int argc, char* argv[]) sceGumDrawArray(GU_TRIANGLES,GU_COLOR_8888|GU_NORMAL_32BITF|GU_VERTEX_32BITF|GU_VERTICES(2)|GU_INDEX_16BIT|GU_TRANSFORM_3D,sizeof(indices)/sizeof(unsigned short),indices,vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/morphskin/morphskin.c b/src/samples/gu/morphskin/morphskin.c index ba6a8245..a8db0c33 100644 --- a/src/samples/gu/morphskin/morphskin.c +++ b/src/samples/gu/morphskin/morphskin.c @@ -114,7 +114,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_LIGHT0); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -204,7 +204,7 @@ int main(int argc, char* argv[]) } sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/ortho/ortho.c b/src/samples/gu/ortho/ortho.c index 0334d286..3eef834a 100644 --- a/src/samples/gu/ortho/ortho.c +++ b/src/samples/gu/ortho/ortho.c @@ -66,7 +66,7 @@ int main(int argc, char* argv[]) sceGuShadeModel(GU_SMOOTH); sceGuDisable(GU_TEXTURE_2D); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(1); @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) sceGumDrawArray(GU_TRIANGLES,GU_COLOR_8888|GU_VERTEX_32BITF|GU_TRANSFORM_3D,1*3,0,vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); pspDebugScreenSetOffset((int)fbp0); pspDebugScreenSetXY(0,0); diff --git a/src/samples/gu/reflection/reflection.c b/src/samples/gu/reflection/reflection.c index 9f7561f6..ebe51c2b 100644 --- a/src/samples/gu/reflection/reflection.c +++ b/src/samples/gu/reflection/reflection.c @@ -131,7 +131,7 @@ int main(int argc, char* argv[]) sceGuShadeModel(GU_SMOOTH); sceGuEnable(GU_CULL_FACE); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -256,7 +256,7 @@ int main(int argc, char* argv[]) sceGuDisable(GU_TEXTURE_2D); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/rendertarget/rendertarget.c b/src/samples/gu/rendertarget/rendertarget.c index 604c0fef..7cb019aa 100644 --- a/src/samples/gu/rendertarget/rendertarget.c +++ b/src/samples/gu/rendertarget/rendertarget.c @@ -262,7 +262,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_TEXTURE_2D); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -321,7 +321,7 @@ int main(int argc, char* argv[]) } sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); frameBuffer = sceGuSwapBuffers(); diff --git a/src/samples/gu/shadowprojection/shadowprojection.c b/src/samples/gu/shadowprojection/shadowprojection.c index 74aca4e8..5f0a6d6f 100644 --- a/src/samples/gu/shadowprojection/shadowprojection.c +++ b/src/samples/gu/shadowprojection/shadowprojection.c @@ -160,7 +160,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_TEXTURE_2D); sceGuEnable(GU_DITHER); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -307,7 +307,7 @@ int main(int argc, char* argv[]) drawShadowCaster( &torus ); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); } // render to frame buffer @@ -377,7 +377,7 @@ int main(int argc, char* argv[]) drawShadowReceiver( &grid, shadowProj ); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); } sceDisplayWaitVblankStart(); diff --git a/src/samples/gu/signals/signals.c b/src/samples/gu/signals/signals.c index 6219492a..e53f4378 100644 --- a/src/samples/gu/signals/signals.c +++ b/src/samples/gu/signals/signals.c @@ -239,7 +239,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_TEXTURE_2D); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -265,7 +265,7 @@ int main(int argc, char* argv[]) sceGuAmbientColor(0xffffffff); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); } // generate callable command-list for cube rendering @@ -276,7 +276,7 @@ int main(int argc, char* argv[]) sceGuDrawArray(GU_TRIANGLES,GU_TEXTURE_32BITF|GU_COLOR_8888|GU_VERTEX_32BITF|GU_TRANSFORM_3D,12*3,0,cubeVertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); } for(;;) @@ -333,7 +333,7 @@ int main(int argc, char* argv[]) // this is done in order to stall GPU if it is ahead of CPU sceGuFinish(); #endif - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); #ifndef ENABLE_FRAMERATE // wait for next frame diff --git a/src/samples/gu/skinning/skinning.c b/src/samples/gu/skinning/skinning.c index 7e8e81c8..570fa62c 100644 --- a/src/samples/gu/skinning/skinning.c +++ b/src/samples/gu/skinning/skinning.c @@ -106,7 +106,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_LIGHT0); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -187,7 +187,7 @@ int main(int argc, char* argv[]) } sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/speed/speed.c b/src/samples/gu/speed/speed.c index cbd0169a..a90ec438 100644 --- a/src/samples/gu/speed/speed.c +++ b/src/samples/gu/speed/speed.c @@ -296,7 +296,7 @@ int main(int argc, char* argv[]) sceGuClutLoad(256/8,palette); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(1); @@ -413,7 +413,7 @@ int main(int argc, char* argv[]) blitTexture(blit_method,0,0,SCR_WIDTH,SCR_HEIGHT,0,0,strip_widths[strip_width].width); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); // sum results and update report if more than one second has passed since last time diff --git a/src/samples/gu/spharm/cube.c b/src/samples/gu/spharm/cube.c index e9275863..e1f10feb 100644 --- a/src/samples/gu/spharm/cube.c +++ b/src/samples/gu/spharm/cube.c @@ -170,7 +170,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_CULL_FACE); //sceGuEnable(GU_STATE_TEXTURE); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(1); @@ -236,7 +236,7 @@ int main(int argc, char* argv[]) sceGumRotateXYZ(&rot); } sceGuFinish(); - //sceGuSync(0,0); + //sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); SpharmGenTest(rendermode); @@ -257,7 +257,7 @@ int main(int argc, char* argv[]) } buttonsold = pad.Buttons; - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); } diff --git a/src/samples/gu/splinesurface/splinesurface.c b/src/samples/gu/splinesurface/splinesurface.c index 93f80179..41e40d3c 100644 --- a/src/samples/gu/splinesurface/splinesurface.c +++ b/src/samples/gu/splinesurface/splinesurface.c @@ -230,7 +230,7 @@ int main(int argc, char* argv[]) // sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -303,7 +303,7 @@ int main(int argc, char* argv[]) renderSH(parametersSH); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/sprite/sprite.c b/src/samples/gu/sprite/sprite.c index b81148ba..5b23cd88 100644 --- a/src/samples/gu/sprite/sprite.c +++ b/src/samples/gu/sprite/sprite.c @@ -114,7 +114,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_TEXTURE_2D); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -181,7 +181,7 @@ int main(int argc, char* argv[]) // wait for next frame sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/text/main.c b/src/samples/gu/text/main.c index aed8aa57..b29768a4 100644 --- a/src/samples/gu/text/main.c +++ b/src/samples/gu/text/main.c @@ -174,7 +174,7 @@ int main(int argc, char** argv) { sceGuTexWrap(GU_REPEAT, GU_REPEAT); sceGuTexFilter(GU_NEAREST, GU_NEAREST); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceGuDisplay(GU_TRUE); while(1) { @@ -211,7 +211,7 @@ int main(int argc, char** argv) { drawString("Hello World from pspdev", 0, 224, c, 0); sceGuFinish(); - sceGuSync(0, 0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuSwapBuffers(); diff --git a/src/samples/gu/timing/timing.c b/src/samples/gu/timing/timing.c index 05422af2..8ab395bb 100644 --- a/src/samples/gu/timing/timing.c +++ b/src/samples/gu/timing/timing.c @@ -199,7 +199,7 @@ int main(int argc, char** argv) { sceGuDisable(GU_TEXTURE_2D); sceGuSetCallback(GU_CALLBACK_SIGNAL, gucallback); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -277,7 +277,7 @@ int main(int argc, char** argv) { break; } sceGuFinish(); - sceGuSync(0, 0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); pspDebugScreenSetOffset((int)frameBuffer); pspDebugScreenSetXY(0,0); diff --git a/src/samples/gu/vertex/vertex.c b/src/samples/gu/vertex/vertex.c index ae04fff6..fe4d3cdb 100644 --- a/src/samples/gu/vertex/vertex.c +++ b/src/samples/gu/vertex/vertex.c @@ -234,7 +234,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -560,7 +560,7 @@ int main(int argc, char* argv[]) sceGumLoadIdentity(); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); // draw cube @@ -575,7 +575,7 @@ int main(int argc, char* argv[]) u64 tick1,tick2; sceRtcGetCurrentTick(&tick1); sceGuSendList(GU_TAIL,list,&tempGeContext); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceRtcGetCurrentTick(&tick2); // rescale number of batches if they rendered faster/slower than threshold diff --git a/src/samples/gu/zbufferfog/zbufferfog.c b/src/samples/gu/zbufferfog/zbufferfog.c index 252e73eb..c33d88a5 100644 --- a/src/samples/gu/zbufferfog/zbufferfog.c +++ b/src/samples/gu/zbufferfog/zbufferfog.c @@ -136,7 +136,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -235,7 +235,7 @@ int main(int argc, char* argv[]) sceGuDepthMask(0); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); pspDebugScreenSetOffset((int)fbp0); pspDebugScreenSetXY(0,0); diff --git a/src/samples/savedata/utility/main.c b/src/samples/savedata/utility/main.c index e082d3d1..4765dfe7 100644 --- a/src/samples/savedata/utility/main.c +++ b/src/samples/savedata/utility/main.c @@ -156,7 +156,7 @@ static void SetupGu() sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -195,7 +195,7 @@ static void DrawStuff(void) sceGumDrawArray(GU_TRIANGLES,GU_TEXTURE_32BITF|GU_COLOR_8888|GU_VERTEX_32BITF|GU_TRANSFORM_3D,12*3,0,vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); val ++; } diff --git a/src/samples/utility/gamesharing/main.c b/src/samples/utility/gamesharing/main.c index 4a3f6e25..f0128cda 100644 --- a/src/samples/utility/gamesharing/main.c +++ b/src/samples/utility/gamesharing/main.c @@ -145,7 +145,7 @@ static void setupGu() sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -179,7 +179,7 @@ static void drawStuff(void) sceGumDrawArray(GU_TRIANGLES, GU_COLOR_8888|GU_VERTEX_32BITF|GU_TRANSFORM_3D, 12*3, 0, vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); val++; } diff --git a/src/samples/utility/htmlviewer/main.c b/src/samples/utility/htmlviewer/main.c index 4f2343e0..844044a6 100644 --- a/src/samples/utility/htmlviewer/main.c +++ b/src/samples/utility/htmlviewer/main.c @@ -72,7 +72,7 @@ void setupGu(void) sceGuClearStencil(0); sceGuFinish(); - sceGuSync(0, 0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -83,7 +83,7 @@ void draw() sceGuStart(GU_DIRECT, list); sceGuClear(GU_COLOR_BUFFER_BIT|GU_STENCIL_BUFFER_BIT|GU_DEPTH_BUFFER_BIT); sceGuFinish(); - sceGuSync(0, 0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); } void loadNetModules() diff --git a/src/samples/utility/msgdialog/main.c b/src/samples/utility/msgdialog/main.c index 2ea28c7e..06082dd6 100644 --- a/src/samples/utility/msgdialog/main.c +++ b/src/samples/utility/msgdialog/main.c @@ -143,7 +143,7 @@ static void SetupGu() sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -185,7 +185,7 @@ static void DrawStuff(void) sceGumDrawArray(GU_TRIANGLES,GU_TEXTURE_32BITF|GU_COLOR_8888|GU_VERTEX_32BITF|GU_TRANSFORM_3D,12*3,0,vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); val ++; } diff --git a/src/samples/utility/netdialog/main.c b/src/samples/utility/netdialog/main.c index 4a21ce34..db429236 100644 --- a/src/samples/utility/netdialog/main.c +++ b/src/samples/utility/netdialog/main.c @@ -150,7 +150,7 @@ static void setupGu() sceGuEnable(GU_CULL_FACE); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -184,7 +184,7 @@ static void drawStuff(void) sceGumDrawArray(GU_TRIANGLES, GU_COLOR_8888|GU_VERTEX_32BITF|GU_TRANSFORM_3D, 12*3, 0, vertices); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); val++; } diff --git a/src/samples/utility/osk/main.c b/src/samples/utility/osk/main.c index 52928e88..94b20b99 100644 --- a/src/samples/utility/osk/main.c +++ b/src/samples/utility/osk/main.c @@ -71,7 +71,7 @@ int main(int argc, char* argv[]) sceGuEnable(GU_TEXTURE_2D); sceGuEnable(GU_CLIP_PLANES); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); sceDisplayWaitVblankStart(); sceGuDisplay(GU_TRUE); @@ -144,7 +144,7 @@ int main(int argc, char* argv[]) sceGuClear(GU_COLOR_BUFFER_BIT|GU_DEPTH_BUFFER_BIT); sceGuFinish(); - sceGuSync(0,0); + sceGuSync(GU_SYNC_FINISH, GU_SYNC_WHAT_DONE); switch(sceUtilityOskGetStatus()) {