diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 96b6f227408..a9c6aac40b3 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -837,6 +837,8 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions)
 	  __glXEnableDirectExtension(&psc->base,
 				     "GLX_ARB_context_flush_control");
       }
+      if (strcmp(extensions[i]->name, __DRI2_FLUSH) == 0)
+         psc->f = (__DRI2flushExtension *) extensions[i];
    }
 
    if (psc->kopper) {
diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h
index 401d94fc755..3843942ca1c 100644
--- a/src/glx/drisw_priv.h
+++ b/src/glx/drisw_priv.h
@@ -51,6 +51,7 @@ struct drisw_screen
    const __DRIcoreExtension *core;
    const __DRIswrastExtension *swrast;
    const __DRIkopperExtension *kopper;
+   const __DRI2flushExtension *f;
    const __DRItexBufferExtension *texBuffer;
    const __DRIcopySubBufferExtension *copySubBuffer;
    const __DRI2rendererQueryExtension *rendererQuery;