42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 0fca6056aa9f9f609836330597bd0139bf0be2c4 Mon Sep 17 00:00:00 2001
|
|
From: Owen W. Taylor <otaylor@fishsoup.net>
|
|
Date: Fri, 30 Apr 2010 14:56:07 -0400
|
|
Subject: [PATCH 3/3] Ignore unexpected GLX_BufferSwapComplete
|
|
|
|
A server that supports GLX_BufferSwapComplete will always send
|
|
these events, so we should just silently ignore them if we've
|
|
chosen not to take advantage of the INTEL_swap_event GLX
|
|
extension.
|
|
|
|
http://bugzilla.openedhand.com/show_bug.cgi?id=2102
|
|
---
|
|
clutter/glx/clutter-event-glx.c | 11 ++++-------
|
|
1 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/clutter/glx/clutter-event-glx.c b/clutter/glx/clutter-event-glx.c
|
|
index 2034534..27b1d2b 100644
|
|
--- a/clutter/glx/clutter-event-glx.c
|
|
+++ b/clutter/glx/clutter-event-glx.c
|
|
@@ -82,14 +82,11 @@ clutter_backend_glx_handle_event (ClutterBackendX11 *backend_x11,
|
|
|
|
if (stage_x11->xwin == swap_complete_event->drawable)
|
|
{
|
|
- if (G_UNLIKELY (stage_glx->pending_swaps == 0))
|
|
- {
|
|
- g_warning ("Spurious GLX_BufferSwapComplete event received for "
|
|
- "stage drawable = 0x%08lx",
|
|
- swap_complete_event->drawable);
|
|
- }
|
|
- else
|
|
+ /* We don't have to select for swap events, so we'll
|
|
+ * get them even if we are choosing not to use them */
|
|
+ if (stage_glx->pending_swaps > 0)
|
|
stage_glx->pending_swaps--;
|
|
+
|
|
return TRUE;
|
|
}
|
|
}
|
|
--
|
|
1.7.0.1
|
|
|