From c96144f04d4b6250606ce29c6f4c4c506988ce3c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 22 Feb 2021 15:57:01 +1000
Subject: [PATCH] glx: proposed fix for setSwapInterval

When mesa gets a DRI2 1.1 connection (as experienced with
vmwware DDX) we don't get a pointer for this.

Don't explode just keep going.

Fixes: 60ebeb4608a8 ("glx: Implement GLX_EXT_swap_control for DRI2 and DRI3")
Reviewed-by: Adam Jackson <ajaX@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9184>
(cherry picked from commit 279d1705525026c15e7cae88f8fa752046db1c19)
---
 .pick_status.json | 2 +-
 src/glx/glxcmds.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 8251f5bbef9..56b92aef697 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2353,7 +2353,7 @@
         "description": "glx: proposed fix for setSwapInterval",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "60ebeb4608a871ba89ba081c1c6e7ebdd5efec9a"
     },
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index fcd82bab4a4..d7875bf8c9e 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1863,8 +1863,8 @@ glXSwapIntervalEXT(Display *dpy, GLXDrawable drawable, int interval)
       __glXSendError(dpy, BadValue, interval, 0, True);
       return;
    }
-
-   pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
+   if (pdraw->psc->driScreen->setSwapInterval)
+      pdraw->psc->driScreen->setSwapInterval(pdraw, interval);
 #endif
 }