From ff07d84723fb5f3c0a2815817e615033e56487a2 Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Sun, 14 Jul 2024 17:01:20 +0200 Subject: [PATCH] Add gu in front of vram functions --- src/gu/pspgu.h | 4 ++-- src/gu/vram.c | 6 +++--- src/samples/gu/blend/blend.c | 6 +++--- src/samples/gu/blit/blit.c | 6 +++--- src/samples/gu/copy/copy.c | 6 +++--- src/samples/gu/cube/cube.c | 6 +++--- src/samples/gu/envmap/envmap.c | 6 +++--- src/samples/gu/lights/lights.c | 6 +++--- src/samples/gu/lines/lines.c | 6 +++--- src/samples/gu/logic/logic.c | 6 +++--- src/samples/gu/ortho/ortho.c | 6 +++--- src/samples/gu/speed/speed.c | 8 ++++---- src/samples/gu/splinesurface/splinesurface.c | 6 +++--- src/samples/gu/sprite/sprite.c | 6 +++--- src/samples/gu/vertex/vertex.c | 10 +++++----- src/samples/gu/zbufferfog/zbufferfog.c | 6 +++--- 16 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/gu/pspgu.h b/src/gu/pspgu.h index 58255ed9..d0e482e5 100644 --- a/src/gu/pspgu.h +++ b/src/gu/pspgu.h @@ -1516,7 +1516,7 @@ void guSwapBuffersCallback(GuSwapBuffersCallback callback); * * @return A pointer to the buffer's relative to vram start (as required by sceGuDispBuffer, sceGuDrawBuffer, sceGuDepthBuffer and sceGuDrawBufferList) **/ -void* getStaticVramBuffer(unsigned int width, unsigned int height, unsigned int psm); +void* guGetStaticVramBuffer(unsigned int width, unsigned int height, unsigned int psm); /** * Allocate a texture in vram @@ -1535,7 +1535,7 @@ void* getStaticVramBuffer(unsigned int width, unsigned int height, unsigned int * * @return A pointer to the texture **/ -void* getStaticVramTexture(unsigned int width, unsigned int height, unsigned int psm); +void* guGetStaticVramTexture(unsigned int width, unsigned int height, unsigned int psm); /**@}*/ diff --git a/src/gu/vram.c b/src/gu/vram.c index 020d5d04..b8b9af4a 100644 --- a/src/gu/vram.c +++ b/src/gu/vram.c @@ -36,7 +36,7 @@ static unsigned int getMemorySize(unsigned int width, unsigned int height, unsig } } -void* getStaticVramBuffer(unsigned int width, unsigned int height, unsigned int psm) +void* guGetStaticVramBuffer(unsigned int width, unsigned int height, unsigned int psm) { unsigned int memSize = getMemorySize(width,height,psm); void* result = (void*)staticOffset; @@ -45,8 +45,8 @@ void* getStaticVramBuffer(unsigned int width, unsigned int height, unsigned int return result; } -void* getStaticVramTexture(unsigned int width, unsigned int height, unsigned int psm) +void* guGetStaticVramTexture(unsigned int width, unsigned int height, unsigned int psm) { - void* result = getStaticVramBuffer(width,height,psm); + void* result = guGetStaticVramBuffer(width,height,psm); return (void*)(((unsigned int)result) + ((unsigned int)sceGeEdramGetAddr())); } diff --git a/src/samples/gu/blend/blend.c b/src/samples/gu/blend/blend.c index 82095294..9153fcc3 100644 --- a/src/samples/gu/blend/blend.c +++ b/src/samples/gu/blend/blend.c @@ -91,9 +91,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); sceGuStart(GU_DIRECT,list); diff --git a/src/samples/gu/blit/blit.c b/src/samples/gu/blit/blit.c index ef306bd7..160930a7 100644 --- a/src/samples/gu/blit/blit.c +++ b/src/samples/gu/blit/blit.c @@ -130,9 +130,9 @@ int main(int argc, char* argv[]) // Setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); diff --git a/src/samples/gu/copy/copy.c b/src/samples/gu/copy/copy.c index 56823db5..2f807722 100644 --- a/src/samples/gu/copy/copy.c +++ b/src/samples/gu/copy/copy.c @@ -44,9 +44,9 @@ int main(int argc, char* argv[]) // setup - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); pspDebugScreenInit(); sceGuInit(); diff --git a/src/samples/gu/cube/cube.c b/src/samples/gu/cube/cube.c index f2a2000a..787b57b3 100644 --- a/src/samples/gu/cube/cube.c +++ b/src/samples/gu/cube/cube.c @@ -93,9 +93,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); diff --git a/src/samples/gu/envmap/envmap.c b/src/samples/gu/envmap/envmap.c index 7fb83227..b431e347 100644 --- a/src/samples/gu/envmap/envmap.c +++ b/src/samples/gu/envmap/envmap.c @@ -69,9 +69,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); pspDebugScreenInit(); sceGuInit(); diff --git a/src/samples/gu/lights/lights.c b/src/samples/gu/lights/lights.c index e5d266fc..ad29b38e 100644 --- a/src/samples/gu/lights/lights.c +++ b/src/samples/gu/lights/lights.c @@ -71,9 +71,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); diff --git a/src/samples/gu/lines/lines.c b/src/samples/gu/lines/lines.c index e3976537..a7762bae 100644 --- a/src/samples/gu/lines/lines.c +++ b/src/samples/gu/lines/lines.c @@ -87,9 +87,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); diff --git a/src/samples/gu/logic/logic.c b/src/samples/gu/logic/logic.c index 596ba237..248fcf0e 100644 --- a/src/samples/gu/logic/logic.c +++ b/src/samples/gu/logic/logic.c @@ -65,9 +65,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); diff --git a/src/samples/gu/ortho/ortho.c b/src/samples/gu/ortho/ortho.c index 5b49955a..0334d286 100644 --- a/src/samples/gu/ortho/ortho.c +++ b/src/samples/gu/ortho/ortho.c @@ -47,9 +47,9 @@ int main(int argc, char* argv[]) // Setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); diff --git a/src/samples/gu/speed/speed.c b/src/samples/gu/speed/speed.c index df7becaa..cbd0169a 100644 --- a/src/samples/gu/speed/speed.c +++ b/src/samples/gu/speed/speed.c @@ -270,9 +270,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); pspDebugScreenInit(); sceGuInit(); @@ -304,7 +304,7 @@ int main(int argc, char* argv[]) // get vram buffer for vram -> vram blit void* vram_buffer; - vram_buffer = getStaticVramTexture(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + vram_buffer = guGetStaticVramTexture(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); // flush caches to make sure no stray data remains diff --git a/src/samples/gu/splinesurface/splinesurface.c b/src/samples/gu/splinesurface/splinesurface.c index 09cc4e1c..93f80179 100644 --- a/src/samples/gu/splinesurface/splinesurface.c +++ b/src/samples/gu/splinesurface/splinesurface.c @@ -208,9 +208,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuInit(); diff --git a/src/samples/gu/sprite/sprite.c b/src/samples/gu/sprite/sprite.c index d02a322d..b81148ba 100644 --- a/src/samples/gu/sprite/sprite.c +++ b/src/samples/gu/sprite/sprite.c @@ -92,9 +92,9 @@ int main(int argc, char* argv[]) sceGuInit(); - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); sceGuStart(GU_DIRECT,list); sceGuDrawBuffer(GU_PSM_8888,fbp0,BUF_WIDTH); diff --git a/src/samples/gu/vertex/vertex.c b/src/samples/gu/vertex/vertex.c index 8345d663..ae04fff6 100644 --- a/src/samples/gu/vertex/vertex.c +++ b/src/samples/gu/vertex/vertex.c @@ -209,9 +209,9 @@ int main(int argc, char* argv[]) // setup GU - void* fbp0 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* fbp1 = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); - void* zbp = getStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); + void* fbp0 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* fbp1 = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_8888); + void* zbp = guGetStaticVramBuffer(BUF_WIDTH,SCR_HEIGHT,GU_PSM_4444); pspDebugScreenInit(); sceGuInit(); @@ -244,12 +244,12 @@ int main(int argc, char* argv[]) int maxVertexSize = getVertexSize(GU_TEXTURE_32BITF|GU_COLOR_8888|GU_NORMAL_32BITF|GU_VERTEX_32BITF|GU_WEIGHT_32BITF|GU_WEIGHTS(8)|GU_VERTICES(8)); int batchSize = 1536; // max size = 608, 608 * 1536 = ~1MB, make sure you don't overrun vram limits if you change this void* ramVertexBuffer = malloc(batchSize * maxVertexSize); - void* vramVertexBuffer = getStaticVramTexture(batchSize,maxVertexSize,GU_PSM_T8); + void* vramVertexBuffer = guGetStaticVramTexture(batchSize,maxVertexSize,GU_PSM_T8); // allocate index buffers void* ramIndexBuffer = malloc(batchSize * sizeof(unsigned short)); - void* vramIndexBuffer = getStaticVramTexture(batchSize,sizeof(unsigned short),GU_PSM_T8); + void* vramIndexBuffer = guGetStaticVramTexture(batchSize,sizeof(unsigned short),GU_PSM_T8); // run sample diff --git a/src/samples/gu/zbufferfog/zbufferfog.c b/src/samples/gu/zbufferfog/zbufferfog.c index d1df162d..252e73eb 100644 --- a/src/samples/gu/zbufferfog/zbufferfog.c +++ b/src/samples/gu/zbufferfog/zbufferfog.c @@ -117,9 +117,9 @@ int main(int argc, char* argv[]) sceGuInit(); - void* fbp0 = getStaticVramBuffer(BUFFER_WIDTH,SCREEN_HEIGHT,SCREEN_PSM); // drawbuffer 1, 512x272 (480x272 visible) - void* fbp1 = getStaticVramBuffer(BUFFER_WIDTH,SCREEN_HEIGHT,SCREEN_PSM); // drawbuffer 2 - void* zbp = getStaticVramBuffer(BUFFER_WIDTH,SCREEN_HEIGHT,GU_PSM_4444); // zbuffer, always 16bit + void* fbp0 = guGetStaticVramBuffer(BUFFER_WIDTH,SCREEN_HEIGHT,SCREEN_PSM); // drawbuffer 1, 512x272 (480x272 visible) + void* fbp1 = guGetStaticVramBuffer(BUFFER_WIDTH,SCREEN_HEIGHT,SCREEN_PSM); // drawbuffer 2 + void* zbp = guGetStaticVramBuffer(BUFFER_WIDTH,SCREEN_HEIGHT,GU_PSM_4444); // zbuffer, always 16bit sceGuStart(GU_DIRECT,list); sceGuDrawBuffer(SCREEN_PSM,fbp0,BUFFER_WIDTH);