Replace platform-specific OpenGL defines with OPENGL_ENABLED

This is consistent with `VULKAN_ENABLED`.
godotengine · Oct 4, 2021 · 6d7522e · 6d7522e
1 parent b1ed8a8
commit 6d7522e
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 63 deletions.
diff --git a/drivers/opengl/rasterizer_platforms.h b/drivers/opengl/rasterizer_platforms.h
@@ -41,31 +41,7 @@
 
 #if defined(OPENGL_ENABLED) || defined(GLES_ENABLED)
 
-// platform specific defines to compile in / out GLES support
-// these can later be made from Scons
-#ifdef X11_ENABLED
-#define OPENGL_X11_ENABLED
-#endif
-
-#ifdef WINDOWS_ENABLED
-#define OPENGL_WINDOWS_ENABLED
-#endif
-
-#ifdef IPHONE_ENABLED
-//#define OPENGL_IPHONE_ENABLED
-#endif
-
-#ifdef OSX_ENABLED
-//#define OPENGL_OSX_ENABLED
-#endif
-
-#ifdef ANDROID_ENABLED
-//#define OPENGL_ANDROID_ENABLED
-#endif
-
-#if defined(OPENGL_X11_ENABLED) || defined(OPENGL_WINDOWS_ENABLED) || defined(OPENGL_IPHONE_ENABLED) || defined(OPENGL_OSX_ENABLED) || defined(OPENGL_ANDROID_ENABLED)
 #define OPENGL_BACKEND_ENABLED
-#endif
 
 #endif // defined(OPENGL_ENABLED) || defined(GLES_ENABLED)
 

diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp
@@ -44,7 +44,7 @@
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #endif
 
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 #include "drivers/opengl/rasterizer_opengl.h"
 #endif
 
@@ -842,7 +842,7 @@ void DisplayServerX11::delete_sub_window(WindowID p_id) {
 		context_vulkan->window_destroy(p_id);
 	}
 #endif
-#ifdef OPENGL_X11_ENABLED
+#ifdef OPENGL_ENABLED
 	if (gl_manager) {
 		gl_manager->window_destroy(p_id);
 	}
@@ -1008,7 +1008,7 @@ int DisplayServerX11::window_get_current_screen(WindowID p_window) const {
 }
 
 void DisplayServerX11::gl_window_make_current(DisplayServer::WindowID p_window_id) {
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 	if (gl_manager)
 		gl_manager->window_make_current(p_window_id);
 #endif
@@ -2586,7 +2586,7 @@ void DisplayServerX11::_window_changed(XEvent *event) {
 		context_vulkan->window_resize(window_id, wd.size.width, wd.size.height);
 	}
 #endif
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 	if (gl_manager) {
 		gl_manager->window_resize(window_id, wd.size.width, wd.size.height);
 	}
@@ -3460,19 +3460,19 @@ void DisplayServerX11::process_events() {
 }
 
 void DisplayServerX11::release_rendering_thread() {
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 //	gl_manager->release_current();
 #endif
 }
 
 void DisplayServerX11::make_rendering_thread() {
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 //	gl_manager->make_current();
 #endif
 }
 
 void DisplayServerX11::swap_buffers() {
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 	if (gl_manager) {
 		gl_manager->swap_buffers();
 	}
@@ -3623,7 +3623,7 @@ void DisplayServerX11::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mo
 	}
 #endif
 
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 	if (gl_manager) {
 		gl_manager->set_use_vsync(p_vsync_mode == DisplayServer::VSYNC_ENABLED);
 	}
@@ -3637,7 +3637,7 @@ DisplayServer::VSyncMode DisplayServerX11::window_get_vsync_mode(WindowID p_wind
 		return context_vulkan->get_vsync_mode(p_window);
 	}
 #endif
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 	if (gl_manager) {
 		return gl_manager->is_using_vsync() ? DisplayServer::VSYNC_ENABLED : DisplayServer::VSYNC_DISABLED;
 	}
@@ -3651,7 +3651,7 @@ Vector<String> DisplayServerX11::get_rendering_drivers_func() {
 #ifdef VULKAN_ENABLED
 	drivers.push_back("vulkan");
 #endif
-#ifdef OPENGL_X11_ENABLED
+#ifdef OPENGL_ENABLED
 	drivers.push_back("opengl");
 #endif
 
@@ -3837,7 +3837,7 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, V
 			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create a Vulkan window");
 		}
 #endif
-#ifdef OPENGL_X11_ENABLED
+#ifdef OPENGL_ENABLED
 		print_line("rendering_driver " + rendering_driver);
 		if (gl_manager) {
 			Error err = gl_manager->window_create(id, wd.x11_window, x11_display, p_rect.size.width, p_rect.size.height);
@@ -4047,7 +4047,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 	}
 #endif
 	// Init context and rendering device
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 	print_line("rendering_driver " + rendering_driver);
 	if (rendering_driver == "opengl") {
 		if (getenv("DRI_PRIME") == nullptr) {
@@ -4341,7 +4341,7 @@ DisplayServerX11::~DisplayServerX11() {
 			context_vulkan->window_destroy(E->key());
 		}
 #endif
-#ifdef OPENGL_X11_ENABLED
+#ifdef OPENGL_ENABLED
 		if (rendering_driver == "opengl") {
 			gl_manager->window_destroy(E->key());
 		}
@@ -4370,7 +4370,7 @@ DisplayServerX11::~DisplayServerX11() {
 	}
 #endif
 
-#ifdef OPENGL_X11_ENABLED
+#ifdef OPENGL_ENABLED
 	if (gl_manager) {
 		memdelete(gl_manager);
 		gl_manager = nullptr;

diff --git a/platform/linuxbsd/display_server_x11.h b/platform/linuxbsd/display_server_x11.h
@@ -48,7 +48,7 @@
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering_server.h"
 
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 #include "gl_manager_x11.h"
 #endif
 
@@ -101,7 +101,7 @@ class DisplayServerX11 : public DisplayServer {
 	Atom requested;
 	int xdnd_version;
 
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 	GLManager_X11 *gl_manager = nullptr;
 #endif
 #if defined(VULKAN_ENABLED)

diff --git a/platform/linuxbsd/gl_manager_x11.cpp b/platform/linuxbsd/gl_manager_x11.cpp
@@ -31,7 +31,7 @@
 #include "gl_manager_x11.h"
 
 #ifdef X11_ENABLED
-#if defined(OPENGL_X11_ENABLED)
+#if defined(OPENGL_ENABLED)
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/platform/linuxbsd/gl_manager_x11.h b/platform/linuxbsd/gl_manager_x11.h
@@ -35,7 +35,7 @@
 
 #include "drivers/opengl/rasterizer_platforms.h"
 
-#ifdef OPENGL_X11_ENABLED
+#ifdef OPENGL_ENABLED
 
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
@@ -124,7 +124,7 @@ class GLManager_X11 {
 	~GLManager_X11();
 };
 
-#endif // OPENGL_X11_ENABLED
+#endif // OPENGL_ENABLED
 #endif // X11_ENABLED
 
 #endif // GL_MANAGER_X11_H
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
@@ -281,7 +281,7 @@ def configure_msvc(env, manual_msvc_config):
     if not env["use_volk"]:
         LIBS += ["vulkan"]
 
-    env.AppendUnique(CPPDEFINES = ['OPENGL_ENABLED'])
+    env.AppendUnique(CPPDEFINES=["OPENGL_ENABLED"])
     LIBS += ["opengl32"]
 
     env.Append(LINKFLAGS=[p + env["LIBSUFFIX"] for p in LIBS])

diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
@@ -38,7 +38,7 @@
 
 #include <avrt.h>
 
-#if defined(OPENGL_WINDOWS_ENABLED)
+#if defined(OPENGL_ENABLED)
 #include "drivers/opengl/rasterizer_opengl.h"
 #endif
 
@@ -539,7 +539,7 @@ void DisplayServerWindows::delete_sub_window(WindowID p_window) {
 		context_vulkan->window_destroy(p_window);
 	}
 #endif
-#ifdef OPENGL_WINDOWS_ENABLED
+#ifdef OPENGL_ENABLED
 	if (rendering_driver == "opengl") {
 		gl_manager->window_destroy(p_window);
 	}
@@ -554,7 +554,7 @@ void DisplayServerWindows::delete_sub_window(WindowID p_window) {
 }
 
 void DisplayServerWindows::gl_window_make_current(DisplayServer::WindowID p_window_id) {
-#if defined(OPENGL_WINDOWS_ENABLED)
+#if defined(OPENGL_ENABLED)
 	gl_manager->window_make_current(p_window_id);
 #endif
 }
@@ -829,7 +829,7 @@ void DisplayServerWindows::window_set_size(const Size2i p_size, WindowID p_windo
 		context_vulkan->window_resize(p_window, w, h);
 	}
 #endif
-#if defined(OPENGL_WINDOWS_ENABLED)
+#if defined(OPENGL_ENABLED)
 	if (rendering_driver == "opengl") {
 		gl_manager->window_resize(p_window, w, h);
 	}
@@ -1577,7 +1577,7 @@ void DisplayServerWindows::make_rendering_thread() {
 }
 
 void DisplayServerWindows::swap_buffers() {
-#if defined(OPENGL_WINDOWS_ENABLED)
+#if defined(OPENGL_ENABLED)
 	gl_manager->swap_buffers();
 #endif
 }
@@ -3075,7 +3075,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 		}
 #endif
 
-#ifdef OPENGL_WINDOWS_ENABLED
+#ifdef OPENGL_ENABLED
 		print_line("rendering_driver " + rendering_driver);
 		if (rendering_driver == "opengl") {
 			Error err = gl_manager->window_create(id, wd.hWnd, hInstance, WindowRect.right - WindowRect.left, WindowRect.bottom - WindowRect.top);
@@ -3303,7 +3303,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 	}
 #endif
 	// Init context and rendering device
-#if defined(OPENGL_WINDOWS_ENABLED)
+#if defined(OPENGL_ENABLED)
 
 	if (rendering_driver == "opengl") {
 		GLManager_Windows::ContextType opengl_api_type = GLManager_Windows::GLES_3_0_COMPATIBLE;
@@ -3320,7 +3320,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 		//		gl_manager->set_use_vsync(current_videomode.use_vsync);
 
 		if (true) {
-			RasterizerOpenGLmake_current();
+			RasterizerOpenGL::make_current();
 		} else {
 			memdelete(gl_manager);
 			gl_manager = nullptr;
@@ -3343,9 +3343,9 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 
 		context_gles2->set_use_vsync(video_mode.use_vsync);
 
-		if (RasterizerOpenGLis_viable() == OK) {
-			RasterizerOpenGLregister_config();
-			RasterizerOpenGLmake_current();
+		if (RasterizerOpenGL::is_viable() == OK) {
+			RasterizerOpenGL::register_config();
+			RasterizerOpenGL::make_current();
 		} else {
 			memdelete(context_gles2);
 			context_gles2 = nullptr;
@@ -3411,7 +3411,7 @@ Vector<String> DisplayServerWindows::get_rendering_drivers_func() {
 #ifdef VULKAN_ENABLED
 	drivers.push_back("vulkan");
 #endif
-#ifdef OPENGL_WINDOWS_ENABLED
+#ifdef OPENGL_ENABLED
 	drivers.push_back("opengl");
 #endif
 
@@ -3442,7 +3442,7 @@ DisplayServerWindows::~DisplayServerWindows() {
 		SetWindowLongPtr(windows[MAIN_WINDOW_ID].hWnd, GWLP_WNDPROC, (LONG_PTR)user_proc);
 	};
 
-#ifdef OPENGL_WINDOWS_ENABLED
+#ifdef OPENGL_ENABLED
 		// destroy windows .. NYI?
 #endif
 
@@ -3474,7 +3474,7 @@ DisplayServerWindows::~DisplayServerWindows() {
 	if (restore_mouse_trails > 1) {
 		SystemParametersInfoA(SPI_SETMOUSETRAILS, restore_mouse_trails, 0, 0);
 	}
-#ifdef OPENGL_WINDOWS_ENABLED
+#ifdef OPENGL_ENABLED
 	if (gl_manager) {
 		memdelete(gl_manager);
 		gl_manager = nullptr;

diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h
@@ -56,7 +56,7 @@
 #include "platform/windows/vulkan_context_win.h"
 #endif
 
-#if defined(OPENGL_WINDOWS_ENABLED)
+#if defined(OPENGL_ENABLED)
 #include "gl_manager_windows.h"
 #endif
 
@@ -303,7 +303,7 @@ class DisplayServerWindows : public DisplayServer {
 	int old_x, old_y;
 	Point2i center;
 
-#if defined(OPENGL_WINDOWS_ENABLED)
+#if defined(OPENGL_ENABLED)
 	GLManager_Windows *gl_manager;
 #endif
 

diff --git a/platform/windows/gl_manager_windows.cpp b/platform/windows/gl_manager_windows.cpp
@@ -31,7 +31,7 @@
 #include "gl_manager_windows.h"
 
 #ifdef WINDOWS_ENABLED
-#ifdef OPENGL_WINDOWS_ENABLED
+#ifdef OPENGL_ENABLED
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/platform/windows/gl_manager_windows.h b/platform/windows/gl_manager_windows.h
@@ -31,7 +31,7 @@
 #ifndef GL_MANAGER_WINDOWS_H
 #define GL_MANAGER_WINDOWS_H
 
-#if defined(WINDOWS_ENABLED) && defined(OPENGL_WINDOWS_ENABLED)
+#if defined(WINDOWS_ENABLED) && defined(OPENGL_ENABLED)
 
 #include "core/error/error_list.h"
 #include "core/os/os.h"
@@ -123,6 +123,6 @@ class GLManager_Windows {
 	~GLManager_Windows();
 };
 
-#endif // defined(WINDOWS_ENABLED) && defined(OPENGL_WINDOWS_ENABLED)
+#endif // defined(WINDOWS_ENABLED) && defined(OPENGL_ENABLED)
 
 #endif // GL_MANAGER_WINDOWS_H