Mesa (master): gallium: remove DROP_PIPE_LOADER_MISC

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2944b4b6b4da8f72cdf2c09ff027485f4236e638
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2944b4b6b4da8f72cdf2c09ff027485f4236e638

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Wed Feb 24 06:20:36 2021 +0100

gallium: remove DROP_PIPE_LOADER_MISC

not needed since these code paths are always enabled

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7208>

---

 src/gallium/auxiliary/pipe-loader/Android.mk       | 1 -
 src/gallium/auxiliary/pipe-loader/SConscript       | 1 -
 src/gallium/auxiliary/pipe-loader/meson.build      | 3 ---
 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 6 +-----
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/Android.mk b/src/gallium/auxiliary/pipe-loader/Android.mk
index 075bf8af436..de07a03ce67 100644
--- a/src/gallium/auxiliary/pipe-loader/Android.mk
+++ b/src/gallium/auxiliary/pipe-loader/Android.mk
@@ -31,7 +31,6 @@ include $(CLEAR_VARS)
 LOCAL_CFLAGS := \
 	-DHAVE_PIPE_LOADER_DRI \
 	-DHAVE_PIPE_LOADER_KMS \
-	-DDROP_PIPE_LOADER_MISC \
 	-DGALLIUM_STATIC_TARGETS
 
 LOCAL_SRC_FILES := \
diff --git a/src/gallium/auxiliary/pipe-loader/SConscript b/src/gallium/auxiliary/pipe-loader/SConscript
index 14e1b350aea..0fd4dccb6fa 100644
--- a/src/gallium/auxiliary/pipe-loader/SConscript
+++ b/src/gallium/auxiliary/pipe-loader/SConscript
@@ -11,7 +11,6 @@ env.Append(CPPPATH = [
 
 env.Append(CPPDEFINES = [
     ('HAVE_PIPE_LOADER_DRI', '1'),
-    ('DROP_PIPE_LOADER_MISC', '1'),
     ('GALLIUM_STATIC_TARGETS', '1'),
 ])
 
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
index 1c4dbbf4a74..9df596f9bb4 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -39,9 +39,6 @@ endif
 if with_gallium_drisw_kms
   libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS'
 endif
-if not (with_gallium_st_nine or with_gallium_opencl)
-  libpipe_loader_defines += '-DDROP_PIPE_LOADER_MISC'
-endif
 
 libpipe_loader_static = static_library(
   'pipe_loader_static',
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
index 405ac7c56b4..daf1546851d 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
@@ -75,11 +75,7 @@ static const struct sw_driver_descriptor driver_descriptors = {
          .create_winsys = kms_dri_create_winsys,
       },
 #endif
-/**
- * XXX: Do not include these two for non autotools builds.
- * They don't have neither opencl nor nine, where these are used.
- */
-#ifndef DROP_PIPE_LOADER_MISC
+#ifndef __ANDROID__
       {
          .name = "null",
          .create_winsys = null_sw_create,