Merge branch 'master' of https://github.com/coelckers/gzdoom

# Conflicts:
#	src/CMakeLists.txt
#	src/gl/renderer/gl_renderer.h
#	src/gl/scene/gl_portal.cpp
#	src/gl/scene/gl_scene.cpp

src/gl/compatibility/gl_20.cpp

@@ -30,16 +30,9 @@
 
 #include "gl/system/gl_system.h"
 #include "menu/menu.h"
-#include "tarray.h"
-#include "doomtype.h"
-#include "m_argv.h"
-#include "zstring.h"
-#include "i_system.h"
-#include "v_text.h"
 #include "r_utility.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
-#include "g_levellocals.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/renderer/gl_renderer.h"

src/gl/compatibility/gl_swshader20.cpp

@@ -30,15 +30,10 @@
 #include "gl/system/gl_system.h"
 #include "tarray.h"
 #include "doomtype.h"
-#include "zstring.h"
-#include "i_system.h"
 #include "r_utility.h"
 #include "w_wad.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/renderer/gl_renderer.h"
-#include "gl/system/gl_interface.h"
-#include "gl/renderer/gl_renderstate.h"
 
 
 class LegacyShader

src/gl/data/gl_vertexbuffer.cpp

@@ -29,9 +29,6 @@
 #include "doomtype.h"
 #include "p_local.h"
 #include "r_state.h"
-#include "m_argv.h"
-#include "c_cvars.h"
-#include "g_levellocals.h"
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/shaders/gl_shader.h"

src/gl/dynlights/gl_lightbuffer.cpp

@@ -28,7 +28,6 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/dynlights/gl_lightbuffer.h"
-#include "gl/system/gl_interface.h"
 #include "gl/utility//gl_clock.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 

src/gl/dynlights/gl_shadowmap.cpp

@@ -23,7 +23,6 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/dynlights/gl_shadowmap.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
@@ -31,8 +30,6 @@
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/shaders/gl_shadowmapshader.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
-#include "r_state.h"
-#include "g_levellocals.h"
 #include "stats.h"
 
 /*

src/gl/models/gl_models.cpp

@@ -28,20 +28,13 @@
 
 #include "gl/system/gl_system.h"
 #include "w_wad.h"
-#include "cmdlib.h"
-#include "sc_man.h"
-#include "m_crc32.h"
-#include "c_console.h"
 #include "g_game.h"
 #include "doomstat.h"
 #include "g_level.h"
 #include "r_state.h"
 #include "d_player.h"
 #include "g_levellocals.h"
-#include "r_utility.h"
 #include "i_time.h"
-//#include "resources/voxels.h"
-//#include "gl/gl_intern.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/renderer/gl_lightdata.cpp

@@ -33,11 +33,8 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/scene/gl_portal.h"
-#include "c_dispatch.h"
 #include "p_local.h"
-#include "g_level.h"
 #include "r_sky.h"
-#include "g_levellocals.h"
 
 // externally settable lighting properties
 static float distfogtable[2][256];	// light to fog conversion table for black fog

src/gl/renderer/gl_postprocess.cpp

@@ -28,21 +28,8 @@
 #include "gl/system/gl_system.h"
 #include "gi.h"
 #include "m_png.h"
-#include "m_random.h"
-#include "st_stuff.h"
-#include "dobject.h"
-#include "doomstat.h"
-#include "g_level.h"
-#include "r_data/r_interpolate.h"
 #include "r_utility.h"
 #include "d_player.h"
-#include "p_effect.h"
-#include "sbar.h"
-#include "po_man.h"
-#include "r_utility.h"
-#include "p_local.h"
-#include "colormatcher.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/system/gl_debug.h"
@@ -60,7 +47,6 @@
 #include "gl/shaders/gl_lensshader.h"
 #include "gl/shaders/gl_fxaashader.h"
 #include "gl/shaders/gl_presentshader.h"
-#include "gl/shaders/gl_postprocessshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 #include "r_videoscale.h"

src/gl/renderer/gl_postprocessstate.cpp

@@ -29,9 +29,6 @@
 #include "gl/system/gl_system.h"
 #include "gl/system/gl_interface.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/system/gl_cvars.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 
 //-----------------------------------------------------------------------------

src/gl/renderer/gl_quaddrawer.cpp

@@ -23,9 +23,7 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/renderer/gl_renderer.h"
-#include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_quaddrawer.h"
-#include "r_data/matrix.h"
 
 /*
 ** For handling of dynamically created quads when no persistently mapped

src/gl/renderer/gl_renderbuffers.cpp

@@ -26,18 +26,12 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include "w_wad.h"
-#include "i_system.h"
-#include "doomerrors.h"
 #include <random>
 
 CVAR(Int, gl_multisample, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);

src/gl/renderer/gl_renderer.cpp

@@ -27,13 +27,9 @@
 
 #include "gl/system/gl_system.h"
 #include "files.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "r_data/r_translate.h"
 #include "m_png.h"
-#include "m_crc32.h"
 #include "w_wad.h"
-#include "vectors.h"
 #include "doomstat.h"
 #include "i_time.h"
 #include "p_effect.h"
@@ -52,8 +48,6 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
 #include "gl/scene/gl_swscene.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/shaders/gl_ambientshader.h"
 #include "gl/shaders/gl_bloomshader.h"
 #include "gl/shaders/gl_blurshader.h"
@@ -64,13 +58,9 @@
 #include "gl/shaders/gl_presentshader.h"
 #include "gl/shaders/gl_present3dRowshader.h"
 #include "gl/shaders/gl_shadowmapshader.h"
-#include "gl/shaders/gl_postprocessshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
 #include "gl/stereo3d/gl_stereo3d.h"
-#include "gl/textures/gl_material.h"
 #include "gl/textures/gl_samplers.h"
-#include "gl/utility/gl_clock.h"
-#include "gl/models/gl_models.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 #include "r_videoscale.h"
 

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;
@@ -234,6 +223,7 @@ public:
 	static float GetZFar() { return 65536.f; }
 };
 
+enum area_t : int;
 #include "hwrenderer/scene/hw_fakeflat.h"
 
 struct TexFilter_s
@@ -246,4 +236,4 @@ struct TexFilter_s
 
 extern FGLRenderer *GLRenderer;
 
-#endif
+#endif

src/gl/renderer/gl_renderstate.cpp

@@ -33,11 +33,8 @@
 #include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/renderer/gl_renderer.h"
-#include "gl/renderer/gl_renderstate.h"
-#include "gl/renderer/gl_colormap.h"
 #include "gl/dynlights//gl_lightbuffer.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include "g_levellocals.h"
 
 void gl_SetTextureMode(int type);
 

src/gl/scene/gl_bsp.cpp

@@ -29,18 +29,12 @@
 #include "p_local.h"
 #include "a_sharedglobal.h"
 #include "g_levellocals.h"
-#include "r_sky.h"
 #include "p_effect.h"
 #include "po_man.h"
-#include "doomdata.h"
-#include "g_levellocals.h"
 
 #include "gl/renderer/gl_renderer.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/scene/gl_wall.h"
-#include "gl/utility/gl_clock.h"
 
 EXTERN_CVAR(Bool, gl_render_segs)
 

src/gl/scene/gl_decal.cpp

@@ -38,9 +38,6 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 struct DecalVertex

src/gl/scene/gl_drawinfo.cpp

@@ -30,21 +30,14 @@
 #include "gl/system/gl_system.h"
 #include "r_sky.h"
 #include "r_utility.h"
-#include "r_state.h"
 #include "doomstat.h"
 #include "g_levellocals.h"
-#include "memarena.h"
 
-#include "gl/system/gl_cvars.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/stereo3d/scoped_color_mask.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
@@ -1307,3 +1300,22 @@ void FDrawInfo::FloodLowerGap(seg_t * seg)
 	// Step3: Delete the stencil
 	ClearFloodStencil(&ws);
 }
+
+// This was temporarily moved out of gl_renderhacks.cpp so that the dependency on GLWall could be eliminated until things have progressed a bit.
+void FDrawInfo::ProcessLowerMinisegs(TArray<seg_t *> &lowersegs)
+{
+	for(unsigned int j=0;j<lowersegs.Size();j++)
+	{
+		seg_t * seg=lowersegs[j];
+		GLWall wall(mDrawer);
+		wall.ProcessLowerMiniseg(seg, seg->Subsector->render_sector, seg->PartnerSeg->Subsector->render_sector);
+		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 "hwrenderer/scene/hw_drawinfo.h"
 
 enum GLDrawItemType
 {
@@ -18,10 +19,10 @@ enum DrawListType
 	GLDL_MASKEDFLATS,
 	GLDL_MASKEDWALLSOFS,
 	GLDL_MODELS,
-
+	
 	GLDL_TRANSLUCENT,
 	GLDL_TRANSLUCENTBORDER,
-
+	
 	GLDL_TYPES,
 };
 
@@ -31,16 +32,16 @@ enum DLDrawListType
 	// These are organized so that the various multipass rendering modes have to be set as few times as possible
 	GLLDL_WALLS_PLAIN,			// dynamic lights on normal walls
 	GLLDL_WALLS_MASKED,			// dynamic lights on masked midtextures
-
+	
 	GLLDL_FLATS_PLAIN,			// dynamic lights on normal flats
 	GLLDL_FLATS_MASKED,			// dynamic lights on masked flats
-
+	
 	GLLDL_WALLS_FOG,			// lights on fogged walls
 	GLLDL_WALLS_FOGMASKED,		// lights on fogged masked midtextures
-
+	
 	GLLDL_FLATS_FOG,			// lights on fogged walls
 	GLLDL_FLATS_FOGMASKED,		// lights on fogged masked midtextures
-
+	
 	GLLDL_TYPES,
 };
 
@@ -52,7 +53,7 @@ enum Drawpasses
 	GLPASS_PLAIN,		// Main pass without dynamic lights
 	GLPASS_DECALS,		// Draws a decal
 	GLPASS_TRANSLUCENT,	// Draws translucent objects
-
+	
 	// these are only used with texture based dynamic lights
 	GLPASS_BASE,		// untextured base for dynamic lights
 	GLPASS_BASE_MASKED,	// same but with active texture
@@ -60,7 +61,7 @@ enum Drawpasses
 	GLPASS_TEXONLY,		// finishing texture pass
 	GLPASS_LIGHTTEX_ADDITIVE,	// lighttexture pass (additive)
 	GLPASS_LIGHTTEX_FOGGY,	// lighttexture pass on foggy surfaces (forces all lights to be additive)
-
+	
 };
 
 //==========================================================================
@@ -76,7 +77,7 @@ struct GLDrawItem
 {
 	GLDrawItemType rendertype;
 	int index;
-
+	
 	GLDrawItem(GLDrawItemType _rendertype,int _index) : rendertype(_rendertype),index(_index) {}
 };
 
@@ -88,8 +89,8 @@ struct SortNode
 	SortNode * left;		// left side of this node
 	SortNode * equal;		// equal to this node
 	SortNode * right;		// right side of this node
-
-
+	
+	
 	void UnlinkFromChain();
 	void Link(SortNode * hook);
 	void AddToEqual(SortNode * newnode);
@@ -105,14 +106,14 @@ struct SortNode
 
 struct GLDrawList
 {
-//private:
+	//private:
 	TArray<GLWall*> walls;
 	TArray<GLFlat*> flats;
 	TArray<GLSprite*> sprites;
 	TArray<GLDrawItem> drawitems;
 	int SortNodeStart;
 	SortNode * sorted;
-
+	
 public:
 	GLDrawList()
 	{
@@ -120,25 +121,25 @@ public:
 		SortNodeStart=-1;
 		sorted=NULL;
 	}
-
+	
 	~GLDrawList()
 	{
 		Reset();
 	}
-
+	
 	unsigned int Size()
 	{
 		return drawitems.Size();
 	}
-
+	
 	GLWall *NewWall();
 	GLFlat *NewFlat();
 	GLSprite *NewSprite();
 	void Reset();
 	void SortWalls();
 	void SortFlats();
-
-
+	
+	
 	void MakeSortList();
 	SortNode * FindSortPlane(SortNode * head);
 	SortNode * FindSortWall(SortNode * head);
@@ -163,123 +164,43 @@ public:
 } ;
 
 
-//==========================================================================
-//
-// these are used to link faked planes due to missing textures to a sector
-//
-//==========================================================================
-struct gl_subsectorrendernode
+struct FDrawInfo : public HWDrawInfo
 {
-	gl_subsectorrendernode *	next;
-	subsector_t *				sub;
-};
-
-
-struct FDrawInfo
-{
-	struct wallseg
-	{
-		float x1, y1, z1, x2, y2, z2;
-	};
-
-	bool temporary;
-
-
-
-	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;
-	};
-
+	
 	GLSceneDrawer *mDrawer;
-
-	TArray<uint8_t> sectorrenderflags;
-	TArray<uint8_t> ss_renderflags;
-	TArray<uint8_t> no_renderflags;
-
-	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;
-
+	
+	
 	FDrawInfo * next;
 	GLDrawList drawlists[GLDL_TYPES];
 	GLDrawList *dldrawlists = NULL;	// only gets allocated when needed.
-
+	
 	FDrawInfo();
 	~FDrawInfo();
-	void ClearBuffers();
-
+	
 	void AddWall(GLWall *wall);
 	bool PutWallCompat(GLWall *wall, int passflag);	// Legacy GL only.
-
-	bool DoOneSectorUpper(subsector_t * subsec, float planez);
-	bool DoOneSectorLower(subsector_t * subsec, float planez);
-	bool DoFakeBridge(subsector_t * subsec, float planez);
-	bool DoFakeCeilingBridge(subsector_t * subsec, float planez);
-
-	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);
-	void CollectSectorStacksFloor(subsector_t * sub, sector_t * anchor);
-
-	void AddUpperMissingTexture(side_t * side, subsector_t *sub, float backheight);
-	void AddLowerMissingTexture(side_t * side, subsector_t *sub, float backheight);
-	void HandleMissingTextures();
-	void DrawUnhandledMissingTextures();
-	void AddHackedSubsector(subsector_t * sub);
-	void HandleHackedSubsectors();
-	void AddFloorStack(sector_t * sec);
-	void AddCeilingStack(sector_t * sec);
-	void ProcessSectorStacks();
-
-	void AddOtherFloorPlane(int sector, gl_subsectorrendernode * node);
-	void AddOtherCeilingPlane(int sector, gl_subsectorrendernode * node);
-
+	
+	
 	void StartScene();
 	void SetupFloodStencil(wallseg * ws);
 	void ClearFloodStencil(wallseg * ws);
 	void DrawFloodedPlane(wallseg * ws, float planez, sector_t * sec, bool ceiling);
-	void FloodUpperGap(seg_t * seg);
-	void FloodLowerGap(seg_t * seg);
+	void FloodUpperGap(seg_t * seg) override;
+	void FloodLowerGap(seg_t * seg) 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();
-
+	
 	gl_subsectorrendernode * GetOtherFloorPlanes(unsigned int sector)
 	{
 		if (sector<otherfloorplanes.Size()) return otherfloorplanes[sector];
 		else return NULL;
 	}
-
+	
 	gl_subsectorrendernode * GetOtherCeilingPlanes(unsigned int sector)
 	{
 		if (sector<otherceilingplanes.Size()) return otherceilingplanes[sector];
@@ -290,9 +211,9 @@ struct FDrawInfo
 class FDrawInfoList
 {
 	TDeletingArray<FDrawInfo *> mList;
-
+	
 public:
-
+	
 	FDrawInfo *GetNew();
 	void Release(FDrawInfo *);
 };
@@ -303,4 +224,4 @@ extern FDrawInfo * gl_drawinfo;
 void gl_SetPlaneTextureRotation(const GLSectorPlane * secplane, FMaterial * gltexture);
 void gl_SetRenderStyle(FRenderStyle style, bool drawopaque, bool allowcolorblending);
 
-#endif
+#endif

src/gl/scene/gl_flats.cpp

@@ -30,11 +30,8 @@
 #include "r_defs.h"
 #include "r_sky.h"
 #include "r_utility.h"
-#include "g_level.h"
 #include "doomstat.h"
 #include "d_player.h"
-#include "portal.h"
-#include "templates.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
@@ -47,10 +44,7 @@
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 #ifdef _DEBUG

src/gl/scene/gl_portal.cpp

@@ -27,33 +27,24 @@
 
 #include "gl/system/gl_system.h"
 #include "p_local.h"
-#include "vectors.h"
 #include "c_dispatch.h"
 #include "doomstat.h"
 #include "a_sharedglobal.h"
 #include "r_sky.h"
-#include "portal.h"
 #include "p_maputl.h"
 #include "d_player.h"
 #include "g_levellocals.h"
-#include "actorinlines.h"
 
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_quaddrawer.h"
-#include "gl/data/gl_vertexbuffer.h"
 #include "hwrenderer/scene/hw_clipper.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/stereo3d/scoped_color_mask.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

src/gl/scene/gl_scene.cpp

@@ -26,12 +26,8 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "i_time.h"
 #include "gi.h"
 #include "m_png.h"
-#include "m_random.h"
-#include "st_stuff.h"
-#include "dobject.h"
 #include "doomstat.h"
 #include "g_level.h"
 #include "r_data/r_interpolate.h"
@@ -40,11 +36,9 @@
 #include "p_effect.h"
 #include "sbar.h"
 #include "po_man.h"
-#include "r_utility.h"
 #include "p_local.h"
 #include "serializer.h"
 #include "g_levellocals.h"
-#include "events.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/dynlights/gl_lightbuffer.h"
@@ -59,11 +53,8 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 #include "gl/stereo3d/scoped_view_shifter.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 
 //==========================================================================
 //
@@ -269,9 +260,9 @@ void GLSceneDrawer::CreateScene()
 	// These cannot be multithreaded when the time comes because all these depend
 	// on the global 'validcount' variable.
 
-	gl_drawinfo->HandleMissingTextures();	// Missing upper/lower textures
+	gl_drawinfo->HandleMissingTextures(in_area);	// Missing upper/lower textures
 	gl_drawinfo->HandleHackedSubsectors();	// open sector hacks for deep water
-	gl_drawinfo->ProcessSectorStacks();		// merge visplanes of sector stacks
+	gl_drawinfo->ProcessSectorStacks(in_area);		// merge visplanes of sector stacks
 	GLRenderer->mVBO->Unmap();
 
 	ProcessAll.Unclock();

src/gl/scene/gl_sky.cpp

@@ -22,12 +22,10 @@
 
 #include "gl/system/gl_system.h"
 #include "a_sharedglobal.h"
-#include "g_level.h"
 #include "r_sky.h"
 #include "r_state.h"
 #include "r_utility.h"
 #include "doomdata.h"
-#include "portal.h"
 #include "g_levellocals.h"
 
 #include "gl/renderer/gl_lightdata.h"

src/gl/scene/gl_skydome.cpp

@@ -56,7 +56,6 @@
 #include "gl/system/gl_system.h"
 #include "doomtype.h"
 #include "g_level.h"
-#include "sc_man.h"
 #include "w_wad.h"
 #include "r_state.h"
 #include "r_utility.h"
@@ -69,9 +68,7 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/scene/gl_portal.h"
 #include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 
 
 //-----------------------------------------------------------------------------

src/gl/scene/gl_sprite.cpp

@@ -39,22 +39,15 @@
 #include "events.h"
 #include "actorinlines.h"
 #include "r_data/r_vanillatrans.h"
-#include "i_time.h"
 
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/scene/gl_portal.h"
 #include "gl/models/gl_models.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
-#include "gl/data/gl_vertexbuffer.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 CVAR(Bool, gl_usecolorblending, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

src/gl/scene/gl_spritelight.cpp

@@ -29,19 +29,15 @@
 #include "c_dispatch.h"
 #include "p_local.h"
 #include "p_effect.h"
-#include "vectors.h"
 #include "g_level.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
-#include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/scene/gl_drawinfo.h"
-#include "gl/scene/gl_portal.h"
 #include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 
 

src/gl/scene/gl_swscene.cpp

@@ -26,13 +26,9 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/shaders/gl_shader.h"
-#include "gl/renderer/gl_renderstate.h"
-#include "v_palette.h"
-#include "v_video.h"
 #include "gl_swscene.h"
 #include "w_wad.h"
 #include "d_player.h"

src/gl/scene/gl_vertex.cpp

@@ -25,12 +25,8 @@
 #include "gl/system/gl_system.h"
 
 #include "gl/renderer/gl_renderer.h"
-#include "gl/renderer/gl_lightdata.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 
 EXTERN_CVAR(Bool, gl_seamless)
 

src/gl/scene/gl_walls.cpp

@@ -24,15 +24,11 @@
 #include "p_local.h"
 #include "p_lnspec.h"
 #include "a_sharedglobal.h"
-#include "g_level.h"
-#include "templates.h"
-#include "vectors.h"
 #include "r_defs.h"
 #include "r_sky.h"
 #include "r_utility.h"
 #include "p_maputl.h"
 #include "doomdata.h"
-#include "portal.h"
 #include "g_levellocals.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
@@ -43,7 +39,6 @@
 #include "gl/scene/gl_scenedrawer.h"
 #include "gl/textures/gl_material.h"
 #include "gl/utility/gl_clock.h"
-#include "gl/shaders/gl_shader.h"
 
 
 void FDrawInfo::AddWall(GLWall *wall)

src/gl/scene/gl_walls_draw.cpp

@@ -25,7 +25,6 @@
 #include "p_lnspec.h"
 #include "a_sharedglobal.h"
 #include "g_levellocals.h"
-#include "actor.h"
 #include "actorinlines.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
@@ -39,9 +38,6 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 EXTERN_CVAR(Bool, gl_seamless)

src/gl/scene/gl_weapon.cpp

@@ -31,7 +31,6 @@
 #include "v_video.h"
 #include "doomstat.h"
 #include "d_player.h"
-#include "g_level.h"
 #include "g_levellocals.h"
 
 #include "gl/system/gl_interface.h"
@@ -43,8 +42,6 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
 #include "gl/models/gl_models.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 #include "gl/renderer/gl_quaddrawer.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 

src/gl/shaders/gl_ambientshader.cpp

@@ -21,11 +21,7 @@
 //
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_ambientshader.h"
 

src/gl/shaders/gl_ambientshader.h

@@ -1,6 +1,8 @@
 #ifndef __GL_AMBIENTSHADER_H
 #define __GL_AMBIENTSHADER_H
 
+#include <memory>
+
 #include "gl_shaderprogram.h"
 
 class FLinearDepthShader
@@ -90,4 +92,4 @@ private:
 	bool mMultisample = false;
 };
 
-#endif
+#endif

src/gl/shaders/gl_bloomshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_bloomshader.h"
 
 void FBloomExtractShader::Bind()

src/gl/shaders/gl_blurshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_blurshader.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/shaders/gl_colormapshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_colormapshader.h"
 
 void FColormapShader::Bind()

src/gl/shaders/gl_lensshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_lensshader.h"
 
 void FLensShader::Bind()

src/gl/shaders/gl_postprocessshader.cpp

@@ -21,20 +21,15 @@
 //
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
 #include "w_wad.h"
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_debug.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/shaders/gl_postprocessshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
-#include "textures/textures.h"
 #include "textures/bitmap.h"
 
 CVAR(Bool, gl_custompost, true, 0)

src/gl/shaders/gl_present3dRowshader.cpp

@@ -28,12 +28,6 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
-#include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_present3dRowshader.h"
 
 void FPresentStereoShaderBase::Init(const char * vtx_shader_name, const char * program_name)

src/gl/shaders/gl_presentshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_presentshader.h"
 
 void FPresentShaderBase::Init(const char * vtx_shader_name, const char * program_name)

src/gl/shaders/gl_shader.cpp

@@ -29,12 +29,8 @@
 #include "gl/system/gl_system.h"
 #include "c_cvars.h"
 #include "v_video.h"
-#include "name.h"
 #include "w_wad.h"
-#include "i_system.h"
 #include "doomerrors.h"
-#include "v_palette.h"
-#include "sc_man.h"
 #include "cmdlib.h"
 #include "vm.h"
 #include "d_player.h"
@@ -44,11 +40,8 @@
 #include "r_data/matrix.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_shader.h"
-#include "gl/shaders/gl_shaderprogram.h"
 #include "gl/shaders/gl_postprocessshader.h"
-#include "gl/textures/gl_material.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 
 static bool IsGlslWhitespace(char c)

src/gl/shaders/gl_shaderprogram.cpp

@@ -26,16 +26,12 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/shaders/gl_shaderprogram.h"
 #include "w_wad.h"
-#include "i_system.h"
-#include "doomerrors.h"
 
 FShaderProgram::FShaderProgram()
 {

src/gl/shaders/gl_shadowmapshader.cpp

@@ -22,12 +22,6 @@
 
 #include "gl/system/gl_system.h"
 #include "files.h"
-#include "m_swap.h"
-#include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_shadowmapshader.h"
 
 void FShadowMapShader::Bind()

src/gl/shaders/gl_tonemapshader.cpp

@@ -26,11 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_tonemapshader.h"
 

src/gl/stereo3d/gl_anaglyph.cpp

@@ -26,7 +26,6 @@
 */
 
 #include "gl_anaglyph.h"
-#include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
 
 namespace s3d {

src/gl/stereo3d/gl_interleaved3d.cpp

@@ -34,9 +34,7 @@
 */
 
 #include "gl_interleaved3d.h"
-#include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 #include "gl/system/gl_framebuffer.h"
 #include "gl/shaders/gl_present3dRowshader.h"

src/gl/stereo3d/gl_quadstereo.cpp

@@ -26,7 +26,6 @@
 */
 
 #include "gl_quadstereo.h"
-#include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
 
 namespace s3d {

src/gl/stereo3d/gl_sidebyside3d.cpp

@@ -34,7 +34,6 @@
 */
 
 #include "gl_sidebyside3d.h"
-#include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
 
 namespace s3d {

src/gl/stereo3d/gl_stereo3d.cpp

@@ -27,9 +27,6 @@
 
 #include "gl/system/gl_system.h"
 #include "gl/stereo3d/gl_stereo3d.h"
-#include "gl/renderer/gl_renderer.h"
-#include "vectors.h" // RAD2DEG
-#include "doomtype.h" // M_PI
 
 namespace s3d {
 

src/gl/stereo3d/gl_stereo_cvars.cpp

@@ -31,7 +31,6 @@
 #include "gl/stereo3d/gl_quadstereo.h"
 #include "gl/stereo3d/gl_sidebyside3d.h"
 #include "gl/stereo3d/gl_interleaved3d.h"
-#include "gl/system/gl_cvars.h"
 #include "version.h"
 
 // Set up 3D-specific console variables:

src/gl/stereo3d/gl_stereo_leftright.cpp

@@ -33,7 +33,6 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include <cmath>
 
 EXTERN_CVAR(Float, vr_screendist)
 EXTERN_CVAR(Float, vr_hunits_per_meter)

src/gl/system/gl_debug.cpp

@@ -27,17 +27,12 @@
 
 #include "templates.h"
 #include "gl/system/gl_system.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "stats.h"
 #include <set>
 #include <string>
 #include <vector>
 
-#ifndef _MSC_VER
-#include <signal.h>
-#endif
-
 CUSTOM_CVAR(Int, gl_debug_level, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	if (!FGLDebug::HasDebugApi())

src/gl/system/gl_framebuffer.cpp

@@ -27,23 +27,14 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "doomstat.h"
 #include "m_png.h"
-#include "m_crc32.h"
-#include "vectors.h"
-#include "v_palette.h"
 #include "templates.h"
-#include "textures/skyboxtexture.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include "gl/renderer/gl_renderstate.h"
-#include "gl/renderer/gl_lightdata.h"
-#include "gl/textures/gl_hwtexture.h"
 #include "gl/textures/gl_samplers.h"
 #include "gl/utility/gl_clock.h"
 #include "gl/data/gl_vertexbuffer.h"

src/gl/system/gl_interface.cpp

@@ -30,11 +30,7 @@
 #include "tarray.h"
 #include "doomtype.h"
 #include "m_argv.h"
-#include "zstring.h"
 #include "version.h"
-#include "i_system.h"
-#include "v_text.h"
-#include "r_data/r_translate.h"
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"
 

src/gl/system/gl_menu.cpp

@@ -23,12 +23,8 @@
 
 #include "gl/system/gl_system.h"
 #include "c_cvars.h"
-#include "c_dispatch.h"
 #include "v_video.h"
-#include "version.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"
-#include "gl/renderer/gl_renderer.h"
 #include "menu/menu.h"
 
 

src/gl/system/gl_wipe.cpp

@@ -30,16 +30,12 @@
 #include "w_wad.h"
 #include "v_palette.h"
 #include "templates.h"
-#include "vectors.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 #include "gl/textures/gl_samplers.h"
 #include "gl/data/gl_vertexbuffer.h"
 

src/gl/textures/gl_hwtexture.cpp

@@ -28,10 +28,7 @@
 
 #include "gl/system/gl_system.h"
 #include "templates.h"
-#include "m_crc32.h"
 #include "c_cvars.h"
-#include "c_dispatch.h"
-#include "v_palette.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"

src/gl/textures/gl_material.cpp

@@ -24,23 +24,12 @@
 #include "w_wad.h"
 #include "m_png.h"
 #include "sbar.h"
-#include "gi.h"
-#include "cmdlib.h"
-#include "c_dispatch.h"
 #include "stats.h"
 #include "r_utility.h"
-#include "templates.h"
-#include "sc_man.h"
-#include "r_data/renderstyle.h"
-#include "colormatcher.h"
 #include "textures/warpbuffer.h"
-#include "textures/bitmap.h"
-
-//#include "gl/gl_intern.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
-#include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/textures/gl_material.h"
 #include "gl/textures/gl_samplers.h"

src/gl/textures/gl_samplers.cpp

@@ -21,9 +21,7 @@
 //
 
 #include "gl/system/gl_system.h"
-#include "templates.h"
 #include "c_cvars.h"
-#include "c_dispatch.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_cvars.h"

src/gl/textures/gl_texture.cpp

@@ -27,15 +27,10 @@
 #include "gl/system/gl_system.h"
 #include "c_cvars.h"
 #include "w_wad.h"
-#include "templates.h"
-#include "colormatcher.h"
 #include "r_data/r_translate.h"
 #include "c_dispatch.h"
 #include "r_state.h"
 #include "actor.h"
-#include "cmdlib.h"
-#include "v_palette.h"
-#include "sc_man.h"
 #include "textures/skyboxtexture.h"
 
 #include "gl/system/gl_interface.h"