Mesa (staging/22.0): meson: remove unused defines

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: f32f4727ad81b6e934122f4120393ddc74edce8a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f32f4727ad81b6e934122f4120393ddc74edce8a

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Thu Apr 28 14:05:14 2022 +0200

meson: remove unused defines

These defines are no longer used since we removed libmesa_classic.

Fixes: e030d5ba8ac ("mesa: Delete libmesa_classic")
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16213>
(cherry picked from commit 36250e839b2b54944511b245100622ab352d5879)

---

 .pick_status.json | 2 +-
 meson.build       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index bf58526db98..e4228477662 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -804,7 +804,7 @@
         "description": "meson: remove unused defines",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "e030d5ba8ac321b4d75587d72a0a381bb906d70e"
     },
     {
diff --git a/meson.build b/meson.build
index bca6b1f5c41..4d365a272bc 100644
--- a/meson.build
+++ b/meson.build
@@ -1952,9 +1952,6 @@ if with_osmesa
       error('OSMesa bits must be 8 if building glx or dri based drivers')
     endif
     osmesa_lib_name = osmesa_lib_name + osmesa_bits
-    pre_args += [
-      '-DCHAN_BITS=@0@'.format(osmesa_bits), '-DDEFAULT_SOFTWARE_DEPTH_BITS=31'
-    ]
   endif
 endif