callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11/gl: Ensure we use the 3.2 core profile

Browse Source 
Drop the dead code for the legacy profile, and return an error when
realizing if the profile is incorrect.

https://bugzilla.gnome.org/show_bug.cgi?id=741946
This commit is contained in:
Emmanuele Bassi 2015-02-09 15:55:08 +00:00
parent 01d1cdc76c
commit cc45e828df
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdk/x11/gdkglcontext-x11.c
View File

@ -571,23 +571,6 @@ create_gl3_context (GdkDisplay *display,
attrib_list); attrib_list);
} }
static GLXContext
create_gl_context (GdkDisplay *display,
GLXFBConfig config,
GdkGLContext *share)
{
GdkX11GLContext *share_x11 = NULL;
if (share != NULL)
share_x11 = GDK_X11_GL_CONTEXT (share);
return glXCreateNewContext (gdk_x11_display_get_xdisplay (display),
config,
GLX_RGBA_TYPE,
share_x11 != NULL ? share_x11->glx_context : NULL,
True);
}
static gboolean static gboolean
gdk_x11_gl_context_realize (GdkGLContext *context, gdk_x11_gl_context_realize (GdkGLContext *context,
GError **error) GError **error)
@ -640,8 +623,10 @@ gdk_x11_gl_context_realize (GdkGLContext *context,
} }
else else
{ {
GDK_NOTE (OPENGL, g_print ("Creating legacy GLX context\n")); g_set_error_literal (error, GDK_GL_ERROR,
context_x11->glx_context = create_gl_context (display, context_x11->glx_config, share); GDK_GL_ERROR_UNSUPPORTED_PROFILE,
_("Unsupported profile for a GL context"));
return FALSE;
} }
if (context_x11->glx_context == NULL) if (context_x11->glx_context == NULL)