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 <thellstrom@vmware.com>

diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 1be6dd910b85f633a5080ef28b9128483cd6b448..8f6406ddaee20c469523c84b9ca9936260904d7c 100644 (file)
--- 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)
 {
 void
 xmesa_check_buffer_size(XMesaBuffer b)
 {

+   GLuint old_width, old_height;
+

    if (b->type == PBUFFER)
       return;
 
    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_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);

 }
 
 
 }