i965/miptree: Share tiling_flags in miptree_create

[mesa.git] / meson.build

diff --git a/meson.build b/meson.build
index e88616c9e82a9f45245c410e14d66e5e0cc27f53..7d12af3d5108f60594dd9ace5c61faf15aea8160 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -263,7 +263,6 @@ if with_glx == 'auto'
   elif with_gallium
     # Even when building just gallium drivers the user probably wants dri
     with_glx = 'dri'
-    with_dri = true
   elif with_platform_x11 and with_any_opengl and not with_any_vk
     # The automatic behavior should not be to turn on xlib based glx when
     # building only vulkan drivers
@@ -272,6 +271,11 @@ if with_glx == 'auto'
     with_glx = 'disabled'
   endif
 endif
+if with_glx == 'dri'
+   if with_gallium
+      with_dri = true
+   endif
+endif
 
 if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib')
   with_gles1 = false
@@ -441,7 +445,7 @@ elif not (with_gallium_r600 or with_gallium_nouveau)
 endif
 dep_xvmc = null_dep
 with_gallium_xvmc = false
-if _xmvc != 'false'
+if _xvmc != 'false'
   dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : _xvmc == 'true')
   with_gallium_xvmc = dep_xvmc.found()
 endif