AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 00:11:29 +00:00
Code Issues Projects Releases Wiki Activity

GdkGLContextX11: Ensure we get the fbconfig with the exact same visual

Browse Source 
We really want a gl context with exactly the same visual, or we will
get a badmatch later, which hits us on nvidia as per:

https://bugzilla.gnome.org/show_bug.cgi?id=738670
This commit is contained in:
Alexander Larsson 2014-10-28 16:43:38 +01:00
parent b673490a1b
commit 8d6d6dcca3
1 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -574,6 +574,7 @@ find_fbconfig_for_visual (GdkDisplay *display,
int n_configs, i; int n_configs, i;
gboolean use_rgba; gboolean use_rgba;
gboolean retval = FALSE; gboolean retval = FALSE;
VisualID xvisual_id = XVisualIDFromVisual(gdk_x11_visual_get_xvisual (visual));
i = 0; i = 0;
attrs[i++] = GLX_DRAWABLE_TYPE; attrs[i++] = GLX_DRAWABLE_TYPE;
@ -586,14 +587,13 @@ find_fbconfig_for_visual (GdkDisplay *display,
attrs[i++] = GL_TRUE; attrs[i++] = GL_TRUE;
attrs[i++] = GLX_RED_SIZE; attrs[i++] = GLX_RED_SIZE;
attrs[i++] = gdk_visual_get_bits_per_rgb (visual); attrs[i++] = 1;
attrs[i++] = GLX_GREEN_SIZE; attrs[i++] = GLX_GREEN_SIZE;
attrs[i++] = gdk_visual_get_bits_per_rgb (visual);; attrs[i++] = 1;
attrs[i++] = GLX_BLUE_SIZE; attrs[i++] = GLX_BLUE_SIZE;
attrs[i++] = gdk_visual_get_bits_per_rgb (visual);; attrs[i++] = 1;
use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display))); use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
if (use_rgba) if (use_rgba)
{ {
attrs[i++] = GLX_ALPHA_SIZE; attrs[i++] = GLX_ALPHA_SIZE;
@ -618,44 +618,30 @@ find_fbconfig_for_visual (GdkDisplay *display,
return FALSE; return FALSE;
} }
/* if we don't care about an alpha channel, then the first
* valid configuration is the one we give back
*/
if (!use_rgba)
{
if (fb_config_out != NULL)
*fb_config_out = configs[0];
if (visinfo_out != NULL)
*visinfo_out = glXGetVisualFromFBConfig (dpy, configs[0]);
retval = TRUE;
goto out;
}
for (i = 0; i < n_configs; i++) for (i = 0; i < n_configs; i++)
{ {
XVisualInfo *visinfo; XVisualInfo *visinfo;
unsigned long mask;
visinfo = glXGetVisualFromFBConfig (dpy, configs[i]); visinfo = glXGetVisualFromFBConfig (dpy, configs[i]);
if (visinfo == NULL) if (visinfo == NULL)
continue;
mask = visinfo->red_mask | visinfo->green_mask | visinfo->blue_mask;
if (visinfo->depth == 32 && mask != 0xffffffff)
{ {
if (fb_config_out != NULL) XFree (visinfo);
*fb_config_out = configs[i]; continue;
if (visinfo_out != NULL)
*visinfo_out = visinfo;
retval = TRUE;
goto out;
} }
XFree (visinfo); if (visinfo->visualid != xvisual_id)
continue;
if (fb_config_out != NULL)
*fb_config_out = configs[i];
if (visinfo_out != NULL)
*visinfo_out = visinfo;
else
XFree (visinfo);
retval = TRUE;
goto out;
} }
g_set_error (error, GDK_GL_ERROR, g_set_error (error, GDK_GL_ERROR,