Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Update pixel format after validation

Browse Source 
The GdkGLPixelFormat after validation contains the values of the
attributes that were found.
This commit is contained in:
Emmanuele Bassi
2014-08-11 21:27:58 +01:00
parent 0500963db9
commit eb0e790a21
1 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,6 +444,31 @@ out:
return retval;
}
static void
update_pixel_format (GdkDisplay *display,
GdkGLPixelFormat *format,
GLXFBConfig config)
{
Display *dpy = gdk_x11_display_get_xdisplay (display);
int value = 0;
glXGetFBConfigAttrib (dpy, config, GLX_DOUBLEBUFFER, &format->double_buffer);
glXGetFBConfigAttrib (dpy, config, GLX_RED_SIZE, &value);
format->color_size = value;
glXGetFBConfigAttrib (dpy, config, GLX_GREEN_SIZE, &value);
format->color_size = MAX (format->color_size, value);
glXGetFBConfigAttrib (dpy, config, GLX_BLUE_SIZE, &value);
format->color_size = MAX (format->color_size, value);
glXGetFBConfigAttrib (dpy, config, GLX_ALPHA_SIZE, &format->alpha_size);
glXGetFBConfigAttrib (dpy, config, GLX_AUX_BUFFERS, &format->aux_buffers);
glXGetFBConfigAttrib (dpy, config, GLX_DEPTH_SIZE, &format->depth_size);
glXGetFBConfigAttrib (dpy, config, GLX_STENCIL_SIZE, &format->stencil_size);
}
static GLXContext
create_gl3_context (GdkDisplay *display,
GLXFBConfig config,
@@ -720,6 +745,8 @@ gdk_x11_display_validate_gl_pixel_format (GdkDisplay *display,
GdkGLPixelFormat *format,
GError **error)
{
GLXFBConfig config;
if (!gdk_x11_display_init_gl (display))
{
g_set_error_literal (error, GDK_GL_PIXEL_FORMAT_ERROR,
@@ -741,8 +768,13 @@ gdk_x11_display_validate_gl_pixel_format (GdkDisplay *display,
}
}
if (!find_fbconfig_for_pixel_format (display, format, NULL, NULL, error))
if (!find_fbconfig_for_pixel_format (display, format, &config, NULL, error))
return FALSE;
/* update the pixel format with the values of the
* configuration we found
*/
update_pixel_format (display, format, config);
return TRUE;
}