diff options
| author | David Robillard <d@drobilla.net> | 2019-02-15 12:39:31 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-02-15 13:13:56 +0100 |
| commit | cf80f78f808e402d06dc891fce08b0f3b3865c15 (patch) | |
| tree | d24a66bc4b16610693ea569bb31784c53cd8b552 /pugl/pugl_x11.c | |
| parent | 373b2b784648375064377dfc64a3c83892cf9ade (diff) | |
| download | pugl-cf80f78f808e402d06dc891fce08b0f3b3865c15.tar.gz pugl-cf80f78f808e402d06dc891fce08b0f3b3865c15.tar.bz2 pugl-cf80f78f808e402d06dc891fce08b0f3b3865c15.zip | |
Remove PUGL_CAIRO_GL
The old cairo_gl.h header or something similar is easy enough to use in
application code if someone wants to do this, and maintaining a separate
context type for it is a hassle and arguably out of scope.
Diffstat (limited to 'pugl/pugl_x11.c')
| -rw-r--r-- | pugl/pugl_x11.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/pugl/pugl_x11.c b/pugl/pugl_x11.c index ef08ac8..5acd797 100644 --- a/pugl/pugl_x11.c +++ b/pugl/pugl_x11.c @@ -39,7 +39,6 @@ #include <cairo/cairo.h> #endif -#include "pugl/cairo_gl.h" #include "pugl/pugl_internal.h" #ifndef MIN @@ -97,9 +96,6 @@ struct PuglInternalsImpl { GLXContext ctx; int doubleBuffered; #endif -#if defined(PUGL_HAVE_CAIRO) && defined(PUGL_HAVE_GL) - PuglCairoGL cairo_gl; -#endif }; PuglInternals* @@ -165,12 +161,6 @@ createContext(PuglView* view, XVisualInfo* vi) impl->display, impl->win, vi->visual, view->width, view->height); } #endif -#if defined(PUGL_HAVE_GL) && defined(PUGL_HAVE_CAIRO) - if (view->ctx_type == PUGL_CAIRO_GL) { - impl->surface = pugl_cairo_gl_create( - &impl->cairo_gl, view->width, view->height, 4); - } -#endif #ifdef PUGL_HAVE_CAIRO if (view->ctx_type & PUGL_CAIRO) { @@ -193,11 +183,6 @@ createContext(PuglView* view, XVisualInfo* vi) static void destroyContext(PuglView* view) { -#if defined(PUGL_HAVE_CAIRO) && defined(PUGL_HAVE_GL) - if (view->ctx_type == PUGL_CAIRO_GL) { - pugl_cairo_gl_free(&view->impl->cairo_gl); - } -#endif #ifdef PUGL_HAVE_GL if (view->ctx_type & PUGL_GL) { glXDestroyContext(view->impl->display, view->impl->ctx); @@ -226,12 +211,6 @@ puglLeaveContext(PuglView* view, bool flush) { #ifdef PUGL_HAVE_GL if (flush && view->ctx_type & PUGL_GL) { -#ifdef PUGL_HAVE_CAIRO - if (view->ctx_type == PUGL_CAIRO_GL) { - pugl_cairo_gl_draw(&view->impl->cairo_gl, view->width, view->height); - } -#endif - glFlush(); if (view->impl->doubleBuffered) { glXSwapBuffers(view->impl->display, view->impl->win); @@ -662,21 +641,6 @@ puglProcessEvents(PuglView* view) config_event.configure.width, config_event.configure.height); } -#ifdef PUGL_HAVE_GL - if (view->ctx_type == PUGL_CAIRO_GL) { - view->redisplay = true; - cairo_surface_destroy(view->impl->surface); - view->impl->surface = pugl_cairo_gl_create( - &view->impl->cairo_gl, - config_event.configure.width, - config_event.configure.height, - 4); - pugl_cairo_gl_configure(&view->impl->cairo_gl, - config_event.configure.width, - config_event.configure.height); - createCairoContext(view); - } -#endif #endif puglDispatchEvent(view, (const PuglEvent*)&config_event); } |