meson/crocus: add prefer-crocus option.

This just allows picking crocus without having to set the env var.

Acked-by: Alyssa Rosenzweig <alyssa@collabora.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11353>

diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
index 7dfd550..6c0cb46 100644 (file)
--- a/include/pci_ids/i965_pci_ids.h
+++ b/include/pci_ids/i965_pci_ids.h
@@ -1,3 +1,4 @@
+#ifndef PREFER_CROCUS
 CHIPSET(0x29A2, i965,    "BW",      "Intel(R) 965G")
 CHIPSET(0x2992, i965,    "BW",      "Intel(R) 965Q")
 CHIPSET(0x2982, i965,    "BW",      "Intel(R) 965G")
@@ -102,6 +103,7 @@ CHIPSET(0x22B0, chv,     "CHV",     "Intel(R) HD Graphics")
 CHIPSET(0x22B1, chv,     "BSW",     "Intel(R) HD Graphics XXX") /* Overridden in brw_get_renderer_string */
 CHIPSET(0x22B2, chv,     "CHV",     "Intel(R) HD Graphics")
 CHIPSET(0x22B3, chv,     "CHV",     "Intel(R) HD Graphics")
+#endif
 
 #ifndef PREFER_IRIS
 CHIPSET(0x1602, bdw_gt1, "BDW GT1", "Intel(R) HD Graphics")

diff --git a/meson_options.txt b/meson_options.txt
index 1e0986b..42ea224 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -445,6 +445,12 @@ option(
   value : true,
   description : 'Prefer new Intel iris driver over older i965 driver'
 )
+option(
+  'prefer-crocus',
+  type : 'boolean',
+  value : false,
+  description : 'Prefer new crocus driver over older i965 driver for gen4-7'
+)
 option('egl-lib-suffix',
   type : 'string',
   value : '',

diff --git a/src/loader/meson.build b/src/loader/meson.build
index 57a93c3..37cd44c 100644 (file)
--- a/src/loader/meson.build
+++ b/src/loader/meson.build
@@ -45,6 +45,10 @@ if with_gallium_iris and get_option('prefer-iris')
   loader_c_args += ['-DPREFER_IRIS']
 endif
 
+if with_gallium_crocus and get_option('prefer-crocus')
+  loader_c_args += ['-DPREFER_CROCUS']
+endif
+
 libloader = static_library(
   'loader',
   ['loader_dri_helper.c', 'loader.c', 'pci_id_driver_map.c'],