dri3: Return the current swap interval from glXGetSwapIntervalMESA().

We were caching only the value set with glXSwapIntervalSGI(), missing out
on the default setting of the swap interval by the loader.  This fixes
glxgears's warning about being vblank synchronized by default.

Fixes: 9777c4234b0e ("loader: drop the [gs]et_swap_interval callbacks")
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 9d023341e6b944bb40daf64ff68b6eaef14c128b..8d5b9c2051ecefcef7cd40046e7df44b2545135c 100644 (file)
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -649,7 +649,6 @@ dri3_set_swap_interval(__GLXDRIdrawable *pdraw, int interval)
       break;
    }
 
       break;
    }
 

-   priv->swap_interval = interval;

    loader_dri3_set_swap_interval(&priv->loader_drawable, interval);
 
    return 0;
    loader_dri3_set_swap_interval(&priv->loader_drawable, interval);
 
    return 0;


@@ -666,7 +665,7 @@ dri3_get_swap_interval(__GLXDRIdrawable *pdraw)
 
    struct dri3_drawable *priv =  (struct dri3_drawable *) pdraw;
 
 
    struct dri3_drawable *priv =  (struct dri3_drawable *) pdraw;
 

-  return priv->swap_interval;
+  return priv->loader_drawable.swap_interval;

 }
 
 static void
 }
 
 static void

diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
index 1d3c03f99973f63c9c9e518c884d8babdd5b2460..32a8d3f7e7df018a1b3bcd06a12b64852e14e79e 100644 (file)
--- a/src/glx/dri3_priv.h
+++ b/src/glx/dri3_priv.h
@@ -117,7 +117,6 @@ struct dri3_context
 struct dri3_drawable {
    __GLXDRIdrawable base;
    struct loader_dri3_drawable loader_drawable;
 struct dri3_drawable {
    __GLXDRIdrawable base;
    struct loader_dri3_drawable loader_drawable;

-   int swap_interval;

 
    /* LIBGL_SHOW_FPS support */
    uint64_t previous_ust;
 
    /* LIBGL_SHOW_FPS support */
    uint64_t previous_ust;