summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2022-04-28 14:05:14 +0200
committerDylan Baker <dylan.c.baker@intel.com>2022-05-03 10:06:43 -0700
commit5186ec497b412259506160d2af884da43c8e2741 (patch)
treee5b3bee6e3e2ebbe73551addd13155d17c0dda40
parent31e62cc1eb88277a65b1a914cad7b109bb61dda4 (diff)
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@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16213> (cherry picked from commit 36250e839b2b54944511b245100622ab352d5879)
-rw-r--r--.pick_status.json2
-rw-r--r--meson.build3
2 files changed, 1 insertions, 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