- moved gl_clipper and gl_fakeflat to the hwrenderer folder because both files do not contain anything API specific.

src/CMakeLists.txt

@@ -825,8 +825,6 @@ set( FASTMATH_SOURCES
 	textures/hires/xbr/xbrz.cpp
 	textures/hires/xbr/xbrz_old.cpp
 	gl/scene/gl_bsp.cpp
-	gl/scene/gl_fakeflat.cpp
-	gl/scene/gl_clipper.cpp
 	gl/scene/gl_decal.cpp
 	gl/scene/gl_drawinfo.cpp
 	gl/scene/gl_flats.cpp
@@ -845,6 +843,8 @@ set( FASTMATH_SOURCES
 	gl_load/gl_load.c
 	gl/models/gl_models.cpp
 	hwrenderer/dynlights/hw_dynlightdata.cpp
+	hwrenderer/scene/hw_fakeflat.cpp
+	hwrenderer/scene/hw_clipper.cpp
 	r_data/models/models.cpp
 	r_data/matrix.cpp
 	sound/adlmidi/adldata.cpp

src/gl/renderer/gl_renderer.h

@@ -234,19 +234,7 @@ public:
 	static float GetZFar() { return 65536.f; }
 };
 
-enum area_t
+#include "hwrenderer/scene/hw_fakeflat.h"
-{
-	area_normal,
-	area_below,
-	area_above,
-	area_default
-};
-
-
-// Global functions. Make them members of GLRenderer later?
-bool gl_CheckClip(side_t * sidedef, sector_t * frontsector, sector_t * backsector);
-sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
-area_t gl_CheckViewArea(area_t in_area, vertex_t *v1, vertex_t *v2, sector_t *frontsector, sector_t *backsector);
 
 struct TexFilter_s
 {

src/gl/scene/gl_portal.cpp

@@ -46,7 +46,7 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_quaddrawer.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/scene/gl_clipper.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"

src/gl/scene/gl_scene.cpp

@@ -55,7 +55,7 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/scene/gl_clipper.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"

src/gl/scene/gl_scenedrawer.h

@@ -2,7 +2,7 @@
 
 #include "r_defs.h"
 #include "m_fixed.h"
-#include "gl_clipper.h"
+#include "hwrenderer/scene/hw_clipper.h"
 #include "gl_portal.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/scene/gl_swscene.h

@@ -3,7 +3,7 @@
 
 #include "r_defs.h"
 #include "m_fixed.h"
-#include "gl_clipper.h"
+#include "hwrenderer/scene/hw_clipper.h"
 #include "gl_portal.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"

src/hwrenderer/scene/hw_clipper.cpp

@@ -35,7 +35,7 @@
 **
 */
 
-#include "gl/scene/gl_clipper.h"
+#include "hw_clipper.h"
 #include "g_levellocals.h"
 
 unsigned Clipper::starttime;

src/hwrenderer/scene/hw_fakeflat.cpp

@@ -30,8 +30,7 @@
 #include "g_levellocals.h"
 #include "a_sharedglobal.h"
 #include "r_sky.h"
-#include "gl/renderer/gl_renderer.h"
+#include "hw_fakeflat.h"
-#include "gl/scene/gl_scenedrawer.h"
 
 
 //==========================================================================

src/hwrenderer/scene/hw_fakeflat.h

@@ -0,0 +1,16 @@
+#pragma once
+
+enum area_t
+{
+	area_normal,
+	area_below,
+	area_above,
+	area_default
+};
+
+
+// Global functions. Make them members of GLRenderer later?
+bool gl_CheckClip(side_t * sidedef, sector_t * frontsector, sector_t * backsector);
+sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
+area_t gl_CheckViewArea(area_t in_area, vertex_t *v1, vertex_t *v2, sector_t *frontsector, sector_t *backsector);
+