- moved the software renderer's drawer to the swrenderer directory.

src/CMakeLists.txt

@@ -801,6 +801,7 @@ set( NOT_COMPILED_SOURCE_FILES
 # Enable fast math for some sources
 set( FASTMATH_SOURCES
 	swrenderer/r_all.cpp
+	swrenderer/r_swscene.cpp
 	polyrenderer/poly_all.cpp
 	sound/oplsynth/opl_mus_player.cpp
 	sound/mpg123_decoder.cpp
@@ -822,7 +823,6 @@ set( FASTMATH_SOURCES
 	gl/scene/gl_skydome.cpp
 	gl/scene/gl_weapon.cpp
 	gl/scene/gl_scene.cpp
-	gl/scene/gl_swscene.cpp
 	gl/scene/gl_portal.cpp
 	gl/scene/gl_walls_draw.cpp
 	gl_load/gl_load.c

src/gl/renderer/gl_renderer.cpp

@@ -35,6 +35,7 @@
 #include "p_effect.h"
 #include "d_player.h"
 #include "a_dynlight.h"
+#include "swrenderer/r_swscene.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
@@ -47,7 +48,6 @@
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/scene/gl_swscene.h"
 #include "gl/shaders/gl_ambientshader.h"
 #include "gl/shaders/gl_bloomshader.h"
 #include "gl/shaders/gl_blurshader.h"

src/swrenderer/r_swscene.cpp

@@ -20,22 +20,20 @@
 //--------------------------------------------------------------------------
 //
 /*
-** gl_swscene.cpp
+** r_swscene.cpp
-** common overlay code for software and hardware renderer
+** render the software scene through the hardware rendering backend
 **
 */
 
 #include "hwrenderer/textures/hw_ihwtexture.h"
 #include "hwrenderer/textures/hw_material.h"
 #include "r_renderer.h"
-#include "gl_swscene.h"
+#include "r_swscene.h"
 #include "w_wad.h"
 #include "d_player.h"
 #include "textures/bitmap.h"
 #include "swrenderer/scene/r_light.h"
 
-#include "gl/renderer/gl_renderer.h"
-
 // [RH] Base blending values (for e.g. underwater)
 int BaseBlendR, BaseBlendG, BaseBlendB;
 float BaseBlendA;