anv/entrypoints_gen: Allow the string map to grow

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index bb6a835084fe777813c07d60357f644448c6f2d1..08b9dd42163a7a7a797fad03eaedfecf11e79cff 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -464,30 +464,38 @@ endif
 
 _omx = get_option('gallium-omx')
 if not system_has_kms_drm
-  if _omx == 'true'
+  if _omx != 'disabled'
     error('OMX state tracker can only be built on unix-like OSes.')
   else
-    _omx = 'false'
+    _omx = 'disabled'
   endif
 elif not (with_platform_x11 or with_platform_drm)
-  if _omx == 'true'
+  if _omx != 'disabled'
     error('OMX state tracker requires X11 or drm platform support.')
   else
-    _omx = 'false'
+    _omx = 'disabled'
   endif
 elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
-  if _omx == 'true'
+  if _omx != 'disabled'
     error('OMX state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.')
   else
-    _omx = 'false'
+    _omx = 'disabled'
   endif
-elif _omx == 'auto'
-  _omx = 'true'
 endif
-with_gallium_omx = _omx == 'true'
+with_gallium_omx = _omx != 'disabled'
+gallium_omx = _omx
 dep_omx = []
-if with_gallium_omx
+dep_omx_other = []
+if gallium_omx == 'bellagio'
+  pre_args += '-DENABLE_ST_OMX_BELLAGIO'
   dep_omx = dependency('libomxil-bellagio')
+elif gallium_omx == 'tizonia'
+  pre_args += '-DENABLE_ST_OMX_TIZONIA'
+  dep_omx = dependency('libtizonia', version : '>= 0.10.0')
+  dep_omx_other = [
+    dependency('libtizplatform'),
+    dependency('tizilheaders')
+  ]
 endif
 
 omx_drivers_path = get_option('omx-libs-path')
@@ -1008,7 +1016,7 @@ if with_gallium_etnaviv
   dep_libdrm_etnaviv = dependency('libdrm_etnaviv', version : '>= 2.4.82')
 endif
 if with_gallium_freedreno
-  dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.89')
+  dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.91')
 endif
 
 llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']