From c2739fefe347f1159ecd41beb98e89de1beec91a Mon Sep 17 00:00:00 2001
From: Antoine Coutant <antoine.coutant@smile.fr>
Date: Thu, 4 Apr 2024 09:38:32 +0200
Subject: [PATCH] drisw: fix build without dri3

commit 1887368df41 ("glx/sw: check for modifier support in the kopper path")
added dri3_priv.h header and dri3_check_multibuffer() function in drisw that
can be build without dri3.

Commit 4477139ec2e added a guard around dri3_check_multibuffer()
function but not around dri3_priv.h header.

Add HAVE_DRI3 guard around dri3_priv.h header.

Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path")

v2: Remove the guard around dri3_check_multibuffer() function.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478>
(cherry picked from commit 3163b65ba73c4c6343e1d3ee69db07721a3713bf)
---
 .pick_status.json   | 2 +-
 src/glx/drisw_glx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 60468315857..c03b2cfb8a7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4564,7 +4564,7 @@
         "description": "drisw: fix build without dri3",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "1887368df4166ae854245c0306d43661ef120e42",
         "notes": null
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index cbba547d7eb..f9465c4a512 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -32,7 +32,9 @@
 #include <dlfcn.h>
 #include "dri_common.h"
 #include "drisw_priv.h"
+#ifdef HAVE_DRI3
 #include "dri3_priv.h"
+#endif
 #include <X11/extensions/shmproto.h>
 #include <assert.h>
 #include <vulkan/vulkan_core.h>