AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 03:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

PS1: Minor optimisations

Browse Source
This commit is contained in:
UnknownShadow200 2025-03-10 21:14:39 +11:00
parent d56d310c1f
commit d76a64abc9
4 changed files with 63 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misc/ps1/ps1defs.h
View File

@ -3,9 +3,11 @@ enum dma_chrc_flags {
}; };
enum dma_chrc_CMD { enum dma_chrc_CMD {
CHRC_FROM_RAM = (1 << 0), CHRC_FROM_RAM = (1 << 0),
CHRC_BEGIN = (1 << 24), CHRC_DIR_DECREMENT = (1 << 1),
CHRC_MODE_SLICE = (1 << 9) CHRC_MODE_SLICE = (1 << 9),
CHRC_BEGIN_XFER = (1 << 24),
CHRC_NO_DREQ_WAIT = (1 << 28),
}; };
enum gpu_status_flags { enum gpu_status_flags {

35
src/EnvRenderer.c
View File

@ -22,13 +22,6 @@
cc_bool EnvRenderer_Legacy, EnvRenderer_Minimal; cc_bool EnvRenderer_Legacy, EnvRenderer_Minimal;
static float CalcBlendFactor(float x) {
float blend = -0.13f + 0.28f * ((float)Math_Log2(x) * 0.17329f);
if (blend < 0.0f) blend = 0.0f;
if (blend > 1.0f) blend = 1.0f;
return blend;
}
#define EnvRenderer_AxisSize() (EnvRenderer_Legacy ? 128 : 2048) #define EnvRenderer_AxisSize() (EnvRenderer_Legacy ? 128 : 2048)
/* Returns the number of vertices needed to subdivide a quad */ /* Returns the number of vertices needed to subdivide a quad */
static int CalcNumVertices(int axis1Len, int axis2Len) { static int CalcNumVertices(int axis1Len, int axis2Len) {
@ -40,6 +33,21 @@ static int CalcNumVertices(int axis1Len, int axis2Len) {
/*########################################################################################################################* /*########################################################################################################################*
*------------------------------------------------------------Fog----------------------------------------------------------* *------------------------------------------------------------Fog----------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
static PackedCol fog_color;
static float CalcBlendFactor(float x) {
float blend = -0.13f + 0.28f * ((float)Math_Log2(x) * 0.17329f);
if (blend < 0.0f) blend = 0.0f;
if (blend > 1.0f) blend = 1.0f;
return blend;
}
static CC_INLINE void UpdateFogBlend(void) {
float blend = CalcBlendFactor((float)Game_ViewDistance);
/* Blend fog and sky together */
fog_color = PackedCol_Lerp(Env.FogCol, Env.SkyCol, blend);
}
static cc_bool CameraInsideBlock(BlockID block, IVec3* coords) { static cc_bool CameraInsideBlock(BlockID block, IVec3* coords) {
struct AABB blockBB; struct AABB blockBB;
Vec3 pos; Vec3 pos;
@ -50,7 +58,7 @@ static cc_bool CameraInsideBlock(BlockID block, IVec3* coords) {
return AABB_ContainsPoint(&blockBB, &Camera.CurrentPos); return AABB_ContainsPoint(&blockBB, &Camera.CurrentPos);
} }
static void CalcFog(float* density, PackedCol* color) { static PackedCol CalcFog(float* density) {
IVec3 coords; IVec3 coords;
BlockID block; BlockID block;
float blend; float blend;
@ -60,12 +68,10 @@ static void CalcFog(float* density, PackedCol* color) {
if (Blocks.FogDensity[block] && CameraInsideBlock(block, &coords)) { if (Blocks.FogDensity[block] && CameraInsideBlock(block, &coords)) {
*density = Blocks.FogDensity[block]; *density = Blocks.FogDensity[block];
*color = Blocks.FogCol[block]; return Blocks.FogCol[block];
} else { } else {
*density = 0.0f; *density = 0.0f;
/* Blend fog and sky together */ return fog_color;
blend = CalcBlendFactor((float)Game_ViewDistance);
*color = PackedCol_Lerp(Env.FogCol, Env.SkyCol, blend);
} }
} }
@ -117,7 +123,7 @@ void EnvRenderer_UpdateFog(void) {
PackedCol fogColor; PackedCol fogColor;
if (!World.Loaded) return; if (!World.Loaded) return;
CalcFog(&fogDensity, &fogColor); fogColor = CalcFog(&fogDensity);
Gfx_ClearColor(fogColor); Gfx_ClearColor(fogColor);
if (EnvRenderer_Minimal) { if (EnvRenderer_Minimal) {
@ -864,6 +870,7 @@ static void OnContextLost(void* obj) {
static void UpdateAll(void) { static void UpdateAll(void) {
DeleteStaticVbs(); DeleteStaticVbs();
UpdateFogBlend();
EnvRenderer_UpdateFog(); EnvRenderer_UpdateFog();
DeleteWeatherVB(); DeleteWeatherVB();
@ -918,8 +925,10 @@ static void OnEnvVariableChanged(void* obj, int envVar) {
} else if (envVar == ENV_VAR_SHADOW_COLOR) { } else if (envVar == ENV_VAR_SHADOW_COLOR) {
DeleteSidesVB(); DeleteSidesVB();
} else if (envVar == ENV_VAR_SKY_COLOR) { } else if (envVar == ENV_VAR_SKY_COLOR) {
UpdateFogBlend();
DeleteSkyVB(); DeleteSkyVB();
} else if (envVar == ENV_VAR_FOG_COLOR) { } else if (envVar == ENV_VAR_FOG_COLOR) {
UpdateFogBlend();
EnvRenderer_UpdateFog(); EnvRenderer_UpdateFog();
} else if (envVar == ENV_VAR_CLOUDS_COLOR) { } else if (envVar == ENV_VAR_CLOUDS_COLOR) {
DeleteCloudsVB(); DeleteCloudsVB();

58
src/Graphics_PS1.c
View File

@ -26,9 +26,11 @@
// crashes due to too many primitives being drawn, increase this value. // crashes due to too many primitives being drawn, increase this value.
#define BUFFER_LENGTH 32768 #define BUFFER_LENGTH 32768
#define wait_while(cond) while (cond) { __asm__ volatile(""); }
typedef struct { typedef struct {
DISPENV disp_env;
DRAWENV draw_env; DRAWENV draw_env;
uint32_t fb_pos;
uint32_t ot[OT_LENGTH]; uint32_t ot[OT_LENGTH];
//uint32_t oct[OCT_LENGTH]; //uint32_t oct[OCT_LENGTH];
@ -43,24 +45,37 @@ static RenderBuffer* buffer;
static void* lastPoly; static void* lastPoly;
static cc_bool cullingEnabled, noMemWarned; static cc_bool cullingEnabled, noMemWarned;
// Resets ordering table to reverse default order
// TODO move wait until later
static void ResetOTableR(uint32_t* ot) {
DMA_MADR(DMA_OTC) = (uint32_t)&ot[OT_LENGTH - 1];
DMA_BCR(DMA_OTC) = OT_LENGTH;
DMA_CHCR(DMA_OTC) = CHRC_NO_DREQ_WAIT | CHRC_BEGIN_XFER | CHRC_DIR_DECREMENT;
wait_while(DMA_CHCR(DMA_OTC) & CHRC_STATUS_BUSY);
}
static void OnBufferUpdated(void) { static void OnBufferUpdated(void) {
buffer = &buffers[active_buffer]; buffer = &buffers[active_buffer];
next_packet = buffer->buffer; next_packet = buffer->buffer;
next_packet_end = next_packet + BUFFER_LENGTH; next_packet_end = next_packet + BUFFER_LENGTH;
ClearOTagR(buffer->ot, OT_LENGTH);
//ClearOTagR(buffer->oct, OCT_LENGTH); ResetOTableR(buffer->ot);
}
static void InitContext(RenderBuffer* buffer, int x, int y, int w, int h) {
SetDefDrawEnv(&buffer->draw_env, x, y, w, h);
buffer->draw_env.isbg = 1;
buffer->fb_pos = (x & 0x3ff) | ((y & 0x1ff) << 10);
} }
static void SetupContexts(int w, int h, int r, int g, int b) { static void SetupContexts(int w, int h, int r, int g, int b) {
SetDefDrawEnv(&buffers[0].draw_env, 0, 0, w, h); InitContext(&buffers[0], 0, 0, w, h);
SetDefDispEnv(&buffers[0].disp_env, 0, 0, w, h); InitContext(&buffers[1], 0, h, w, h);
SetDefDrawEnv(&buffers[1].draw_env, 0, h, w, h);
SetDefDispEnv(&buffers[1].disp_env, 0, h, w, h);
setRGB0(&buffers[0].draw_env, r, g, b); setRGB0(&buffers[0].draw_env, r, g, b);
setRGB0(&buffers[1].draw_env, r, g, b); setRGB0(&buffers[1].draw_env, r, g, b);
buffers[0].draw_env.isbg = 1;
buffers[1].draw_env.isbg = 1;
/* /*
buffers[0].draw_env.tw.w = 16; buffers[0].draw_env.tw.w = 16;
buffers[0].draw_env.tw.h = 16; buffers[0].draw_env.tw.h = 16;
@ -110,8 +125,6 @@ void Gfx_Free(void) {
/*########################################################################################################################* /*########################################################################################################################*
*------------------------------------------------------VRAM transfers-----------------------------------------------------* *------------------------------------------------------VRAM transfers-----------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
#define wait_while(cond) while (cond) { __asm__ volatile(""); }
static void WaitUntilFinished(void) { static void WaitUntilFinished(void) {
// Wait until DMA to GPU has finished // Wait until DMA to GPU has finished
wait_while((DMA_CHCR(DMA_GPU) & CHRC_STATUS_BUSY)); wait_while((DMA_CHCR(DMA_GPU) & CHRC_STATUS_BUSY));
@ -147,13 +160,14 @@ void Gfx_TransferToVRAM(int x, int y, int w, int h, void* pixels) {
GPU_GP1 = GP1_CMD_DMA_MODE | GP1_DMA_CPU_TO_GP0; GPU_GP1 = GP1_CMD_DMA_MODE | GP1_DMA_CPU_TO_GP0;
// Wait until any prior DMA to GPU has finished // Wait until any prior DMA to GPU has finished
wait_while((DMA_CHCR(DMA_GPU) & CHRC_STATUS_BUSY)); wait_while((DMA_CHCR(DMA_GPU) & CHRC_STATUS_BUSY))
// Wait until GPU is ready to receive DMA data // Wait until GPU is ready to receive DMA data
wait_while(!(GPU_GP1 & GPU_STATUS_DMA_RECV_READY)); wait_while(!(GPU_GP1 & GPU_STATUS_DMA_RECV_READY));
DMA_MADR(DMA_GPU) = (uint32_t)pixels; DMA_MADR(DMA_GPU) = (uint32_t)pixels;
DMA_BCR(DMA_GPU) = block_size | (num_blocks << 16); DMA_BCR(DMA_GPU) = block_size | (num_blocks << 16);
DMA_CHCR(DMA_GPU) = CHRC_BEGIN | CHRC_MODE_SLICE | CHRC_FROM_RAM; DMA_CHCR(DMA_GPU) = CHRC_BEGIN_XFER | CHRC_MODE_SLICE | CHRC_FROM_RAM;
WaitUntilFinished(); WaitUntilFinished();
} }
@ -911,9 +925,11 @@ void Gfx_EndFrame(void) {
RenderBuffer* draw_buffer = &buffers[active_buffer]; RenderBuffer* draw_buffer = &buffers[active_buffer];
RenderBuffer* disp_buffer = &buffers[active_buffer ^ 1]; RenderBuffer* disp_buffer = &buffers[active_buffer ^ 1];
PutDispEnv(&disp_buffer->disp_env); // Use previous finished frame as display framebuffer
GPU_GP1 = GP1_CMD_DISPLAY_ADDRESS | disp_buffer->fb_pos;
// Start sending commands to GPU to draw this frame
DrawOTagEnv(&draw_buffer->ot[OT_LENGTH - 1], &draw_buffer->draw_env); DrawOTagEnv(&draw_buffer->ot[OT_LENGTH - 1], &draw_buffer->draw_env);
//DrawOTagEnv(&draw_buffer->oct[OCT_LENGTH - 1], &draw_buffer->draw_env);
active_buffer ^= 1; active_buffer ^= 1;
OnBufferUpdated(); OnBufferUpdated();
@ -942,20 +958,8 @@ void Gfx_SetViewport(int x, int y, int w, int h)
buffers[1].draw_env.clip.y = y; buffers[1].draw_env.clip.y = y;
buffers[1].draw_env.clip.w = w; buffers[1].draw_env.clip.w = w;
buffers[1].draw_env.clip.h = h; buffers[1].draw_env.clip.h = h;
buffers[0].disp_env.disp.x = x;
buffers[0].disp_env.disp.y = y;
buffers[0].disp_env.disp.w = w;
buffers[0].disp_env.disp.h = h;
buffers[1].disp_env.disp.x = x;
buffers[1].disp_env.disp.y = y;
buffers[1].disp_env.disp.w = w;
buffers[1].disp_env.disp.h = h;
//SetDefDrawEnv(&buffers[0].draw_env, x, y, w, h); //SetDefDrawEnv(&buffers[0].draw_env, x, y, w, h);
//SetDefDispEnv(&buffers[0].disp_env, x, y, w, h);
//SetDefDrawEnv(&buffers[1].draw_env, x, y+h, w, h); //SetDefDrawEnv(&buffers[1].draw_env, x, y+h, w, h);
//SetDefDispEnv(&buffers[1].disp_env, x, y+h, w, h);
} }
void Gfx_SetScissor (int x, int y, int w, int h) { } void Gfx_SetScissor (int x, int y, int w, int h) { }

4
src/Window_PS1.c
View File

@ -66,6 +66,8 @@ static void InitScreen(void) {
GPU_GP1 = GP1_CMD_VERTICAL_RANGE | ver_range; GPU_GP1 = GP1_CMD_VERTICAL_RANGE | ver_range;
GPU_GP1 = GP1_CMD_VIDEO_MODE | mode; GPU_GP1 = GP1_CMD_VIDEO_MODE | mode;
GPU_GP1 = GP1_CMD_DISPLAY_ACTIVE | GP1_DISPLAY_ENABLED; GPU_GP1 = GP1_CMD_DISPLAY_ACTIVE | GP1_DISPLAY_ENABLED;
GPU_GP1 = GP1_CMD_DMA_MODE | GP1_DMA_CPU_TO_GP0;
} }
// Resets screen to an initial grey colour // Resets screen to an initial grey colour
@ -92,6 +94,8 @@ void Window_Create2D(int width, int height) {
void Window_Create3D(int width, int height) { void Window_Create3D(int width, int height) {
ResetGraph(0); ResetGraph(0);
launcherMode = false; launcherMode = false;
InitScreen();
} }
void Window_Destroy(void) { } void Window_Destroy(void) { }