- fixed the burn shader.

ZDoom · Jun 9, 2020 · af7c2fb · af7c2fb
1 parent b41ae2d
commit af7c2fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/common/textures/gametexture.cpp b/src/common/textures/gametexture.cpp
@@ -389,7 +389,7 @@ void FGameTexture::SetSpriteRect()
 
 void FGameTexture::CleanHardwareData(bool full)
 {
-	Base->CleanHardwareTextures();
+	if (full) Base->CleanHardwareTextures();
 	for (auto mat : Material) if (mat) mat->DeleteDescriptors();
 }
 

diff --git a/src/common/textures/hw_material.h b/src/common/textures/hw_material.h
@@ -48,6 +48,11 @@ class FMaterial
 		return sourcetex;
 	}
 
+	void ClearLayers()
+	{
+		mTextureLayers.Resize(1);
+	}
+
 	void AddTextureLayer(FTexture *tex, bool allowscale)
 	{
 		mTextureLayers.Push({ tex, allowscale });

diff --git a/src/rendering/2d/f_wipe.cpp b/src/rendering/2d/f_wipe.cpp
@@ -338,6 +338,7 @@ void Wiper_Burn::SetTextures(FGameTexture *startscreen, FGameTexture *endscreen)
 	endScreen = endscreen;
 	BurnTexture = new FBurnTexture(WIDTH, HEIGHT);
 	auto mat = FMaterial::ValidateTexture(endScreen, false);
+	mat->ClearLayers();
 	mat->AddTextureLayer(BurnTexture, false);
 }