Merge pull request #285 from fjtrujy/magic_numbers_gu

Some clean ups around `sceGu`

Author: fjtrujy

src/display/pspdisplay.h

@@ -31,12 +31,15 @@ enum PspDisplayPixelFormats {
 };
 
 enum PspDisplaySetBufSync {
-	/** Buffer change effective immediately */
-	PSP_DISPLAY_SETBUF_IMMEDIATE = 0,
-	/** Buffer change effective next frame */
-	PSP_DISPLAY_SETBUF_NEXTFRAME = 1
+	/** Buffer change effective next hsync */
+	PSP_DISPLAY_SETBUF_NEXTHSYNC = 0,
+	/** Buffer change effective next vsync */
+	PSP_DISPLAY_SETBUF_NEXTVSYNC = 1
 };
 
+/** Values for retro compatibility */
+#define PSP_DISPLAY_SETBUF_IMMEDIATE PSP_DISPLAY_SETBUF_NEXTHSYNC
+#define PSP_DISPLAY_SETBUF_NEXTFRAME PSP_DISPLAY_SETBUF_NEXTVSYNC
 
 enum PspDisplayErrorCodes
 {

src/gu/Makefile.am

@@ -57,6 +57,7 @@ libpspgu_a_SOURCES = \
 	sceGuEnable.c \
 	sceGuEndObject.c \
 	sceGuFinish.c \
+	sceGuFinishId.c \
 	sceGuFog.c \
 	sceGuFrontFace.c \
 	sceGuGetAllStatus.c \

src/gu/guInternal.h

@@ -116,7 +116,7 @@ extern GuLightSettings light_settings[4];
 
 void callbackSig(int id, void *arg);
 void callbackFin(int id, void *arg);
-void resetValues();
+void _sceGuResetGlobalVariables();
 
 typedef enum GECommand
 {
@@ -645,12 +645,18 @@ static inline void sendCommandf(GECommand cmd, float argument)
 	sendCommandi(cmd, t.i >> 8);
 }
 
-static inline void sendCommandiStall(GECommand cmd, int argument)
-{
-	sendCommandi(cmd, argument);
-
-	if (!gu_object_stack_depth && !gu_curr_context)
-		sceGeListUpdateStallAddr(ge_list_executed[0], gu_list->current);
+static inline int _sceGuUpdateStallAddr(void) {
+	if (gu_curr_context == GU_DIRECT) {
+		// Just if there are no objects in the stack (no guBeginObject)
+		if (!gu_object_stack_depth) {
+			int res;
+			res = sceGeListUpdateStallAddr(ge_list_executed[0], gu_list->current);
+			if (res < 0) {
+				return res;
+			}
+		}
+	} 
+	return 0;
 }
 
 #endif

src/gu/pspgu.h

@@ -433,8 +433,10 @@ void sceGuFog(float near, float far, unsigned int color);
   * Initalize the GU system
   *
   * This function MUST be called as the first function, otherwise state is undetermined.
+  *
+  * @return 0 for success, < 0 for failure
 **/
-void sceGuInit(void);
+int sceGuInit(void);
 
 /**
   * Shutdown the GU system
@@ -475,6 +477,11 @@ void* sceGuSetCallback(int signal, void (*callback)(int));
 
 /**
   * Trigger signal to call code from the command stream
+  * 
+  * Available signals are:
+  *   - GU_SIGNAL_WAIT - Wait for callback to finish
+  *   - GU_SIGNAL_NOWAIT - Do not wait for callback to finish
+  *   - GU_SIGNAL_PAUSE - Pause execution until callback is finished
   *
   * Available behaviors are:
   *   - GU_BEHAVIOR_SUSPEND - Stops display list execution until callback function finished
@@ -564,8 +571,9 @@ int sceGuFinishId(unsigned int id);
   * Call previously generated display-list
   *
   * @param list - Display list to call
+  * @return 0 for success, < 0 for failure
 **/
-void sceGuCallList(const void* list);
+int sceGuCallList(const void* list);
 
 /**
   * Set wether to use stack-based calls or signals to handle execution of called lists.
@@ -1525,8 +1533,8 @@ void sceGuDrawArrayN(int primitive_type, int vertex_type, int vcount, int primco
   * Set how the display should be set
   *
   * Available behaviours are:
-  *   - PSP_DISPLAY_SETBUF_IMMEDIATE - Display is swapped immediately
-  *   - PSP_DISPLAY_SETBUF_NEXTFRAME - Display is swapped on the next frame
+  *   - PSP_DISPLAY_SETBUF_NEXTHSYNC - Display is swapped on the next hsync
+  *   - PSP_DISPLAY_SETBUF_NEXTVSYNC - Display is swapped on the next vsync
   *
   * Do remember that this swaps the pointers internally, regardless of setting, so be careful to wait until the next
   * vertical blank or use another buffering algorithm (see guSwapBuffersCallback()).

src/gu/resetValues.c

@@ -8,7 +8,7 @@
 
 #include "guInternal.h"
 
-void resetValues()
+void _sceGuResetGlobalVariables()
 {
 	unsigned int i;
 
@@ -18,7 +18,7 @@ void resetValues()
 	gu_current_frame = 0;
 	gu_object_stack_depth = 0;
 
-	gu_display_on = 0;
+	gu_display_on = GU_FALSE;
 	gu_call_mode = GU_CALL_NORMAL;
 
 	gu_draw_buffer.pixel_size = 1;

src/gu/sceGuCallList.c

@@ -8,19 +8,25 @@
 
 #include "guInternal.h"
 
-void sceGuCallList(const void *list)
+int sceGuCallList(const void *list)
 {
+	int res;
 	unsigned int list_addr = (unsigned int)list;
 
 	if (gu_call_mode == GU_CALL_SIGNAL)
 	{
 		sendCommandi(SIGNAL, (list_addr >> 16) | 0x110000);
 		sendCommandi(END, list_addr & 0xffff);
-		sendCommandiStall(NOP, 0);
 	}
 	else
 	{
 		sendCommandi(BASE, (list_addr >> 8) & 0xf0000);
-		sendCommandiStall(CALL, list_addr);
+		sendCommandi(CALL, list_addr);
 	}
+
+	res = _sceGuUpdateStallAddr();
+	if (res < 0) {
+		return res;
+	}
+	return 0;
 }

src/gu/sceGuColor.c

@@ -10,5 +10,5 @@
 
 void sceGuColor(unsigned int color)
 {
-	sceGuMaterial(7,color);
+	sceGuMaterial(GU_AMBIENT | GU_DIFFUSE | GU_SPECULAR, color);
 }

src/gu/sceGuDisable.c

@@ -89,6 +89,6 @@ void sceGuDisable(int state)
 	break;
 	}
 
-	if (state < 22)
+	if (state < GU_MAX_STATUS)
 		gu_states &= ~(1 << state);
 }

src/gu/sceGuDispBuffer.c

@@ -30,5 +30,5 @@ void sceGuDispBuffer(int width, int height, void *dispbp, int dispbw)
 	sceDisplaySetMode(0, gu_draw_buffer.width, gu_draw_buffer.height);
 
 	if (gu_display_on)
-		sceDisplaySetFrameBuf((void *)(((unsigned int)ge_edram_address) + ((unsigned int)gu_draw_buffer.disp_buffer)), dispbw, gu_draw_buffer.pixel_size, PSP_DISPLAY_SETBUF_NEXTFRAME);
+		sceDisplaySetFrameBuf((void *)(((unsigned int)ge_edram_address) + ((unsigned int)gu_draw_buffer.disp_buffer)), dispbw, gu_draw_buffer.pixel_size, PSP_DISPLAY_SETBUF_NEXTVSYNC);
 }

src/gu/sceGuDisplay.c

@@ -13,10 +13,10 @@
 
 int sceGuDisplay(int state)
 {
-	if (state)
-		sceDisplaySetFrameBuf((void*)((unsigned int)ge_edram_address+(unsigned int)gu_draw_buffer.disp_buffer),gu_draw_buffer.frame_width,gu_draw_buffer.pixel_size,PSP_DISPLAY_SETBUF_NEXTFRAME);
+	if (state == GU_TRUE)
+		sceDisplaySetFrameBuf((void *)((unsigned int)ge_edram_address + (unsigned int)gu_draw_buffer.disp_buffer), gu_draw_buffer.frame_width, gu_draw_buffer.pixel_size, PSP_DISPLAY_SETBUF_NEXTVSYNC);
 	else
-		sceDisplaySetFrameBuf(0,0,0,PSP_DISPLAY_SETBUF_NEXTFRAME);
+		sceDisplaySetFrameBuf(NULL, 0, 0, PSP_DISPLAY_SETBUF_NEXTVSYNC);
 
 	gu_display_on = state;
 	return state;