- moved the remaining core parts of the GL renderer to 'common'.

src/CMakeLists.txt

@@ -659,9 +659,6 @@ file( GLOB HEADER_FILES
 	rendering/vulkan/renderer/*.h
 	rendering/vulkan/shaders/*.h
 	rendering/vulkan/textures/*.h
-	rendering/gl/renderer/*.h
-	rendering/gl/shaders/*.h
-	rendering/gl/system/*.h
 	*.h
 )
 
@@ -935,9 +932,6 @@ set (PCH_SOURCES
 	g_statusbar/shared_sbar.cpp
 	rendering/2d/f_wipe.cpp
 	rendering/2d/v_blend.cpp
-	rendering/gl/renderer/gl_renderer.cpp
-	rendering/gl/renderer/gl_stereo3d.cpp
-	rendering/gl/system/gl_framebuffer.cpp
 	rendering/hwrenderer/hw_entrypoint.cpp
 	rendering/hwrenderer/data/hw_vertexbuilder.cpp
 	rendering/hwrenderer/dynlights/doom_aabbtree.cpp
@@ -946,7 +940,6 @@ set (PCH_SOURCES
 	rendering/hwrenderer/scene/hw_renderstate.cpp
 	rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp
 	rendering/hwrenderer/textures/hw_precache.cpp
-	rendering/hwrenderer/utility/hw_clock.cpp
 	rendering/hwrenderer/utility/hw_draw2d.cpp
 	rendering/hwrenderer/utility/hw_lighting.cpp
 	maploader/edata.cpp
@@ -1126,6 +1119,7 @@ set (PCH_SOURCES
 	common/rendering/v_framebuffer.cpp
 	common/rendering/v_video.cpp
 	common/rendering/r_videoscale.cpp
+	common/rendering/hwrenderer/data/hw_clock.cpp
 	common/rendering/hwrenderer/data/hw_skydome.cpp
 	common/rendering/hwrenderer/data/flatvertices.cpp
 	common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
@@ -1139,6 +1133,9 @@ set (PCH_SOURCES
 	common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
 	common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp
 	common/rendering/gl_load/gl_interface.cpp
+	common/rendering/gl/gl_renderer.cpp
+	common/rendering/gl/gl_stereo3d.cpp
+	common/rendering/gl/gl_framebuffer.cpp
 	common/rendering/gl/gl_renderstate.cpp
 	common/rendering/gl/gl_renderbuffers.cpp
 	common/rendering/gl/gl_postprocess.cpp
@@ -1420,15 +1417,6 @@ source_group("Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE
 source_group("Rendering\\Vulkan Renderer\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/.+")
 source_group("Rendering\\Vulkan Renderer\\Third Party\\Volk" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/volk/.+")
 source_group("Rendering\\Vulkan Renderer\\Third Party\\Vk_Mem_Alloc" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/vulkan/thirdparty/vk_mem_alloc.+")
-source_group("Rendering\\OpenGL Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/.+")
-source_group("Rendering\\OpenGL Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/data/.+")
-source_group("Rendering\\OpenGL Renderer\\Dynamic Lights" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/dynlights/.+")
-source_group("Rendering\\OpenGL Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/renderer/.+")
-source_group("Rendering\\OpenGL Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/scene/.+")
-source_group("Rendering\\OpenGL Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/shaders/.+")
-source_group("Rendering\\OpenGL Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/system/.+")
-source_group("Rendering\\OpenGL Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/textures/.+")
-source_group("Rendering\\OpenGL Renderer\\Utilities" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/gl/utility/.+")
 source_group("Rendering\\Software Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/.+")
 source_group("Rendering\\Software Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/drawers/.+")
 source_group("Rendering\\Software Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/swrenderer/scene/.+")

src/common/engine/i_interface.h

@@ -16,6 +16,7 @@ struct SystemCallbacks
 	bool (*DisableTextureFilter)();
 	void (*OnScreenSizeChanged)();
 	IntRect(*GetSceneRect)();
+	FString(*GetLocationDescription)();
 };
 
 extern SystemCallbacks *sysCallbacks;

src/common/platform/posix/cocoa/i_video.mm

@@ -53,7 +53,7 @@
 #include "version.h"
 #include "printf.h"
 
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 #ifdef HAVE_VULKAN
 #include "vulkan/system/vk_framebuffer.h"
 #endif

src/common/platform/posix/sdl/sdlglvideo.cpp

@@ -47,8 +47,8 @@
 #include "gl_sysfb.h"
 #include "gl_system.h"
 
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 
 #ifdef HAVE_VULKAN
 #include "rendering/vulkan/system/vk_framebuffer.h"

src/common/platform/win32/win32basevideo.cpp

@@ -52,7 +52,7 @@
 #include "win32basevideo.h"
 #include "cmdlib.h"
 
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 
 CVAR(Int, vid_adapter, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 

src/common/platform/win32/win32glvideo.cpp

@@ -53,7 +53,7 @@
 #include "engineerrors.h"
 #include "win32glvideo.h"
 
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 
 EXTERN_CVAR(Int, vid_adapter)
 EXTERN_CVAR(Bool, vid_hdr)

src/common/rendering/gl/gl_framebuffer.cpp

@@ -40,11 +40,11 @@
 #include "i_time.h"
 
 #include "gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "gl_renderbuffers.h"
 #include "gl_samplers.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hwrenderer/models/hw_models.h"
 #include "hw_skydome.h"

src/common/rendering/gl/gl_hwtexture.cpp

@@ -41,7 +41,7 @@
 #include "gl_interface.h"
 #include "hw_cvars.h"
 #include "gl_debug.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "gl_renderstate.h"
 #include "gl_samplers.h"
 

src/common/rendering/gl/gl_postprocess.cpp

@@ -22,10 +22,10 @@
 #include "gl_system.h"
 #include "m_png.h"
 #include "gl_buffers.h"
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 #include "gl_debug.h"
 #include "gl_renderbuffers.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "gl_postprocessstate.h"
 #include "gl_shaderprogram.h"
 #include "hwrenderer/postprocessing/hw_postprocess.h"

src/common/rendering/gl/gl_renderbuffers.cpp

@@ -25,7 +25,7 @@
 #include "printf.h"
 #include "hw_cvars.h"
 #include "gl_debug.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "gl_renderbuffers.h"
 #include "gl_postprocessstate.h"
 #include "gl_shaderprogram.h"

src/common/rendering/gl/gl_renderer.cpp

@@ -41,10 +41,10 @@
 #include "cmdlib.h"
 #include "version.h"
 #include "gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 #include "hw_cvars.h"
 #include "gl_debug.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "gl_renderstate.h"
 #include "gl_renderbuffers.h"
 #include "gl_shaderprogram.h"

src/common/rendering/gl/gl_renderer.h

@@ -1,14 +1,10 @@
 #ifndef __GL_RENDERER_H
 #define __GL_RENDERER_H
 
-#include "r_defs.h"
 #include "v_video.h"
 #include "vectors.h"
-#include "swrenderer/r_renderer.h"
 #include "matrix.h"
 #include "gl_renderbuffers.h"
-#include "hwrenderer/scene/hw_portal.h"
-#include "hw_shadowmap.h"
 #include <functional>
 
 #ifdef _MSC_VER
@@ -83,7 +79,6 @@ public:
 	void CopyToBackbuffer(const IntRect *bounds, bool applyGamma);
 	void DrawPresentTexture(const IntRect &box, bool applyGamma);
 	void Flush();
-	void Draw2D(F2DDrawer *data);
 	void BeginFrame();
     
 	bool StartOffscreen();

src/common/rendering/gl/gl_renderstate.cpp

@@ -31,12 +31,12 @@
 #include "hw_cvars.h"
 #include "flatvertices.h"
 #include "gl_shader.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "hw_lightbuffer.h"
 #include "gl_renderbuffers.h"
 #include "gl_hwtexture.h"
 #include "gl_buffers.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 
 namespace OpenGLRenderer

src/common/rendering/gl/gl_samplers.cpp

@@ -38,7 +38,7 @@
 #include "gl_interface.h"
 #include "hw_cvars.h"
 #include "gl_debug.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "gl_samplers.h"
 #include "hw_material.h"
 #include "i_interface.h"

src/common/rendering/gl/gl_shader.cpp

@@ -44,7 +44,7 @@
 #include "gl_interface.h"
 #include "gl_debug.h"
 #include "matrix.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include <map>
 #include <memory>
 

src/common/rendering/gl/gl_stereo3d.cpp

@@ -26,15 +26,15 @@
 */
 
 #include "gl_system.h"
-#include "gl/renderer/gl_renderer.h"
+#include "gl_renderer.h"
 #include "gl_renderbuffers.h"
 #include "hw_vrmodes.h"
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 #include "gl_postprocessstate.h"
-#include "gl/system/gl_framebuffer.h"
+#include "gl_framebuffer.h"
 #include "gl_shaderprogram.h"
 #include "gl_buffers.h"
-#include "menu/menu.h"
+#include "templates.h"
 
 EXTERN_CVAR(Int, vr_mode)
 EXTERN_CVAR(Float, vid_saturation)
@@ -43,6 +43,8 @@ EXTERN_CVAR(Float, vid_contrast)
 EXTERN_CVAR(Int, gl_satformula)
 EXTERN_CVAR(Int, gl_dither_bpc)
 
+void UpdateVRModes(bool considerQuadBuffered = true);
+
 namespace OpenGLRenderer
 {
 

src/common/rendering/hwrenderer/data/hw_clock.cpp

@@ -38,9 +38,9 @@
 #include "c_dispatch.h"
 #include "r_utility.h"
 #include "v_video.h"
-#include "g_levellocals.h"
 #include "hw_clock.h"
 #include "i_time.h"
+#include "i_interface.h"
 
 glcycle_t RenderWall,SetupWall,ClipWall;
 glcycle_t RenderFlat,SetupFlat;
@@ -167,10 +167,7 @@ void CheckBench()
 
 		FString compose;
 
-        auto &vp = r_viewpoint;
+		if (sysCallbacks && sysCallbacks->GetLocationDescription) compose = sysCallbacks->GetLocationDescription();
-		auto Level = vp.ViewLevel;
-		compose.Format("Map %s: \"%s\",\nx = %1.4f, y = %1.4f, z = %1.4f, angle = %1.4f, pitch = %1.4f\n",
-			Level->MapName.GetChars(), Level->LevelName.GetChars(), vp.Pos.X, vp.Pos.Y, vp.Pos.Z, vp.Angles.Yaw.Degrees, vp.Angles.Pitch.Degrees);
 	
 		AppendRenderStats(compose);
 		AppendRenderTimes(compose);

src/common/rendering/hwrenderer/data/hw_skydome.cpp

@@ -76,7 +76,7 @@ enum
 // also shamelessly lifted from ZDoomGL! ;)
 //
 //-----------------------------------------------------------------------------
-EXTERN_CVAR(Float, skyoffset)
+CVAR(Float, skyoffset, 0, 0)	// for testing
 
 
 struct SkyColor

src/common/rendering/hwrenderer/data/hw_skydome.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "v_palette.h"
 #include "matrix.h"
 #include "hwrenderer/data/buffers.h"
 #include "hw_renderstate.h"

src/d_main.cpp

@@ -114,7 +114,7 @@
 #include "scriptutil.h"
 #include "v_palette.h"
 #include "texturemanager.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 
 #ifdef __unix__
@@ -2855,6 +2855,16 @@ IntRect System_GetSceneRect()
 	mSceneViewport.height = height;
 	return mSceneViewport;
 }
+
+FString System_GetLocationDescription()
+{
+	auto& vp = r_viewpoint;
+	auto Level = vp.ViewLevel;
+	return FStringf("Map %s: \"%s\",\nx = %1.4f, y = %1.4f, z = %1.4f, angle = %1.4f, pitch = %1.4f\n",
+		Level->MapName.GetChars(), Level->LevelName.GetChars(), vp.Pos.X, vp.Pos.Y, vp.Pos.Z, vp.Angles.Yaw.Degrees, vp.Angles.Pitch.Degrees);
+
+}
+
 //==========================================================================
 //
 // DoomSpecificInfo
@@ -3063,6 +3073,7 @@ static int D_DoomMain_Internal (void)
 		System_DisableTextureFilter,
 		System_OnScreenSizeChanged,
 		System_GetSceneRect,
+		System_GetLocationDescription,
 	};
 	sysCallbacks = &syscb;
 	

src/playsim/p_pspr.h

@@ -41,6 +41,7 @@
 #define WEAPON_FUDGE_Y			0.375
 struct FTranslatedLineTarget;
 struct FState;
+class player_t;
 
 //
 // Overlay psprites are scaled shapes

src/rendering/hwrenderer/hw_entrypoint.cpp

@@ -37,7 +37,7 @@
 #include "swrenderer/r_swscene.h"
 #include "swrenderer/r_renderer.h"
 #include "hw_dynlightdata.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "flatvertices.h"
 #include "v_palette.h"
 #include "d_main.h"

src/rendering/hwrenderer/scene/hw_bsp.cpp

@@ -39,7 +39,7 @@
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_portal.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "flatvertices.h"
 #include "hwrenderer/data/hw_vertexbuilder.h"
 

src/rendering/hwrenderer/scene/hw_decal.cpp

@@ -34,7 +34,7 @@
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/utility/hw_lighting.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "flatvertices.h"
 #include "hw_renderstate.h"
 #include "texturemanager.h"

src/rendering/hwrenderer/scene/hw_drawinfo.cpp

@@ -36,7 +36,7 @@
 #include "hw_drawinfo.h"
 #include "po_man.h"
 #include "models.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hw_cvars.h"
 #include "hw_viewpointbuffer.h"
 #include "flatvertices.h"

src/rendering/hwrenderer/scene/hw_drawlist.cpp

@@ -33,7 +33,7 @@
 #include "hwrenderer/scene/hw_drawstructs.h"
 #include "hwrenderer/scene/hw_drawlist.h"
 #include "flatvertices.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hw_renderstate.h"
 #include "hw_drawinfo.h"
 #include "hw_fakeflat.h"

src/rendering/hwrenderer/scene/hw_flats.cpp

@@ -38,7 +38,7 @@
 #include "matrix.h"
 #include "hw_dynlightdata.h"
 #include "hw_cvars.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hw_material.h"
 #include "hwrenderer/scene/hw_drawinfo.h"

src/rendering/hwrenderer/scene/hw_portal.cpp

@@ -34,7 +34,7 @@
 #include "g_levellocals.h"
 #include "hw_renderstate.h"
 #include "flatvertices.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "texturemanager.h"
 

src/rendering/hwrenderer/scene/hw_renderhacks.cpp

@@ -35,7 +35,7 @@
 
 #include "hw_drawinfo.h"
 #include "hw_drawstructs.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hw_dynlightdata.h"
 #include "flatvertices.h"
 #include "hw_lightbuffer.h"

src/rendering/hwrenderer/scene/hw_sprites.cpp

@@ -51,7 +51,7 @@
 #include "hwrenderer/scene/hw_portal.h"
 #include "flatvertices.h"
 #include "hw_cvars.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hw_material.h"
 #include "hw_dynlightdata.h"

src/rendering/hwrenderer/scene/hw_walls.cpp

@@ -35,7 +35,7 @@
 #include "hw_dynlightdata.h"
 #include "hw_material.h"
 #include "hw_cvars.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hwrenderer/utility/hw_lighting.h"
 #include "hwrenderer/scene/hw_drawinfo.h"
 #include "hwrenderer/scene/hw_drawstructs.h"

src/rendering/hwrenderer/utility/hw_draw2d.cpp

@@ -32,7 +32,7 @@
 #include "hwrenderer/data/buffers.h"
 #include "flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hw_cvars.h"
 #include "hw_renderstate.h"
 #include "r_videoscale.h"

src/rendering/polyrenderer/backend/poly_framebuffer.cpp

@@ -30,7 +30,7 @@
 #include "i_video.h"
 #include "v_draw.h"
 
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
 #include "hwrenderer/models/hw_models.h"

src/rendering/polyrenderer/backend/poly_renderstate.cpp

@@ -30,7 +30,7 @@
 #include "hw_viewpointuniforms.h"
 #include "hw_lightbuffer.h"
 #include "hw_cvars.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/data/shaderuniforms.h"

src/rendering/r_sky.cpp

@@ -54,9 +54,6 @@ CUSTOM_CVAR (Int, r_skymode, 2, CVAR_ARCHIVE|CVAR_NOINITCALL)
 	R_InitSkyMap ();
 }
 
-CVAR(Float, skyoffset, 0, 0)	// for testing
-
-
 //==========================================================================
 //
 // R_InitSkyMap

src/rendering/vulkan/renderer/vk_renderstate.cpp

@@ -33,7 +33,7 @@
 #include "hw_viewpointuniforms.h"
 #include "hw_lightbuffer.h"
 #include "hw_cvars.h"
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "flatvertices.h"
 #include "hwrenderer/data/hw_viewpointbuffer.h"
 #include "hwrenderer/data/shaderuniforms.h"

src/rendering/vulkan/system/vk_framebuffer.cpp

@@ -33,7 +33,7 @@
 #include "version.h"
 #include "v_draw.h"
 
-#include "hwrenderer/utility/hw_clock.h"
+#include "hw_clock.h"
 #include "hw_vrmodes.h"
 #include "hw_cvars.h"
 #include "hwrenderer/models/hw_models.h"