Fully separated HWDrawInfo from GL dependencies.

This also required temoporarily moving one small function because in the current state this cannot be done in the API independent part.

src/gl/renderer/gl_renderer.h

@@ -57,17 +57,6 @@ inline float RAD2DEG(float deg)
 	return deg * float(180. / M_PI);
 }
 
-enum SectorRenderFlags
-{
-	// This is used to avoid creating too many drawinfos
-	SSRF_RENDERFLOOR = 1,
-	SSRF_RENDERCEILING = 2,
-	SSRF_RENDER3DPLANES = 4,
-	SSRF_RENDERALL = 7,
-	SSRF_PROCESSED = 8,
-	SSRF_SEEN = 16,
-};
-
 struct GL_IRECT
 {
 	int left,top;

src/gl/scene/gl_drawinfo.cpp

@@ -1319,3 +1319,10 @@ void FDrawInfo::ProcessLowerMinisegs(TArray<seg_t *> &lowersegs)
 		rendered_lines++;
 	}
 }
+
+// Same here for the dependency on the portal.
+void FDrawInfo::AddSubsectorToPortal(FSectorPortalGroup *portal, subsector_t *sub)
+{
+	portal->GetRenderState()->AddSubsector(sub);
+}
+

src/gl/scene/gl_drawinfo.h

@@ -2,6 +2,7 @@
 #define __GL_DRAWINFO_H
 
 #include "gl/scene/gl_wall.h"
+#include "hw_drawinfo.h"
 
 enum GLDrawItemType
 {
@@ -163,108 +164,6 @@ public:
 } ;
 
 
-//==========================================================================
-//
-// these are used to link faked planes due to missing textures to a sector
-//
-//==========================================================================
-struct gl_subsectorrendernode
-{
-	gl_subsectorrendernode *	next;
-	subsector_t *				sub;
-};
-
-enum area_t : int
-{
-	area_normal,
-	area_below,
-	area_above,
-	area_default
-};
-
-struct HWDrawInfo
-{
-	virtual ~HWDrawInfo() {}
-
-	struct wallseg
-	{
-		float x1, y1, z1, x2, y2, z2;
-	};
-	
-	struct MissingTextureInfo
-	{
-		seg_t * seg;
-		subsector_t * sub;
-		float Planez;
-		float Planezfront;
-	};
-	
-	struct MissingSegInfo
-	{
-		seg_t * seg;
-		int MTI_Index;    // tells us which MissingTextureInfo represents this seg.
-	};
-	
-	struct SubsectorHackInfo
-	{
-		subsector_t * sub;
-		uint8_t flags;
-	};
-	
-	TArray<MissingTextureInfo> MissingUpperTextures;
-	TArray<MissingTextureInfo> MissingLowerTextures;
-	
-	TArray<MissingSegInfo> MissingUpperSegs;
-	TArray<MissingSegInfo> MissingLowerSegs;
-	
-	TArray<SubsectorHackInfo> SubsectorHacks;
-	
-	TArray<gl_subsectorrendernode*> otherfloorplanes;
-	TArray<gl_subsectorrendernode*> otherceilingplanes;
-	
-	TArray<sector_t *> CeilingStacks;
-	TArray<sector_t *> FloorStacks;
-	
-	TArray<subsector_t *> HandledSubsectors;
-	
-	TArray<uint8_t> sectorrenderflags;
-	TArray<uint8_t> ss_renderflags;
-	TArray<uint8_t> no_renderflags;
-	
-	
-	void ClearBuffers();
-	
-	bool DoOneSectorUpper(subsector_t * subsec, float planez, area_t in_area);
-	bool DoOneSectorLower(subsector_t * subsec, float planez, area_t in_area);
-	bool DoFakeBridge(subsector_t * subsec, float planez, area_t in_area);
-	bool DoFakeCeilingBridge(subsector_t * subsec, float planez, area_t in_area);
-	
-	bool CheckAnchorFloor(subsector_t * sub);
-	bool CollectSubsectorsFloor(subsector_t * sub, sector_t * anchor);
-	bool CheckAnchorCeiling(subsector_t * sub);
-	bool CollectSubsectorsCeiling(subsector_t * sub, sector_t * anchor);
-	void CollectSectorStacksCeiling(subsector_t * sub, sector_t * anchor, area_t in_area);
-	void CollectSectorStacksFloor(subsector_t * sub, sector_t * anchor, area_t in_area);
-	
-	void AddUpperMissingTexture(side_t * side, subsector_t *sub, float backheight);
-	void AddLowerMissingTexture(side_t * side, subsector_t *sub, float backheight);
-	void HandleMissingTextures(area_t in_area);
-	void DrawUnhandledMissingTextures();
-	void AddHackedSubsector(subsector_t * sub);
-	void HandleHackedSubsectors();
-	void AddFloorStack(sector_t * sec);
-	void AddCeilingStack(sector_t * sec);
-	void ProcessSectorStacks(area_t in_area);
-	
-	void AddOtherFloorPlane(int sector, gl_subsectorrendernode * node);
-	void AddOtherCeilingPlane(int sector, gl_subsectorrendernode * node);
-	
-	virtual void FloodUpperGap(seg_t * seg) = 0;
-	virtual void FloodLowerGap(seg_t * seg) = 0;
-	virtual void ProcessLowerMinisegs(TArray<seg_t *> &lowersegs) = 0;
-	
-};
-
 struct FDrawInfo : public HWDrawInfo
 {
 	
@@ -288,8 +187,11 @@ struct FDrawInfo : public HWDrawInfo
 	void DrawFloodedPlane(wallseg * ws, float planez, sector_t * sec, bool ceiling);
 	void FloodUpperGap(seg_t * seg) override;
 	void FloodLowerGap(seg_t * seg) override;
-	void ProcessLowerMinisegs(TArray<seg_t *> &lowersegs) override;
 	
+	// These two may be moved to the API independent part of the renderer later.
+	void ProcessLowerMinisegs(TArray<seg_t *> &lowersegs) override;
+	void AddSubsectorToPortal(FSectorPortalGroup *portal, subsector_t *sub) override;
+
 	static void StartDrawInfo(GLSceneDrawer *drawer);
 	static void EndDrawInfo();
 	

src/gl/scene/gl_renderhacks.cpp

@@ -27,17 +27,15 @@
 
 #include "a_sharedglobal.h"
 #include "r_utility.h"
-#include "r_defs.h"
 #include "r_sky.h"
 #include "g_level.h"
 #include "g_levellocals.h"
 
-#include "gl/renderer/gl_renderer.h"
+#include "hw_drawinfo.h"
-#include "gl/scene/gl_drawinfo.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/scene/gl_scenedrawer.h"
 #include "gl/utility/gl_clock.h"
 
+sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
+
 
 // This is for debugging maps.
 
@@ -1147,7 +1145,7 @@ void HWDrawInfo::ProcessSectorStacks(area_t in_area)
 						BuildPortalCoverage(&sub->portalcoverage[sector_t::ceiling], sub, portal->mDisplacement);
 					}
 
-					portal->GetRenderState()->AddSubsector(sub);
+					AddSubsectorToPortal(portal, sub);
 
 					if (sec->GetAlpha(sector_t::ceiling) != 0 && sec->GetTexture(sector_t::ceiling) != skyflatnum)
 					{
@@ -1192,8 +1190,7 @@ void HWDrawInfo::ProcessSectorStacks(area_t in_area)
 						BuildPortalCoverage(&sub->portalcoverage[sector_t::floor], sub, portal->mDisplacement);
 					}
 
-					GLSectorStackPortal *glportal = portal->GetRenderState();
+					AddSubsectorToPortal(portal, sub);
-					glportal->AddSubsector(sub);
 
 					if (sec->GetAlpha(sector_t::floor) != 0 && sec->GetTexture(sector_t::floor) != skyflatnum)
 					{

src/gl/scene/hw_drawinfo.h

@@ -0,0 +1,121 @@
+#pragma once
+
+#include "r_defs.h"
+
+struct FSectorPortalGroup;
+
+//==========================================================================
+//
+// these are used to link faked planes due to missing textures to a sector
+//
+//==========================================================================
+struct gl_subsectorrendernode
+{
+	gl_subsectorrendernode *	next;
+	subsector_t *				sub;
+};
+
+enum area_t : int
+{
+	area_normal,
+	area_below,
+	area_above,
+	area_default
+};
+
+enum SectorRenderFlags
+{
+    // This is used to merge several subsectors into a single draw item
+    SSRF_RENDERFLOOR = 1,
+    SSRF_RENDERCEILING = 2,
+    SSRF_RENDER3DPLANES = 4,
+    SSRF_RENDERALL = 7,
+    SSRF_PROCESSED = 8,
+    SSRF_SEEN = 16,
+};
+
+
+struct HWDrawInfo
+{
+	virtual ~HWDrawInfo() {}
+
+	struct wallseg
+	{
+		float x1, y1, z1, x2, y2, z2;
+	};
+
+	struct MissingTextureInfo
+	{
+		seg_t * seg;
+		subsector_t * sub;
+		float Planez;
+		float Planezfront;
+	};
+
+	struct MissingSegInfo
+	{
+		seg_t * seg;
+		int MTI_Index;    // tells us which MissingTextureInfo represents this seg.
+	};
+
+	struct SubsectorHackInfo
+	{
+		subsector_t * sub;
+		uint8_t flags;
+	};
+
+	TArray<MissingTextureInfo> MissingUpperTextures;
+	TArray<MissingTextureInfo> MissingLowerTextures;
+
+	TArray<MissingSegInfo> MissingUpperSegs;
+	TArray<MissingSegInfo> MissingLowerSegs;
+
+	TArray<SubsectorHackInfo> SubsectorHacks;
+
+	TArray<gl_subsectorrendernode*> otherfloorplanes;
+	TArray<gl_subsectorrendernode*> otherceilingplanes;
+
+	TArray<sector_t *> CeilingStacks;
+	TArray<sector_t *> FloorStacks;
+
+	TArray<subsector_t *> HandledSubsectors;
+
+	TArray<uint8_t> sectorrenderflags;
+	TArray<uint8_t> ss_renderflags;
+	TArray<uint8_t> no_renderflags;
+
+
+	void ClearBuffers();
+
+	bool DoOneSectorUpper(subsector_t * subsec, float planez, area_t in_area);
+	bool DoOneSectorLower(subsector_t * subsec, float planez, area_t in_area);
+	bool DoFakeBridge(subsector_t * subsec, float planez, area_t in_area);
+	bool DoFakeCeilingBridge(subsector_t * subsec, float planez, area_t in_area);
+
+	bool CheckAnchorFloor(subsector_t * sub);
+	bool CollectSubsectorsFloor(subsector_t * sub, sector_t * anchor);
+	bool CheckAnchorCeiling(subsector_t * sub);
+	bool CollectSubsectorsCeiling(subsector_t * sub, sector_t * anchor);
+	void CollectSectorStacksCeiling(subsector_t * sub, sector_t * anchor, area_t in_area);
+	void CollectSectorStacksFloor(subsector_t * sub, sector_t * anchor, area_t in_area);
+
+	void AddUpperMissingTexture(side_t * side, subsector_t *sub, float backheight);
+	void AddLowerMissingTexture(side_t * side, subsector_t *sub, float backheight);
+	void HandleMissingTextures(area_t in_area);
+	void DrawUnhandledMissingTextures();
+	void AddHackedSubsector(subsector_t * sub);
+	void HandleHackedSubsectors();
+	void AddFloorStack(sector_t * sec);
+	void AddCeilingStack(sector_t * sec);
+	void ProcessSectorStacks(area_t in_area);
+
+	void AddOtherFloorPlane(int sector, gl_subsectorrendernode * node);
+	void AddOtherCeilingPlane(int sector, gl_subsectorrendernode * node);
+
+	virtual void FloodUpperGap(seg_t * seg) = 0;
+	virtual void FloodLowerGap(seg_t * seg) = 0;
+	virtual void ProcessLowerMinisegs(TArray<seg_t *> &lowersegs) = 0;
+    virtual void AddSubsectorToPortal(FSectorPortalGroup *portal, subsector_t *sub) = 0;
+
+};
+