X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=a8af5a4d91754fef62c5f32abab68a687dd03b8d;hb=70b02a044b03a24bccca138a0e175d37d70685d3;hp=354160da4166f594ee9e76c55591b359d6facd62;hpb=721f1133fe3cca694dfeb6c0a90720f2e9bb72ad;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rmain.c b/gl_rmain.c
index 354160da..a8af5a4d 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -282,7 +282,7 @@ typedef struct cubemapinfo_s
 cubemapinfo_t;
 
 int r_texture_numcubemaps;
-cubemapinfo_t r_texture_cubemaps[MAX_CUBEMAPS];
+cubemapinfo_t *r_texture_cubemaps[MAX_CUBEMAPS];
 
 unsigned int r_queries[MAX_OCCLUSION_QUERIES];
 unsigned int r_numqueries;
@@ -3741,14 +3741,36 @@ rtexture_t *R_GetCubemap(const char *basename)
 {
 	int i;
 	for (i = 0;i < r_texture_numcubemaps;i++)
-		if (!strcasecmp(r_texture_cubemaps[i].basename, basename))
-			return r_texture_cubemaps[i].texture ? r_texture_cubemaps[i].texture : r_texture_whitecube;
-	if (i >= MAX_CUBEMAPS)
+		if (r_texture_cubemaps[i] != NULL)
+			if (!strcasecmp(r_texture_cubemaps[i]->basename, basename))
+				return r_texture_cubemaps[i]->texture ? r_texture_cubemaps[i]->texture : r_texture_whitecube;
+	if (i >= MAX_CUBEMAPS || !r_main_mempool)
 		return r_texture_whitecube;
 	r_texture_numcubemaps++;
-	strlcpy(r_texture_cubemaps[i].basename, basename, sizeof(r_texture_cubemaps[i].basename));
-	r_texture_cubemaps[i].texture = R_LoadCubemap(r_texture_cubemaps[i].basename);
-	return r_texture_cubemaps[i].texture;
+	r_texture_cubemaps[i] = (cubemapinfo_t *)Mem_Alloc(r_main_mempool, sizeof(cubemapinfo_t));
+	strlcpy(r_texture_cubemaps[i]->basename, basename, sizeof(r_texture_cubemaps[i]->basename));
+	r_texture_cubemaps[i]->texture = R_LoadCubemap(r_texture_cubemaps[i]->basename);
+	return r_texture_cubemaps[i]->texture;
+}
+
+void R_FreeCubemap(const char *basename)
+{
+	int i;
+
+	for (i = 0;i < r_texture_numcubemaps;i++)
+	{
+		if (r_texture_cubemaps[i] != NULL)
+		{
+			if (r_texture_cubemaps[i]->texture)
+			{
+				if (developer_loading.integer)
+					Con_DPrintf("unloading cubemap \"%s\"\n", r_texture_cubemaps[i]->basename);
+				R_FreeTexture(r_texture_cubemaps[i]->texture);
+				Mem_Free(r_texture_cubemaps[i]);
+				r_texture_cubemaps[i] = NULL;
+			}
+		}
+	}
 }
 
 void R_FreeCubemaps(void)
@@ -3757,9 +3779,13 @@ void R_FreeCubemaps(void)
 	for (i = 0;i < r_texture_numcubemaps;i++)
 	{
 		if (developer_loading.integer)
-			Con_DPrintf("unloading cubemap \"%s\"\n", r_texture_cubemaps[i].basename);
-		if (r_texture_cubemaps[i].texture)
-			R_FreeTexture(r_texture_cubemaps[i].texture);
+			Con_DPrintf("unloading cubemap \"%s\"\n", r_texture_cubemaps[i]->basename);
+		if (r_texture_cubemaps[i] != NULL)
+		{
+			if (r_texture_cubemaps[i]->texture)
+				R_FreeTexture(r_texture_cubemaps[i]->texture);
+			Mem_Free(r_texture_cubemaps[i]);
+		}
 	}
 	r_texture_numcubemaps = 0;
 }
@@ -3911,6 +3937,9 @@ void gl_main_start(void)
 	hlslshaderstring = NULL;
 	memset(&r_svbsp, 0, sizeof (r_svbsp));
 
+	memset(r_texture_cubemaps, 0, sizeof(r_texture_cubemaps));
+	r_texture_numcubemaps = 0;
+
 	r_refdef.fogmasktable_density = 0;
 }