aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2018-09-02 11:27:21 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2018-09-02 11:27:21 +0200
commit2965e7e2089a8e3d62f2b4a152db04fb702974e6 (patch)
treee34c225e780a0468a9b0a06571614e16693b6203
parentb07563b7fa705d368b96b52a8021cbc8d7bd4762 (diff)
parent1370909c16d43d7f312d9f39147c625b1e9b918c (diff)
downloadcanvas_display.lv2-2965e7e2089a8e3d62f2b4a152db04fb702974e6.tar.xz
Merge commit '1370909c16d43d7f312d9f39147c625b1e9b918c'
-rw-r--r--pugl/pugl/pugl_osx.m6
-rw-r--r--pugl/pugl/pugl_x11.c16
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