Remove OpenGL and OpenGL ES backends

ZDoom · Sep 17, 2023 · a4cc9d2 · a4cc9d2
1 parent bada467
commit a4cc9d2
Show file tree

Hide file tree

Showing 110 changed files with 104 additions and 25,423 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -410,10 +410,8 @@ set( PLAT_WIN32_SOURCES
 	common/platform/win32/i_system.cpp
 	common/platform/win32/i_specialpaths.cpp
 	common/platform/win32/st_start.cpp
-	common/platform/win32/gl_sysfb.cpp
 	common/platform/win32/base_sysfb.cpp
 	common/platform/win32/win32basevideo.cpp
-	common/platform/win32/win32glvideo.cpp
 	)
 
 if (HAVE_VULKAN)
@@ -597,8 +595,6 @@ file( GLOB HEADER_FILES
 	common/thirdparty/math/*h
 	common/thirdparty/libsmackerdec/include/*.h
 	common/rendering/*.h
-	common/rendering/gl_load/*.h
-	common/rendering/gles/*.h
 	common/rendering/hwrenderer/data/*.h
 	common/rendering/vulkan/*.h
 	common/rendering/vulkan/system/*.h
@@ -716,7 +712,6 @@ set( FASTMATH_SOURCES
 	common/textures/hires/hqnx/hq4x.cpp
 	common/textures/hires/xbr/xbrz.cpp
 	common/textures/hires/xbr/xbrz_old.cpp
-	common/rendering/gl_load/gl_load.c
 	rendering/hwrenderer/hw_dynlightdata.cpp
 	rendering/hwrenderer/scene/hw_bsp.cpp
 	rendering/hwrenderer/scene/hw_fakeflat.cpp
@@ -761,26 +756,6 @@ set (VULKAN_SOURCES
 	common/rendering/vulkan/textures/vk_framebuffer.cpp
 )
 
-if (HAVE_GLES2)
-	set (GLES_SOURCES
-		common/rendering/gles/gles_system.cpp
-		common/rendering/gles/gles_renderer.cpp
-		common/rendering/gles/gles_framebuffer.cpp
-		common/rendering/gles/gles_renderstate.cpp
-		common/rendering/gles/gles_renderbuffers.cpp
-		common/rendering/gles/gles_postprocess.cpp
-		common/rendering/gles/gles_postprocessstate.cpp
-		common/rendering/gles/gles_buffers.cpp
-		common/rendering/gles/gles_hwtexture.cpp
-		common/rendering/gles/gles_shader.cpp
-		common/rendering/gles/gles_shaderprogram.cpp
-		common/rendering/gles/gles_samplers.cpp
-		common/rendering/gles/glad/src/glad.c
-	)
-
-	list (APPEND FASTMATH_SOURCES ${GLES_SOURCES})
-endif()
-
 if (HAVE_VULKAN)
 	list (APPEND FASTMATH_SOURCES ${VULKAN_SOURCES})
 endif()
@@ -1130,20 +1105,6 @@ set (PCH_SOURCES
 	common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
 	common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp
 	common/rendering/hwrenderer/postprocessing/hw_postprocessshader_ccmds.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
-	common/rendering/gl/gl_postprocessstate.cpp
-	common/rendering/gl/gl_debug.cpp
-	common/rendering/gl/gl_buffers.cpp
-	common/rendering/gl/gl_hwtexture.cpp
-	common/rendering/gl/gl_samplers.cpp
-	common/rendering/gl/gl_shader.cpp
-	common/rendering/gl/gl_shaderprogram.cpp
 	common/scripting/core/maps.cpp
 	common/scripting/core/dictionary.cpp
 	common/scripting/core/dynarrays.cpp
@@ -1280,11 +1241,6 @@ include_directories(
 	common/startscreen
 	common/rendering
 	common/rendering/hwrenderer/data
-	common/rendering/gl_load
-	common/rendering/gl
-	common/rendering/gles
-	common/rendering/gles/glad/include
-	common/rendering/gles/Mali_OpenGL_ES_Emulator/include
 	common/scripting/vm
 	common/scripting/jit
 	common/scripting/core
@@ -1488,9 +1444,6 @@ source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR
 source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/.+")
 source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+")
 source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+")
-source_group("Common\\Rendering\\OpenGL Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+")
-source_group("Common\\Rendering\\OpenGL Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl/.+")
-source_group("Common\\Rendering\\GLES Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gles/.+")
 source_group("Common\\Rendering\\Vulkan Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/system/.+")
 source_group("Common\\Rendering\\Vulkan Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/renderer/.+")
 source_group("Common\\Rendering\\Vulkan Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/shaders/.+")

diff --git a/src/common/platform/posix/cocoa/gl_sysfb.h b/src/common/platform/posix/cocoa/gl_sysfb.h
@@ -82,21 +82,4 @@ class SystemBaseFrameBuffer : public DFrameBuffer
 
 };
 
-class SystemGLFrameBuffer : public SystemBaseFrameBuffer
-{
-	typedef SystemBaseFrameBuffer Super;
-
-public:
-	SystemGLFrameBuffer(void *hMonitor, bool fullscreen);
-
-	void SetVSync(bool vsync) override;
-
-	void SetMode(bool fullscreen, bool hiDPI) override;
-
-protected:
-	void SwapBuffers();
-
-	SystemGLFrameBuffer() {}
-};
-
 #endif // COCOA_GL_SYSFB_H_INCLUDED