From a221807dc5d69598afd1d0e0a4e715fb82a9f30d Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Sat, 2 Jul 2011 10:37:17 +0200 Subject: [PATCH 1/1] st/glx: Fix endless loop in drawable validation This fixes a regression introduced with commit "st-api: Rework how drawables are invalidated v3" where the glx state tracker manager would invalidate a drawable each time it checks the drawable dimensions, even during a validate call, which resulted in an endless loop, since the state tracker would immediately detect the new invalidation and rerun the validate... This change marks the drawable invalid only if the drawable dimensions actually changed during the validate, which will result in at most a single unnecessary validate by the context running a validate during which the dimensions changed. To avoid unnecessary validates altogether, we need to implement yet another st-api change: Returning the current time stamp from the validate function, as suggested by Chia-I Wu. The glx state tracker manager could then return the stamp resulting from the last drawable dimension check. Signed-off-by: Thomas Hellstrom --- src/gallium/state_trackers/glx/xlib/xm_api.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 1be6dd910b8..8f6406ddaee 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -1124,11 +1124,18 @@ xmesa_notify_invalid_buffer(XMesaBuffer b) void xmesa_check_buffer_size(XMesaBuffer b) { + GLuint old_width, old_height; + if (b->type == PBUFFER) return; + old_width = b->width; + old_height = b->height; + xmesa_get_window_size(b->xm_visual->display, b, &b->width, &b->height); - xmesa_notify_invalid_buffer(b); + + if (b->width != old_width || b->height != old_height) + xmesa_notify_invalid_buffer(b); } -- 2.30.2