From 8f331f56e29116fbe45c46ce5dcedc7e465b3c9f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Thu, 25 Aug 2016 23:02:43 +0200
Subject: [PATCH] - use MakeVertices directly in the portal code and remove all
 related code from RenderWall.

---
 src/gl/compatibility/gl_20.cpp |  2 +-
 src/gl/scene/gl_portal.cpp     |  4 +++-
 src/gl/scene/gl_wall.h         |  2 +-
 src/gl/scene/gl_walls_draw.cpp | 24 +++++-------------------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp
index c1ba2d2db..f05256452 100644
--- a/src/gl/compatibility/gl_20.cpp
+++ b/src/gl/compatibility/gl_20.cpp
@@ -773,7 +773,7 @@ void GLWall::RenderLightsCompat(int pass)
 		if (PrepareLight(light, pass))
 		{
 			vertcount = 0;
-			RenderWall(RWF_TEXTURED, NULL);
+			RenderWall(RWF_TEXTURED);
 		}
 		node = node->nextLight;
 	}
diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp
index 559c14976..bb7166805 100644
--- a/src/gl/scene/gl_portal.cpp
+++ b/src/gl/scene/gl_portal.cpp
@@ -152,7 +152,9 @@ void GLPortal::DrawPortalStencil()
 
 		for (unsigned int i = 0; i<lines.Size(); i++)
 		{
-			lines[i].RenderWall(GLWall::RWF_NORENDER, &mPrimIndices[i * 2]);
+			if (gl.buffermethod != BM_DEFERRED) lines[i].MakeVertices(false);
+			mPrimIndices[i * 2] = lines[i].vertindex;
+			mPrimIndices[i * 2 + 1] = lines[i].vertcount;
 		}
 
 		if (cap)
diff --git a/src/gl/scene/gl_wall.h b/src/gl/scene/gl_wall.h
index f8d8ef1bb..60da86130 100644
--- a/src/gl/scene/gl_wall.h
+++ b/src/gl/scene/gl_wall.h
@@ -196,7 +196,7 @@ private:
 	void SetupLights();
 	bool PrepareLight(ADynamicLight * light, int pass);
 	void MakeVertices(bool nosplit);
-	void RenderWall(int textured, unsigned int *store = NULL);
+	void RenderWall(int textured);
 	void RenderTextured(int rflags);
 
 	void FloodPlane(int pass);
diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp
index 9f0d168a4..a8ae5fc79 100644
--- a/src/gl/scene/gl_walls_draw.cpp
+++ b/src/gl/scene/gl_walls_draw.cpp
@@ -205,30 +205,16 @@ void GLWall::MakeVertices(bool nosplit)
 //
 //==========================================================================
 
-void GLWall::RenderWall(int textured, unsigned int *store)
+void GLWall::RenderWall(int textured)
 {
-	if (!(textured & RWF_NORENDER))
-	{
-		gl_RenderState.Apply();
-		gl_RenderState.ApplyLightIndex(dynlightindex);
-	}
-	
+	gl_RenderState.Apply();
+	gl_RenderState.ApplyLightIndex(dynlightindex);
 	if (gl.buffermethod != BM_DEFERRED)
 	{
 		MakeVertices(!(textured&RWF_NOSPLIT));
 	}
-	
-	unsigned int count = vertcount, offset = vertindex;
-	if (!(textured & RWF_NORENDER))
-	{
-		GLRenderer->mVBO->RenderArray(GL_TRIANGLE_FAN, offset, count);
-		vertexcount += count;
-	}
-	if (store != NULL)
-	{
-		store[0] = offset;
-		store[1] = count;
-	}
+	GLRenderer->mVBO->RenderArray(GL_TRIANGLE_FAN, vertindex, vertcount);
+	vertexcount += vertcount;
 }
 
 //==========================================================================