From fa2f8a36ab6489ea03417476a42054f7f4bfadfd Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Fri, 12 Jul 2024 13:26:44 +0200 Subject: [PATCH] Update samples to use internal vram functions --- src/samples/gu/blend/blend.c | 1 - src/samples/gu/blit/blit.c | 1 - src/samples/gu/common/vram.c | 46 -------------------- src/samples/gu/common/vram.h | 31 ------------- src/samples/gu/copy/copy.c | 1 - src/samples/gu/cube/cube.c | 1 - src/samples/gu/envmap/envmap.c | 1 - src/samples/gu/lights/lights.c | 1 - src/samples/gu/lines/lines.c | 1 - src/samples/gu/logic/logic.c | 1 - src/samples/gu/ortho/ortho.c | 1 - src/samples/gu/speed/speed.c | 1 - src/samples/gu/splinesurface/splinesurface.c | 1 - src/samples/gu/sprite/sprite.c | 1 - src/samples/gu/vertex/vertex.c | 1 - src/samples/gu/zbufferfog/zbufferfog.c | 1 - 16 files changed, 91 deletions(-) delete mode 100644 src/samples/gu/common/vram.c delete mode 100644 src/samples/gu/common/vram.h diff --git a/src/samples/gu/blend/blend.c b/src/samples/gu/blend/blend.c index 324f8d20..82095294 100644 --- a/src/samples/gu/blend/blend.c +++ b/src/samples/gu/blend/blend.c @@ -18,7 +18,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Blend Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/blit/blit.c b/src/samples/gu/blit/blit.c index edf8ac84..ef306bd7 100644 --- a/src/samples/gu/blit/blit.c +++ b/src/samples/gu/blit/blit.c @@ -19,7 +19,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Blit Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/common/vram.c b/src/samples/gu/common/vram.c deleted file mode 100644 index 90ae58bc..00000000 --- a/src/samples/gu/common/vram.c +++ /dev/null @@ -1,46 +0,0 @@ -#include "vram.h" - -#include -#include - -static unsigned int staticOffset = 0; - -static unsigned int getMemorySize(unsigned int width, unsigned int height, unsigned int psm) -{ - switch (psm) - { - case GU_PSM_T4: - return (width * height) >> 1; - - case GU_PSM_T8: - return width * height; - - case GU_PSM_5650: - case GU_PSM_5551: - case GU_PSM_4444: - case GU_PSM_T16: - return 2 * width * height; - - case GU_PSM_8888: - case GU_PSM_T32: - return 4 * width * height; - - default: - return 0; - } -} - -void* getStaticVramBuffer(unsigned int width, unsigned int height, unsigned int psm) -{ - unsigned int memSize = getMemorySize(width,height,psm); - void* result = (void*)staticOffset; - staticOffset += memSize; - - return result; -} - -void* getStaticVramTexture(unsigned int width, unsigned int height, unsigned int psm) -{ - void* result = getStaticVramBuffer(width,height,psm); - return (void*)(((unsigned int)result) + ((unsigned int)sceGeEdramGetAddr())); -} diff --git a/src/samples/gu/common/vram.h b/src/samples/gu/common/vram.h deleted file mode 100644 index e59f1009..00000000 --- a/src/samples/gu/common/vram.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef common_vram_h -#define common_vram_h - -#ifdef __cplusplus -extern "C" { -#endif - -/* - The following are a few helperfunctions to help manage vram in gu-examples. - Do not use for your own code, it's better you manage it in your own way. -*/ - -/* make a static allocation of vram memory and return pointer relative to vram start */ -void* getStaticVramBuffer(unsigned int width, unsigned int height, unsigned int psm); -/* make a static allocation of vram memory and return absolute pointer */ -void* getStaticVramTexture(unsigned int width, unsigned int height, unsigned int psm); - -// the following is not yet implemented -/* -void beginDynamicVramFrame(); -void endDynamicVramFrame(); - -void* getDynamicVramBuffer(unsigned int width, unsigned int height, unsigned int psm); -void* getDynamicVramTexture(unsigned int width, unsigned int height, unsigned int psm); -*/ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/samples/gu/copy/copy.c b/src/samples/gu/copy/copy.c index 104604f2..56823db5 100644 --- a/src/samples/gu/copy/copy.c +++ b/src/samples/gu/copy/copy.c @@ -18,7 +18,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("CopyImage Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/cube/cube.c b/src/samples/gu/cube/cube.c index 13a99a18..f2a2000a 100644 --- a/src/samples/gu/cube/cube.c +++ b/src/samples/gu/cube/cube.c @@ -18,7 +18,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Cube Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/envmap/envmap.c b/src/samples/gu/envmap/envmap.c index d17087dc..7fb83227 100644 --- a/src/samples/gu/envmap/envmap.c +++ b/src/samples/gu/envmap/envmap.c @@ -24,7 +24,6 @@ #include "../common/callbacks.h" #include "../common/geometry.h" -#include "../common/vram.h" PSP_MODULE_INFO("EnvMap Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/lights/lights.c b/src/samples/gu/lights/lights.c index bfc519f3..e5d266fc 100644 --- a/src/samples/gu/lights/lights.c +++ b/src/samples/gu/lights/lights.c @@ -19,7 +19,6 @@ #include "../common/callbacks.h" #include "../common/geometry.h" -#include "../common/vram.h" PSP_MODULE_INFO("Lights Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/lines/lines.c b/src/samples/gu/lines/lines.c index 40ccdf2f..e3976537 100644 --- a/src/samples/gu/lines/lines.c +++ b/src/samples/gu/lines/lines.c @@ -18,7 +18,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Lines Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/logic/logic.c b/src/samples/gu/logic/logic.c index 3509fc03..596ba237 100644 --- a/src/samples/gu/logic/logic.c +++ b/src/samples/gu/logic/logic.c @@ -17,7 +17,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Logic Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/ortho/ortho.c b/src/samples/gu/ortho/ortho.c index ad547c89..5b49955a 100644 --- a/src/samples/gu/ortho/ortho.c +++ b/src/samples/gu/ortho/ortho.c @@ -17,7 +17,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Orthographic Projection", 0, 1, 1); diff --git a/src/samples/gu/speed/speed.c b/src/samples/gu/speed/speed.c index 556d4ac3..df7becaa 100644 --- a/src/samples/gu/speed/speed.c +++ b/src/samples/gu/speed/speed.c @@ -19,7 +19,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Memory Speed Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/splinesurface/splinesurface.c b/src/samples/gu/splinesurface/splinesurface.c index f95fecee..09cc4e1c 100644 --- a/src/samples/gu/splinesurface/splinesurface.c +++ b/src/samples/gu/splinesurface/splinesurface.c @@ -18,7 +18,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Spline Surface Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/sprite/sprite.c b/src/samples/gu/sprite/sprite.c index 2e48aaf3..d02a322d 100644 --- a/src/samples/gu/sprite/sprite.c +++ b/src/samples/gu/sprite/sprite.c @@ -18,7 +18,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" PSP_MODULE_INFO("Sprite Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER); diff --git a/src/samples/gu/vertex/vertex.c b/src/samples/gu/vertex/vertex.c index 0f7c9076..8345d663 100644 --- a/src/samples/gu/vertex/vertex.c +++ b/src/samples/gu/vertex/vertex.c @@ -20,7 +20,6 @@ #include #include "../common/callbacks.h" -#include "../common/vram.h" #include "../common/menu.h" PSP_MODULE_INFO("Vertex Speed Sample", 0, 1, 1); diff --git a/src/samples/gu/zbufferfog/zbufferfog.c b/src/samples/gu/zbufferfog/zbufferfog.c index 49b365a8..d1df162d 100644 --- a/src/samples/gu/zbufferfog/zbufferfog.c +++ b/src/samples/gu/zbufferfog/zbufferfog.c @@ -23,7 +23,6 @@ #include "../common/callbacks.h" #include "../common/geometry.h" -#include "../common/vram.h" PSP_MODULE_INFO("Depth Buffer Fog Sample", 0, 1, 1); PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);