Move renders into folders

src/CMakeLists.txt

@@ -765,6 +765,13 @@ file( GLOB HEADER_FILES
 	scripting/zscript/*.h
 	scripting/vm/*.h
 	xlat/*.h
+	swrenderer/*.h
+	swrenderer/drawers/*.h
+	swrenderer/scene/*.h
+	polyrenderer/*.h
+	polyrenderer/math/*.h
+	polyrenderer/drawers/*.h
+	polyrenderer/scene/*.h
 	gl/*.h
 	gl/api/*.h
 	gl/data/*.h
@@ -799,35 +806,35 @@ set( NOT_COMPILED_SOURCE_FILES
 )
 
 set( FASTMATH_PCH_SOURCES
-	r_swrenderer.cpp
-	r_poly.cpp
-	r_poly_scene.cpp
-	r_poly_portal.cpp
-	r_poly_cull.cpp
-	r_poly_decal.cpp
-	r_poly_particle.cpp
-	r_poly_plane.cpp
-	r_poly_playersprite.cpp
-	r_poly_wall.cpp
-	r_poly_wallsprite.cpp
-	r_poly_sprite.cpp
-	r_poly_sky.cpp
-	r_poly_triangle.cpp
-	r_poly_intersection.cpp
-	r_3dfloors.cpp
-	r_bsp.cpp
-	r_draw.cpp
-	r_draw_pal.cpp
-	r_draw_rgba.cpp
-	r_drawers.cpp
-	r_thread.cpp
-	r_main.cpp
-	r_plane.cpp
-	r_segs.cpp
+	swrenderer/r_swrenderer.cpp
+	swrenderer/r_main.cpp
+	swrenderer/drawers/r_draw.cpp
+	swrenderer/drawers/r_draw_pal.cpp
+	swrenderer/drawers/r_draw_rgba.cpp
+	swrenderer/drawers/r_drawers.cpp
+	swrenderer/drawers/r_thread.cpp
+	swrenderer/scene/r_3dfloors.cpp
+	swrenderer/scene/r_bsp.cpp
+	swrenderer/scene/r_plane.cpp
+	swrenderer/scene/r_segs.cpp
+	swrenderer/scene/r_things.cpp
+	swrenderer/scene/r_voxel.cpp
+	swrenderer/scene/r_walldraw.cpp
+	polyrenderer/poly_renderer.cpp
+	polyrenderer/scene/poly_scene.cpp
+	polyrenderer/scene/poly_portal.cpp
+	polyrenderer/scene/poly_cull.cpp
+	polyrenderer/scene/poly_decal.cpp
+	polyrenderer/scene/poly_particle.cpp
+	polyrenderer/scene/poly_plane.cpp
+	polyrenderer/scene/poly_playersprite.cpp
+	polyrenderer/scene/poly_wall.cpp
+	polyrenderer/scene/poly_wallsprite.cpp
+	polyrenderer/scene/poly_sprite.cpp
+	polyrenderer/scene/poly_sky.cpp
+	polyrenderer/drawers/poly_triangle.cpp
+	polyrenderer/math/poly_intersection.cpp
 	r_sky.cpp
-	r_things.cpp
-	r_voxel.cpp
-	r_walldraw.cpp
 	s_advsound.cpp
 	s_environment.cpp
 	s_playlist.cpp
@@ -1441,8 +1448,13 @@ source_group("OpenGL Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOU
 source_group("OpenGL Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/system/.+")
 source_group("OpenGL Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/textures/.+")
 source_group("OpenGL Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/utility/.+")
-source_group("Render Core\\Render Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.h$")
-source_group("Render Core\\Render Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.cpp$")
+source_group("Software Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/.+")
+source_group("Software Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/drawers/.+")
+source_group("Software Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/swrenderer/scene/.+")
+source_group("Poly Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/.+")
+source_group("Poly Renderer\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/math/.+")
+source_group("Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/drawers/.+")
+source_group("Poly Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/scene/.+")
 source_group("Render Data\\Resource Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+\\.h$")
 source_group("Render Data\\Resource Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+\\.cpp$")
 source_group("Render Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/.+")

src/gl/system/gl_swframebuffer.cpp

@@ -57,7 +57,7 @@
 #include "v_pfx.h"
 #include "stats.h"
 #include "doomerrors.h"
-#include "r_main.h"
+#include "swrenderer/r_main.h"
 #include "r_data/r_translate.h"
 #include "f_wipe.h"
 #include "sbar.h"

src/gl/system/gl_swwipe.cpp

@@ -53,7 +53,7 @@
 #include "v_pfx.h"
 #include "stats.h"
 #include "doomerrors.h"
-#include "r_main.h"
+#include "swrenderer/r_main.h"
 #include "r_data/r_translate.h"
 #include "f_wipe.h"
 #include "sbar.h"

src/polyrenderer/drawers/poly_triangle.cpp

@@ -25,7 +25,6 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "r_local.h"
 #include "v_video.h"
 #include "doomstat.h"
 #include "st_stuff.h"
@@ -34,8 +33,9 @@
 #include "r_data/r_translate.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
-#include "r_poly_triangle.h"
-#include "r_draw_rgba.h"
+#include "poly_triangle.h"
+#include "swrenderer/drawers/r_draw_rgba.h"
+#include "swrenderer/r_main.h"
 
 CVAR(Bool, r_debug_trisetup, false, 0);
 

src/polyrenderer/drawers/poly_triangle.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "r_draw.h"
-#include "r_thread.h"
-#include "r_drawers.h"
+#include "swrenderer/drawers/r_draw.h"
+#include "swrenderer/drawers/r_thread.h"
+#include "swrenderer/drawers/r_drawers.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
 

src/polyrenderer/math/poly_intersection.cpp

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include "templates.h"
 #include "doomdef.h"
-#include "r_poly_intersection.h"
+#include "poly_intersection.h"
 
 IntersectionTest::Result IntersectionTest::plane_aabb(const Vec4f &plane, const AxisAlignedBoundingBox &aabb)
 {

src/polyrenderer/math/poly_intersection.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 #include <algorithm>
 #include <cmath>
 

src/polyrenderer/poly_renderer.cpp

@@ -26,7 +26,7 @@
 #include "sbar.h"
 #include "r_data/r_translate.h"
 #include "r_data/r_interpolate.h"
-#include "r_poly.h"
+#include "poly_renderer.h"
 #include "gl/data/gl_data.h"
 #include "d_net.h"
 #include "po_man.h"

src/polyrenderer/poly_renderer.h

@@ -28,10 +28,10 @@
 #include <functional>
 #include "doomdata.h"
 #include "r_utility.h"
-#include "r_main.h"
-#include "r_poly_portal.h"
-#include "r_poly_playersprite.h"
-#include "r_poly_sky.h"
+#include "swrenderer/r_main.h"
+#include "scene/poly_portal.h"
+#include "scene/poly_playersprite.h"
+#include "scene/poly_sky.h"
 
 class AActor;
 class DCanvas;

src/polyrenderer/scene/poly_cull.cpp

@@ -25,8 +25,8 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_cull.h"
-#include "r_poly.h"
+#include "poly_cull.h"
+#include "polyrenderer/poly_renderer.h"
 
 void PolyCull::CullScene(const TriMatrix &worldToClip, const Vec4f &portalClipPlane)
 {

src/polyrenderer/scene/poly_cull.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
-#include "r_poly_intersection.h"
+#include "polyrenderer/drawers/poly_triangle.h"
+#include "polyrenderer/math/poly_intersection.h"
 
 enum class LineSegmentRange
 {

src/polyrenderer/scene/poly_decal.cpp

@@ -25,8 +25,8 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_decal.h"
-#include "r_poly.h"
+#include "poly_decal.h"
+#include "polyrenderer/poly_renderer.h"
 #include "a_sharedglobal.h"
 
 void RenderPolyDecal::RenderWallDecals(const TriMatrix &worldToClip, const Vec4f &clipPlane, const seg_t *line, uint32_t subsectorDepth, uint32_t stencilValue)

src/polyrenderer/scene/poly_decal.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 
 class Vec4f;
 

src/polyrenderer/scene/poly_particle.cpp

@@ -25,8 +25,8 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_particle.h"
-#include "r_poly.h"
+#include "poly_particle.h"
+#include "polyrenderer/poly_renderer.h"
 
 void RenderPolyParticle::Render(const TriMatrix &worldToClip, const Vec4f &clipPlane, particle_t *particle, subsector_t *sub, uint32_t subsectorDepth, uint32_t stencilValue)
 {

src/polyrenderer/scene/poly_particle.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 #include "p_effect.h"
 
 class Vec4f;

src/polyrenderer/scene/poly_plane.cpp

@@ -25,9 +25,9 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_plane.h"
-#include "r_poly_portal.h"
-#include "r_poly.h"
+#include "poly_plane.h"
+#include "poly_portal.h"
+#include "polyrenderer/poly_renderer.h"
 #include "r_sky.h"
 
 EXTERN_CVAR(Int, r_3dfloors)

src/polyrenderer/scene/poly_plane.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 
 class PolyDrawSectorPortal;
 class PolyCull;

src/polyrenderer/scene/poly_playersprite.cpp

@@ -25,9 +25,9 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_playersprite.h"
-#include "r_poly.h"
-#include "r_things.h" // for pspritexscale
+#include "poly_playersprite.h"
+#include "polyrenderer/poly_renderer.h"
+#include "swrenderer/scene/r_things.h" // for pspritexscale
 
 EXTERN_CVAR(Bool, r_drawplayersprites)
 EXTERN_CVAR(Bool, r_deathcamera)

src/polyrenderer/scene/poly_portal.cpp

@@ -26,8 +26,8 @@
 #include "p_maputl.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_portal.h"
-#include "r_poly.h"
+#include "poly_portal.h"
+#include "polyrenderer/poly_renderer.h"
 #include "gl/data/gl_data.h"
 
 extern bool r_showviewer;

src/polyrenderer/scene/poly_portal.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_scene.h"
+#include "poly_scene.h"
 
 struct PolyPortalVertexRange
 {

src/polyrenderer/scene/poly_scene.cpp

@@ -26,8 +26,8 @@
 #include "p_maputl.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_scene.h"
-#include "r_poly.h"
+#include "polyrenderer/scene/poly_scene.h"
+#include "polyrenderer/poly_renderer.h"
 #include "gl/data/gl_data.h"
 
 CVAR(Bool, r_debug_cull, 0, 0)

src/polyrenderer/scene/poly_scene.h

@@ -28,16 +28,16 @@
 #include <functional>
 #include "doomdata.h"
 #include "r_utility.h"
-#include "r_main.h"
-#include "r_poly_triangle.h"
-#include "r_poly_intersection.h"
-#include "r_poly_wall.h"
-#include "r_poly_sprite.h"
-#include "r_poly_wallsprite.h"
-#include "r_poly_playersprite.h"
-#include "r_poly_particle.h"
-#include "r_poly_plane.h"
-#include "r_poly_cull.h"
+#include "swrenderer/r_main.h"
+#include "polyrenderer/drawers/poly_triangle.h"
+#include "polyrenderer/math/poly_intersection.h"
+#include "poly_wall.h"
+#include "poly_sprite.h"
+#include "poly_wallsprite.h"
+#include "poly_playersprite.h"
+#include "poly_particle.h"
+#include "poly_plane.h"
+#include "poly_cull.h"
 #include <set>
 #include <unordered_map>
 

src/polyrenderer/scene/poly_sky.cpp

@@ -24,8 +24,8 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_sky.h"
-#include "r_poly_portal.h"
+#include "poly_sky.h"
+#include "poly_portal.h"
 #include "r_sky.h" // for skyflatnum
 
 PolySkyDome::PolySkyDome()

src/polyrenderer/scene/poly_sky.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 
 class PolySkyDome
 {

src/polyrenderer/scene/poly_sprite.cpp

@@ -25,9 +25,9 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_sprite.h"
-#include "r_poly.h"
-#include "r_poly_intersection.h"
+#include "poly_sprite.h"
+#include "polyrenderer/poly_renderer.h"
+#include "polyrenderer/math/poly_intersection.h"
 
 EXTERN_CVAR(Float, transsouls)
 EXTERN_CVAR(Int, r_drawfuzz)

src/polyrenderer/scene/poly_sprite.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 
 class Vec4f;
 

src/polyrenderer/scene/poly_wall.cpp

@@ -28,9 +28,9 @@
 #include "p_lnspec.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_wall.h"
-#include "r_poly_decal.h"
-#include "r_poly.h"
+#include "poly_wall.h"
+#include "poly_decal.h"
+#include "polyrenderer/poly_renderer.h"
 #include "r_sky.h"
 
 EXTERN_CVAR(Bool, r_drawmirrors)

src/polyrenderer/scene/poly_wall.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 
 class PolyTranslucentObject;
 class PolyDrawLinePortal;

src/polyrenderer/scene/poly_wallsprite.cpp

@@ -25,8 +25,8 @@
 #include "doomdef.h"
 #include "sbar.h"
 #include "r_data/r_translate.h"
-#include "r_poly_wallsprite.h"
-#include "r_poly.h"
+#include "poly_wallsprite.h"
+#include "polyrenderer/poly_renderer.h"
 
 void RenderPolyWallSprite::Render(const TriMatrix &worldToClip, const Vec4f &clipPlane, AActor *thing, subsector_t *sub, uint32_t subsectorDepth, uint32_t stencilValue)
 {

src/polyrenderer/scene/poly_wallsprite.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "r_poly_triangle.h"
+#include "polyrenderer/drawers/poly_triangle.h"
 
 class Vec4f;
 

src/portal.cpp

@@ -40,8 +40,6 @@
 #include "p_local.h"
 #include "p_blockmap.h"
 #include "p_lnspec.h"
-#include "r_bsp.h"
-#include "r_segs.h"
 #include "c_cvars.h"
 #include "m_bbox.h"
 #include "p_tags.h"

src/swrenderer/drawers/r_draw.cpp

@@ -38,7 +38,7 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "v_video.h"
 #include "doomstat.h"
 #include "st_stuff.h"
@@ -47,7 +47,7 @@
 #include "r_data/r_translate.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_plane.h"
 #include "r_draw.h"
 #include "r_draw_rgba.h"
 #include "r_draw_pal.h"

src/swrenderer/drawers/r_draw_pal.cpp

@@ -39,8 +39,8 @@
 #include "doomdef.h"
 #include "r_defs.h"
 #include "r_draw.h"
-#include "r_main.h"
-#include "r_things.h"
+#include "swrenderer/r_main.h"
+#include "swrenderer/scene/r_things.h"
 #include "v_video.h"
 #include "r_draw_pal.h"
 

src/swrenderer/drawers/r_draw_rgba.cpp

@@ -27,7 +27,7 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "v_video.h"
 #include "doomstat.h"
 #include "st_stuff.h"
@@ -36,7 +36,7 @@
 #include "r_data/r_translate.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
-#include "r_plane.h"
+#include "swrenderer/scene/r_plane.h"
 #include "r_draw_rgba.h"
 #include "r_drawers.h"
 #include "gl/data/gl_matrix.h"

src/swrenderer/drawers/r_thread.cpp

@@ -25,7 +25,7 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "v_video.h"
 #include "doomstat.h"
 #include "st_stuff.h"

src/swrenderer/r_local.h

@@ -34,7 +34,7 @@
 // Separate header file for each module.
 //
 #include "r_main.h"
-#include "r_things.h"
-#include "r_draw.h"
+#include "scene/r_things.h"
+#include "drawers/r_draw.h"
 
 #endif // __R_LOCAL_H__

src/swrenderer/r_main.cpp

@@ -35,12 +35,12 @@
 #include "m_random.h"
 #include "m_bbox.h"
 #include "r_local.h"
-#include "r_plane.h"
-#include "r_bsp.h"
-#include "r_segs.h"
-#include "r_3dfloors.h"
+#include "scene/r_plane.h"
+#include "scene/r_bsp.h"
+#include "scene/r_segs.h"
+#include "scene/r_3dfloors.h"
 #include "r_sky.h"
-#include "r_draw_rgba.h"
+#include "drawers/r_draw_rgba.h"
 #include "st_stuff.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"

src/swrenderer/r_swrenderer.cpp

@@ -37,14 +37,14 @@
 #include "v_palette.h"
 #include "v_video.h"
 #include "m_png.h"
-#include "r_bsp.h"
+#include "scene/r_bsp.h"
 #include "r_swrenderer.h"
-#include "r_3dfloors.h"
+#include "scene/r_3dfloors.h"
 #include "textures/textures.h"
 #include "r_data/voxels.h"
-#include "r_draw_rgba.h"
-#include "r_drawers.h"
-#include "r_poly.h"
+#include "drawers/r_draw_rgba.h"
+#include "drawers/r_drawers.h"
+#include "polyrenderer/poly_renderer.h"
 #include "p_setup.h"
 
 void gl_ParseDefs();

src/swrenderer/scene/r_3dfloors.cpp

@@ -9,7 +9,7 @@
 #include "doomdef.h"
 #include "p_local.h"
 #include "c_dispatch.h"
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "r_bsp.h"
 #include "r_plane.h"
 #include "c_cvars.h"

src/swrenderer/scene/r_bsp.cpp

@@ -32,10 +32,10 @@
 #include "p_lnspec.h"
 #include "p_setup.h"
 
-#include "r_local.h"
-#include "r_main.h"
+#include "swrenderer/r_local.h"
+#include "swrenderer/r_main.h"
 #include "r_plane.h"
-#include "r_draw.h"
+#include "swrenderer/drawers/r_draw.h"
 #include "r_things.h"
 #include "r_3dfloors.h"
 #include "a_sharedglobal.h"

src/swrenderer/scene/r_plane.cpp

@@ -42,7 +42,7 @@
 #include "doomdef.h"
 #include "doomstat.h"
 
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "r_sky.h"
 #include "stats.h"
 
@@ -58,7 +58,7 @@
 #include "r_3dfloors.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
-#include "r_draw_rgba.h"
+#include "swrenderer/drawers/r_draw_rgba.h"
 #include "gl/dynlights/gl_dynlight.h"
 
 #ifdef _MSC_VER

src/swrenderer/scene/r_segs.cpp

@@ -30,7 +30,7 @@
 #include "doomdata.h"
 #include "p_lnspec.h"
 
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "r_sky.h"
 #include "v_video.h"
 
@@ -44,7 +44,7 @@
 #include "r_plane.h"
 #include "r_segs.h"
 #include "r_3dfloors.h"
-#include "r_draw.h"
+#include "swrenderer/drawers/r_draw.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 

src/swrenderer/scene/r_things.cpp

@@ -37,7 +37,7 @@
 #include "m_swap.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -58,8 +58,8 @@
 #include "r_plane.h"
 #include "r_segs.h"
 #include "r_3dfloors.h"
-#include "r_draw_rgba.h"
-#include "r_draw_pal.h"
+#include "swrenderer/drawers/r_draw_rgba.h"
+#include "swrenderer/drawers/r_draw_pal.h"
 #include "v_palette.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"

src/swrenderer/scene/r_voxel.cpp

@@ -31,10 +31,10 @@
 #include "d_net.h"
 #include "po_man.h"
 #include "r_things.h"
-#include "r_draw.h"
-#include "r_thread.h"
+#include "swrenderer/drawers/r_draw.h"
+#include "swrenderer/drawers/r_thread.h"
 #include "r_utility.h"
-#include "r_main.h"
+#include "swrenderer/r_main.h"
 #include "r_voxel.h"
 
 namespace swrenderer

src/swrenderer/scene/r_walldraw.cpp

@@ -27,7 +27,7 @@
 #include "doomstat.h"
 #include "doomdata.h"
 
-#include "r_local.h"
+#include "swrenderer/r_local.h"
 #include "r_sky.h"
 #include "v_video.h"
 
@@ -35,7 +35,7 @@
 #include "a_sharedglobal.h"
 #include "d_net.h"
 #include "g_level.h"
-#include "r_draw.h"
+#include "swrenderer/drawers/r_draw.h"
 #include "r_bsp.h"
 #include "r_plane.h"
 #include "r_segs.h"
@@ -43,7 +43,7 @@
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 #include "gl/dynlights/gl_dynlight.h"
-#include "r_drawers.h"
+#include "swrenderer/drawers/r_drawers.h"
 
 namespace swrenderer
 {

src/v_draw.cpp

@@ -43,10 +43,10 @@
 #include "r_defs.h"
 #include "r_utility.h"
 #ifndef NO_SWRENDER
-#include "r_draw.h"
-#include "r_draw_rgba.h"
-#include "r_main.h"
-#include "r_things.h"
+#include "swrenderer/drawers/r_draw.h"
+#include "swrenderer/drawers/r_draw_rgba.h"
+#include "swrenderer/r_main.h"
+#include "swrenderer/scene/r_things.h"
 #endif
 #include "r_data/r_translate.h"
 #include "doomstat.h"

src/win32/fb_d3d9.cpp

@@ -63,7 +63,7 @@
 #include "v_pfx.h"
 #include "stats.h"
 #include "doomerrors.h"
-#include "r_main.h"
+#include "swrenderer/r_main.h"
 #include "r_data/r_translate.h"
 #include "f_wipe.h"
 #include "sbar.h"

src/win32/hardware.cpp

@@ -47,7 +47,7 @@
 #include "doomstat.h"
 #include "m_argv.h"
 #include "version.h"
-#include "r_swrenderer.h"
+#include "swrenderer/r_swrenderer.h"
 
 EXTERN_CVAR (Bool, ticker)
 EXTERN_CVAR (Bool, fullscreen)

src/win32/win32video.cpp

@@ -69,7 +69,7 @@
 #include "m_argv.h"
 #include "r_defs.h"
 #include "v_text.h"
-#include "r_swrenderer.h"
+#include "swrenderer/r_swrenderer.h"
 #include "version.h"
 
 #include "win32iface.h"

tools/drawergen/precomp.h

@@ -2,4 +2,4 @@
 #pragma once
 
 #include "llvm_include.h"
-#include "../../src/r_drawers.h"
+#include "../../src/swrenderer/drawers/r_drawers.h"