Fixed a bug that animated textures were unexpectedly freed on level c…

…hange.
hzqst · Jan 24, 2024 · 4535573 · 4535573
1 parent aec34ac
commit 4535573
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/Plugins/Renderer/gl_draw.cpp b/Plugins/Renderer/gl_draw.cpp
@@ -203,7 +203,7 @@ void GL_GenerateHashedTextureIndentifier3(const char* identifier, GL_TEXTURETYPE
 {
 #define FORMAT_TEXTURE_IDENTIFIER(Ty, Name) if (textureType == Ty)\
 	{\
-		snprintf(hashedIdentifier, len, "#" Name "_%08X_%04X_%04X_%04X_%04X", MurmurHash2(identifier, strlen(identifier), textureType), width, height, numframes, frameduration);\
+		snprintf(hashedIdentifier, len, "@" Name "_%08X_%04X_%04X_%04X_%04X", MurmurHash2(identifier, strlen(identifier), textureType), width, height, numframes, frameduration);\
 		return;\
 	}
 

diff --git a/Plugins/Renderer/gl_rmain.cpp b/Plugins/Renderer/gl_rmain.cpp
@@ -1712,11 +1712,7 @@ void GL_Init(void)
 	//No vanilla detail texture support
 	(*detTexSupported) = false;
 
-#ifdef _DEBUG
-	if (1)
-#else
 	if (gEngfuncs.CheckParm("-gl_debugoutput", NULL))
-#endif
 	{
 		glDebugMessageCallback(GL_DebugOutputCallback, 0);
 		glEnable(GL_DEBUG_OUTPUT);

diff --git a/Plugins/Renderer/gl_rmisc.cpp b/Plugins/Renderer/gl_rmisc.cpp
@@ -398,7 +398,7 @@ void GL_FreeTextureEntry(gltexture_t *glt, bool notify_callback)
 		return;
 	}
 
-	gEngfuncs.Con_DPrintf("GL_FreeTextureEntry: [%d] [%s].\n", glt->texnum, glt->identifier);
+	gEngfuncs.Con_DPrintf("GL_FreeTextureEntry: [%d] [%s] [%d].\n", glt->texnum, glt->identifier, notify_callback ? 1 : 0);
 
 	if (notify_callback)
 	{
-Original file line number
+Diff line change
@@ Expand Up @@
     		return;
     	}
-    	gEngfuncs.Con_DPrintf("GL_FreeTextureEntry: [%d] [%s].\n", glt->texnum, glt->identifier);
+    	gEngfuncs.Con_DPrintf("GL_FreeTextureEntry: [%d] [%s] [%d].\n", glt->texnum, glt->identifier, notify_callback ? 1 : 0);
     	if (notify_callback)
     	{
@@ Expand Down @@