fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-22 11:40:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl: Take advantage of GLX_MESA_multithread_makecurrent to avoid unbinding.

Browse source 
Because of GLX's unfortunate requirement that only one context have a
thread current at a time, we had to unbind the context, triggering a
flush, and eating of all the CPU.  With a small tweak to the GLX spec
by GLX_MESA_multithread_makecurrent, and a small tweak to Mesa that
consisted mostly of deleting the "is this thread already bound
elsewhere?" check, we can bind our context to any thread and use it
safely as long as our usage of it is mutexed, which cairo-gl should
already be doing.

[  0] before      firefox-talos-gfx   50.260   50.525   0.25%    3/3
[  0] after       firefox-talos-gfx   32.091   32.422   0.65%    3/3
This commit is contained in:
Eric Anholt 2011-01-31 20:47:15 -08:00
parent 2e67809be0
commit 2fae22a3f2
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cairo-glx-context.c
View file

@ -52,6 +52,8 @@ typedef struct _cairo_glx_context {
Display *display;
Window dummy_window;
GLXContext context;
cairo_bool_t has_multithread_makecurrent;
} cairo_glx_context_t;
typedef struct _cairo_glx_surface {
@ -92,7 +94,9 @@ _glx_release (void *abstract_ctx)
{
cairo_glx_context_t *ctx = abstract_ctx;
glXMakeCurrent (ctx->display, None, None);
if (!ctx->has_multithread_makecurrent) {
glXMakeCurrent (ctx->display, None, None);
}
}
static void
@ -174,6 +178,7 @@ cairo_glx_device_create (Display *dpy, GLXContext gl_ctx)
cairo_glx_context_t *ctx;
cairo_status_t status;
Window dummy = None;
const char *glx_extensions;
status = _glx_dummy_ctx (dpy, gl_ctx, &dummy);
if (unlikely (status))
@ -206,6 +211,11 @@ cairo_glx_device_create (Display *dpy, GLXContext gl_ctx)
return _cairo_gl_context_create_in_error (status);
}
glx_extensions = glXQueryExtensionsString (dpy, DefaultScreen (dpy));
if (strstr(glx_extensions, "GLX_MESA_multithread_makecurrent")) {
ctx->has_multithread_makecurrent = TRUE;
}
ctx->base.release (ctx);
return &ctx->base.base;