Mesa (staging/22.1): glx/drisw: store the flush extension to the screen

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 9b1b760ffaf5c69928c48a9a9dcf362911944525
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b1b760ffaf5c69928c48a9a9dcf362911944525

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Jun 20 15:36:58 2022 -0400

glx/drisw: store the flush extension to the screen

cc: mesa-stable

Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17147>
(cherry picked from commit 23b63e536e54c00de9dc1b634265de3337318588)

---

 .pick_status.json    | 2 +-
 src/glx/drisw_glx.c  | 2 ++
 src/glx/drisw_priv.h | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 5674fbc10e6..2ba088eb80c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -661,7 +661,7 @@
         "description": "glx/drisw: store the flush extension to the screen",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
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;