Mesa (main): gallium: fix unused symbols warnings

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 4c1cb62999d2b5f2f1a6313ae61110fc7902372a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c1cb62999d2b5f2f1a6313ae61110fc7902372a

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Sun Apr 10 09:51:52 2022 +0200

gallium: fix unused symbols warnings

fixes: d760a915

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15840>

---

 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
index e822eae43b1..c042b92ccb1 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
@@ -58,7 +58,7 @@ struct pipe_loader_sw_device {
 #define pipe_loader_sw_device(dev) ((struct pipe_loader_sw_device *)dev)
 
 static const struct pipe_loader_ops pipe_loader_sw_ops;
-#ifdef HAVE_ZINK
+#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
 static const struct pipe_loader_ops pipe_loader_vk_ops;
 #endif
 
@@ -93,16 +93,14 @@ static const struct sw_driver_descriptor driver_descriptors = {
 };
 #endif
 
-#if defined(GALLIUM_STATIC_TARGETS) && defined(HAVE_ZINK)
+#if defined(GALLIUM_STATIC_TARGETS) && defined(HAVE_ZINK) && defined(HAVE_PIPE_LOADER_DRI)
 static const struct sw_driver_descriptor kopper_driver_descriptors = {
    .create_screen = sw_screen_create_zink,
    .winsys = {
-#ifdef HAVE_PIPE_LOADER_DRI
       {
          .name = "dri",
          .create_winsys = dri_create_sw_winsys,
       },
-#endif
 #ifdef HAVE_PIPE_LOADER_KMS
       {
          .name = "kms_dri",
@@ -158,7 +156,7 @@ pipe_loader_sw_probe_init_common(struct pipe_loader_sw_device *sdev)
    return true;
 }
 
-#ifdef HAVE_ZINK
+#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
 static bool
 pipe_loader_vk_probe_init_common(struct pipe_loader_sw_device *sdev)
 {
@@ -404,7 +402,7 @@ pipe_loader_sw_get_driconf(struct pipe_loader_device *dev, unsigned *count)
    return NULL;
 }
 
-#ifdef HAVE_ZINK
+#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
 static const driOptionDescription zink_driconf[] = {
       #include "zink/driinfo_zink.h"
 };
@@ -437,7 +435,7 @@ static const struct pipe_loader_ops pipe_loader_sw_ops = {
    .release = pipe_loader_sw_release
 };
 
-#ifdef HAVE_ZINK
+#if defined(HAVE_PIPE_LOADER_DRI) && defined(HAVE_ZINK)
 static const struct pipe_loader_ops pipe_loader_vk_ops = {
    .create_screen = pipe_loader_sw_create_screen,
    .get_driconf = pipe_loader_vk_get_driconf,