From e07cec2e131faca485bf23f5761a882698c52522 Mon Sep 17 00:00:00 2001 From: Denis Pauk Date: Mon, 24 Jun 2024 16:17:19 +0300 Subject: [PATCH] renders: skip unused colormap allocation --- src/client/refresh/gl1/gl1_main.c | 4 +--- src/client/refresh/gl3/gl3_main.c | 5 +---- src/client/refresh/gl4/gl4_main.c | 5 +---- src/client/refresh/vk/vk_image.c | 4 +--- src/client/vid/image.c | 7 +++++-- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/client/refresh/gl1/gl1_main.c b/src/client/refresh/gl1/gl1_main.c index 9d84f31d..90239faa 100644 --- a/src/client/refresh/gl1/gl1_main.c +++ b/src/client/refresh/gl1/gl1_main.c @@ -1416,7 +1416,6 @@ qboolean RI_Init(void) { int j, max_tex_size; - byte *colormap; extern float r_turbsin[256]; Swap_Init(); @@ -1433,9 +1432,8 @@ RI_Init(void) R_Printf(PRINT_ALL, "ref_gl1::R_Init() - DEBUG mode enabled\n"); #endif - ri.VID_GetPalette(&colormap, d_8to24table); + ri.VID_GetPalette(NULL, d_8to24table); ri.VID_GetPalette24to8((byte *)d_8to24table, &gl_state.d_16to8table); - free(colormap); R_Register(); diff --git a/src/client/refresh/gl3/gl3_main.c b/src/client/refresh/gl3/gl3_main.c index 867492cf..b900980e 100644 --- a/src/client/refresh/gl3/gl3_main.c +++ b/src/client/refresh/gl3/gl3_main.c @@ -486,8 +486,6 @@ enum { QGL_POINT_SPRITE = 0x8861 }; static qboolean GL3_Init(void) { - byte *colormap; - Swap_Init(); // FIXME: for fucks sake, this doesn't have to be done at runtime! R_Printf(PRINT_ALL, "Refresh: " REF_VERSION "\n"); @@ -502,8 +500,7 @@ GL3_Init(void) return false; } - ri.VID_GetPalette(&colormap, d_8to24table); - free(colormap); + ri.VID_GetPalette(NULL, d_8to24table); GL3_Register(); diff --git a/src/client/refresh/gl4/gl4_main.c b/src/client/refresh/gl4/gl4_main.c index cc8801bd..90ff93a9 100644 --- a/src/client/refresh/gl4/gl4_main.c +++ b/src/client/refresh/gl4/gl4_main.c @@ -482,8 +482,6 @@ enum { QGL_POINT_SPRITE = 0x8861 }; static qboolean GL4_Init(void) { - byte *colormap; - Swap_Init(); // FIXME: for fucks sake, this doesn't have to be done at runtime! R_Printf(PRINT_ALL, "Refresh: " REF_VERSION "\n"); @@ -498,8 +496,7 @@ GL4_Init(void) return false; } - ri.VID_GetPalette(&colormap, d_8to24table); - free(colormap); + ri.VID_GetPalette(NULL, d_8to24table); GL4_Register(); diff --git a/src/client/refresh/vk/vk_image.c b/src/client/refresh/vk/vk_image.c index 404f96c6..8ea150f6 100644 --- a/src/client/refresh/vk/vk_image.c +++ b/src/client/refresh/vk/vk_image.c @@ -1353,7 +1353,6 @@ void Vk_InitImages (void) { int i; float overbright; - byte *colormap; numvktextures = 0; img_loaded = 0; @@ -1378,8 +1377,7 @@ void Vk_InitImages (void) intensitytable[i] = j; } - ri.VID_GetPalette(&colormap, d_8to24table); - free(colormap); + ri.VID_GetPalette(NULL, d_8to24table); overbright = vk_overbrightbits->value; diff --git a/src/client/vid/image.c b/src/client/vid/image.c index c3447110..8408062c 100644 --- a/src/client/vid/image.c +++ b/src/client/vid/image.c @@ -487,8 +487,11 @@ VID_GetPalette(byte **colormap, unsigned *d_8to24table) return; } - *colormap = malloc(256 * 320); - memcpy(*colormap, colormap_cache, 256 * 320); + if (colormap) + { + *colormap = malloc(256 * 320); + memcpy(*colormap, colormap_cache, 256 * 320); + } memcpy(d_8to24table, d_8to24table_cache, sizeof(d_8to24table_cache)); }