diff options
| author | Clay John <claynjohn@gmail.com> | 2021-10-26 08:18:39 -0700 |
|---|---|---|
| committer | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-10-31 15:56:45 +0100 |
| commit | 8a10bb7d0dd0cc03353bb751af25a0eca1357c9d (patch) | |
| tree | ae63bd8b1d4bacd65673f7bc455994ed4d288a84 /platform/linuxbsd/gl_manager_x11.cpp | |
| parent | ce97ddbcb125228cc88fbfdcae932e110ee7daee (diff) | |
Use OpenGL 3.3 core profile instead of compatibility profile
- Rename OpenGL to GLES3 in the source code per community feedback.
- The renderer is still exposed as "OpenGL 3" to the user.
- Hide renderer selection dropdown until OpenGL support is more mature.
- The renderer can still be changed in the Project Settings or using
the `--rendering-driver opengl` command line argument.
- Remove commented out exporter code.
- Remove some OpenGL/DisplayServer-related debugging prints.
Diffstat (limited to 'platform/linuxbsd/gl_manager_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/gl_manager_x11.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/platform/linuxbsd/gl_manager_x11.cpp b/platform/linuxbsd/gl_manager_x11.cpp index 5928ff3147..e069e92ee6 100644 --- 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_ENABLED) +#if defined(GLES3_ENABLED) #include <stdio.h> #include <stdlib.h> @@ -175,12 +175,10 @@ Error GLManager_X11::_create_context(GLDisplay &gl_display) { switch (context_type) { case GLES_3_0_COMPATIBLE: { - // FIXME: Use `GLX_CONTEXT_CORE_PROFILE_BIT_ARB` instead of compatibility profile - // once deprecated API usages are fixed. static int context_attribs[] = { GLX_CONTEXT_MAJOR_VERSION_ARB, 3, GLX_CONTEXT_MINOR_VERSION_ARB, 3, - GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, + GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB, GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB /*|GLX_CONTEXT_DEBUG_BIT_ARB*/, None }; @@ -207,8 +205,6 @@ Error GLManager_X11::_create_context(GLDisplay &gl_display) { } Error GLManager_X11::window_create(DisplayServer::WindowID p_window_id, ::Window p_window, Display *p_display, int p_width, int p_height) { - print_line("window_create window id " + itos(p_window_id)); - // make sure vector is big enough... // we can mirror the external vector, it is simpler // to keep the IDs identical for fast lookup |