AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Drop the gl-legacy debug value

Browse Source 
The consensus is that we can do without this.
This commit is contained in:
Matthias Clasen 2023-11-18 18:58:37 -05:00
parent e4370cc95e
commit f04c819439
6 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gtk/running.md
View File

@ -229,9 +229,6 @@ A number of options affect behavior instead of logging:
`gl-debug` `gl-debug`
: Insert debugging information in OpenGL : Insert debugging information in OpenGL
`gl-legacy`
: Use a legacy OpenGL context
`gl-disable-gl` `gl-disable-gl`
: Don't allow the use of OpenGL GL API. This forces GLES to be used : Don't allow the use of OpenGL GL API. This forces GLES to be used

1
gdk/gdk.c
View File

@ -126,7 +126,6 @@ static const GdkDebugKey gdk_debug_keys[] = {
{ "gl-disable", GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" }, { "gl-disable", GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
{ "gl-fractional", GDK_DEBUG_GL_FRACTIONAL, "Enable fractional scaling for OpenGL (experimental)" }, { "gl-fractional", GDK_DEBUG_GL_FRACTIONAL, "Enable fractional scaling for OpenGL (experimental)" },
{ "gl-debug", GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" }, { "gl-debug", GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
{ "gl-legacy", GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context" },
{ "gl-disable-gl", GDK_DEBUG_GL_DISABLE_GL, "Only allow OpenGL GLES API" }, { "gl-disable-gl", GDK_DEBUG_GL_DISABLE_GL, "Only allow OpenGL GLES API" },
{ "gl-disable-gles", GDK_DEBUG_GL_DISABLE_GLES, "Don't allow OpenGL GLES API" }, { "gl-disable-gles", GDK_DEBUG_GL_DISABLE_GLES, "Don't allow OpenGL GLES API" },
{ "gl-prefer-gl", GDK_DEBUG_GL_PREFER_GL, "Prefer GL over GLES API" }, { "gl-prefer-gl", GDK_DEBUG_GL_PREFER_GL, "Prefer GL over GLES API" },

2
gdk/gdkdebugprivate.h
View File

@ -45,7 +45,7 @@ typedef enum {
GDK_DEBUG_NO_PORTALS = 1 << 15, GDK_DEBUG_NO_PORTALS = 1 << 15,
GDK_DEBUG_GL_DISABLE = 1 << 16, GDK_DEBUG_GL_DISABLE = 1 << 16,
GDK_DEBUG_GL_FRACTIONAL = 1 << 17, GDK_DEBUG_GL_FRACTIONAL = 1 << 17,
GDK_DEBUG_GL_LEGACY = 1 << 18,
GDK_DEBUG_GL_DISABLE_GL = 1 << 19, GDK_DEBUG_GL_DISABLE_GL = 1 << 19,
GDK_DEBUG_GL_DISABLE_GLES = 1 << 20, GDK_DEBUG_GL_DISABLE_GLES = 1 << 20,
GDK_DEBUG_GL_PREFER_GL = 1 << 21, GDK_DEBUG_GL_PREFER_GL = 1 << 21,

3
gdk/gdkglcontext.c
View File

@ -415,8 +415,7 @@ gdk_gl_context_realize_egl (GdkGLContext *context,
return 0; return 0;
} }
prefer_legacy = (flags & GDK_DEBUG_GL_LEGACY) || prefer_legacy = share != NULL && gdk_gl_context_is_legacy (share);
(share != NULL && gdk_gl_context_is_legacy (share));
if (preferred_api == GDK_GL_API_GL) if (preferred_api == GDK_GL_API_GL)
{ {

4
gdk/win32/gdkglcontext-win32-wgl.c
View File

@ -675,9 +675,7 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context,
* A legacy context cannot be shared with core profile ones, so this means we * A legacy context cannot be shared with core profile ones, so this means we
* must stick to a legacy context if the shared context is a legacy context * must stick to a legacy context if the shared context is a legacy context
*/ */
legacy_bit = (gdk_display_get_debug_flags (display) & GDK_DEBUG_GL_LEGACY) legacy_bit = share != NULL && gdk_gl_context_is_legacy (share);
? TRUE
: share != NULL && gdk_gl_context_is_legacy (share);
if (surface != NULL) if (surface != NULL)
hdc = GDK_WIN32_SURFACE (surface)->hdc; hdc = GDK_WIN32_SURFACE (surface)->hdc;

3
gdk/x11/gdkglcontext-glx.c
View File

@ -646,9 +646,6 @@ gdk_x11_gl_context_glx_realize (GdkGLContext *context,
/* If there is no glXCreateContextAttribsARB() then we default to legacy */ /* If there is no glXCreateContextAttribsARB() then we default to legacy */
legacy = !GDK_X11_DISPLAY (display)->has_glx_create_context; legacy = !GDK_X11_DISPLAY (display)->has_glx_create_context;
if (gdk_display_get_debug_flags (display) & GDK_DEBUG_GL_LEGACY)
legacy = TRUE;
/* We cannot share legacy contexts with core profile ones, so the /* We cannot share legacy contexts with core profile ones, so the
* shared context is the one that decides if we're going to create * shared context is the one that decides if we're going to create
* a legacy context or not. * a legacy context or not.