Merge pull request #226 from fjtrujy/improveSCEGUInit

Use the same GU Init as official doc
pspdev · Aug 12, 2024 · 7519d6d · 7519d6d
2 parents 0b50f4c + a04e1a7
commit 7519d6d
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 260 deletions.
diff --git a/src/gu/guInternal.h b/src/gu/guInternal.h
@@ -463,10 +463,10 @@ typedef enum GECommand
 	/* Texture buffer width 7 */
 	TEX_BUF_WIDTH7 = 0xaf, 
 
-	/* CLUT address */
-	CLUT_ADDR = 0xb0,		
-	/* CLUT address upper */
-	CLUT_ADDR_UPPER = 0xb1, 
+	/* CLUT buffer pointer */
+	CLUT_BUF_PTR = 0xb0,
+	/* CLUT buffer width */
+	CLUT_BUF_WIDTH = 0xb1, 
 
 	/* Transfer source */
 	TRANSFER_SRC = 0xb2,   
@@ -503,7 +503,7 @@ typedef enum GECommand
 	/* Texture format */
 	TEX_FORMAT = 0xc3,		  
 	/* Load CLUT */
-	LOAD_CLUT = 0xc4,		  
+	CLUT_LOAD = 0xc4,		  
 	/* CLUT format */
 	CLUT_FORMAT = 0xc5,		  
 	/* Texture filter */

diff --git a/src/gu/sceGuClutLoad.c b/src/gu/sceGuClutLoad.c
@@ -10,7 +10,7 @@
 
 void sceGuClutLoad(int num_blocks, const void *cbp)
 {
-	sendCommandi(CLUT_ADDR, ((unsigned int)cbp) & 0xffffff);
-	sendCommandi(CLUT_ADDR_UPPER, (((unsigned int)cbp) >> 8) & 0xf0000);
-	sendCommandi(LOAD_CLUT, num_blocks);
+	sendCommandi(CLUT_BUF_PTR, ((unsigned int)cbp) & 0xffffff);
+	sendCommandi(CLUT_BUF_WIDTH, (((unsigned int)cbp) >> 8) & 0xf0000);
+	sendCommandi(CLUT_LOAD, num_blocks);
 }