diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2018-09-02 11:23:53 +0200 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2018-09-02 11:23:53 +0200 |
| commit | 0009eeaa2cb6d7fecb8bfb8f3cff559f30b3a89c (patch) | |
| tree | 33337c44c1501755709d102e755475a103f7eebe | |
| parent | b795ab4ff9f99d6195ca2f547f3a42b28006f91b (diff) | |
| parent | a40d223e7a1a7e1dc7640c068ae1265dc6e2a438 (diff) | |
| download | nuk.lv2-0009eeaa2cb6d7fecb8bfb8f3cff559f30b3a89c.tar.xz | |
Merge commit 'a40d223e7a1a7e1dc7640c068ae1265dc6e2a438'
| -rw-r--r-- | pugl/pugl/pugl_osx.m | 6 | ||||
| -rw-r--r-- | pugl/pugl/pugl_x11.c | 16 |
2 files changed, 7 insertions, 15 deletions
diff --git a/pugl/pugl/pugl_osx.m b/pugl/pugl/pugl_osx.m index 5f57798..014d553 100644 --- a/pugl/pugl/pugl_osx.m +++ b/pugl/pugl/pugl_osx.m @@ -544,12 +544,6 @@ void puglEnterContext(PuglView* view) { [[view->impl->glview openGLContext] makeCurrentContext]; -#ifdef PUGL_HAVE_CAIRO - if (view->ctx_type & PUGL_CAIRO) { - cairo_set_source_rgb(view->impl->cr, 0, 0, 0); - cairo_paint(view->impl->cr); - } -#endif } void diff --git a/pugl/pugl/pugl_x11.c b/pugl/pugl/pugl_x11.c index a8daac4..28fe99f 100644 --- a/pugl/pugl/pugl_x11.c +++ b/pugl/pugl/pugl_x11.c @@ -60,7 +60,8 @@ static int attrListDbl[] = { GLX_RED_SIZE , 4, GLX_GREEN_SIZE , 4, GLX_BLUE_SIZE , 4, - GLX_DEPTH_SIZE , 16, + GLX_DEPTH_SIZE , 8, + GLX_STENCIL_SIZE , 8, /* GLX_SAMPLE_BUFFERS , 1, */ /* GLX_SAMPLES , 4, */ None @@ -73,7 +74,8 @@ static int attrListSgl[] = { GLX_RED_SIZE , 4, GLX_GREEN_SIZE , 4, GLX_BLUE_SIZE , 4, - GLX_DEPTH_SIZE , 16, + GLX_DEPTH_SIZE , 8, + GLX_STENCIL_SIZE , 8, /* GLX_SAMPLE_BUFFERS , 1, */ /* GLX_SAMPLES , 4, */ None @@ -222,12 +224,6 @@ puglEnterContext(PuglView* view) glXMakeCurrent(view->impl->display, view->impl->win, view->impl->ctx); } #endif -#ifdef PUGL_HAVE_CAIRO - if (view->ctx_type & PUGL_CAIRO) { - cairo_set_source_rgb(view->impl->cr, 0, 0, 0); - cairo_paint(view->impl->cr); - } -#endif } void @@ -742,7 +738,9 @@ puglProcessEvents(PuglView* view) } } - if (config_event.type) { + if (config_event.type + && ( (view->width != config_event.configure.width) + || (view->height != config_event.configure.height) )) { #ifdef PUGL_HAVE_CAIRO if (view->ctx_type == PUGL_CAIRO) { // Resize surfaces/contexts before dispatching |