From 8abbd63427c38a1ae28832ab29c1af24c92da982 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Sat, 23 Nov 2019 11:57:42 +0100
Subject: [PATCH] Only allocate WallColumnDrawerArgs once per thread

---
 src/rendering/swrenderer/drawers/r_draw.cpp   |  6 ++++-
 src/rendering/swrenderer/drawers/r_draw_pal.h | 26 +++++++++----------
 src/rendering/swrenderer/drawers/r_thread.h   |  3 +++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/rendering/swrenderer/drawers/r_draw.cpp b/src/rendering/swrenderer/drawers/r_draw.cpp
index fe9ebcc8c..ef4289a14 100644
--- a/src/rendering/swrenderer/drawers/r_draw.cpp
+++ b/src/rendering/swrenderer/drawers/r_draw.cpp
@@ -225,7 +225,11 @@ namespace swrenderer
 
 	void DrawWallCommand::Execute(DrawerThread* thread)
 	{
-		WallColumnDrawerArgs drawerargs(wallargs);
+		if (!thread->columndrawer)
+			thread->columndrawer = std::make_shared<WallColumnDrawerArgs>();
+
+		WallColumnDrawerArgs& drawerargs = *thread->columndrawer.get();
+		drawerargs.wallargs = &wallargs;
 
 		bool fixed = wallargs.fixedlight;
 
diff --git a/src/rendering/swrenderer/drawers/r_draw_pal.h b/src/rendering/swrenderer/drawers/r_draw_pal.h
index 252a06545..cb2af1bcb 100644
--- a/src/rendering/swrenderer/drawers/r_draw_pal.h
+++ b/src/rendering/swrenderer/drawers/r_draw_pal.h
@@ -17,8 +17,6 @@ namespace swrenderer
 	class WallColumnDrawerArgs
 	{
 	public:
-		WallColumnDrawerArgs(const WallDrawerArgs& wallargs) : wallargs(wallargs) { }
-
 		void SetDest(int x, int y)
 		{
 			dc_dest = Viewport()->GetDest(x, y);
@@ -43,10 +41,10 @@ namespace swrenderer
 		int DestY() const { return dc_dest_y; }
 		int Count() const { return dc_count; }
 
-		uint32_t* SrcBlend() const { return wallargs.SrcBlend(); }
-		uint32_t* DestBlend() const { return wallargs.DestBlend(); }
-		fixed_t SrcAlpha() const { return wallargs.SrcAlpha(); }
-		fixed_t DestAlpha() const { return wallargs.DestAlpha(); }
+		uint32_t* SrcBlend() const { return wallargs->SrcBlend(); }
+		uint32_t* DestBlend() const { return wallargs->DestBlend(); }
+		fixed_t SrcAlpha() const { return wallargs->SrcAlpha(); }
+		fixed_t DestAlpha() const { return wallargs->DestAlpha(); }
 
 		uint32_t TextureUPos() const { return dc_texturefracx; }
 		fixed_t TextureVPos() const { return dc_texturefrac; }
@@ -65,11 +63,11 @@ namespace swrenderer
 		DrawerLight dc_lights[MAX_DRAWER_LIGHTS];
 		int dc_num_lights = 0;
 
-		RenderViewport* Viewport() const { return wallargs.Viewport(); }
+		RenderViewport* Viewport() const { return wallargs->Viewport(); }
 
 		uint8_t* Colormap(RenderViewport* viewport) const
 		{
-			auto basecolormap = wallargs.BaseColormap();
+			auto basecolormap = wallargs->BaseColormap();
 			if (basecolormap)
 			{
 				if (viewport->RenderTarget->IsBgra())
@@ -79,20 +77,20 @@ namespace swrenderer
 			}
 			else
 			{
-				return wallargs.TranslationMap();
+				return wallargs->TranslationMap();
 			}
 		}
 
-		uint8_t* TranslationMap() const { return wallargs.TranslationMap(); }
+		uint8_t* TranslationMap() const { return wallargs->TranslationMap(); }
 
-		ShadeConstants ColormapConstants() const { return wallargs.ColormapConstants(); }
+		ShadeConstants ColormapConstants() const { return wallargs->ColormapConstants(); }
 		fixed_t Light() const { return LIGHTSCALE(mLight, mShade); }
 
-		FLightNode* LightList() const { return wallargs.lightlist; }
+		FLightNode* LightList() const { return wallargs->lightlist; }
+
+		const WallDrawerArgs* wallargs;
 
 	private:
-		const WallDrawerArgs& wallargs;
-
 		uint8_t* dc_dest = nullptr;
 		int dc_dest_y = 0;
 		int dc_count = 0;
diff --git a/src/rendering/swrenderer/drawers/r_thread.h b/src/rendering/swrenderer/drawers/r_thread.h
index eb804ac76..0d45b2cac 100644
--- a/src/rendering/swrenderer/drawers/r_thread.h
+++ b/src/rendering/swrenderer/drawers/r_thread.h
@@ -34,6 +34,8 @@ EXTERN_CVAR(Int, r_multithreaded)
 
 class PolyTriangleThreadData;
 
+namespace swrenderer { class WallColumnDrawerArgs; }
+
 // Worker data for each thread executing drawer commands
 class DrawerThread
 {
@@ -61,6 +63,7 @@ public:
 	const uint8_t *tiltlighting[MAXWIDTH];
 
 	std::shared_ptr<PolyTriangleThreadData> poly;
+	std::shared_ptr<swrenderer::WallColumnDrawerArgs> columndrawer;
 
 	size_t debug_draw_pos = 0;