iris: fix build with gallium nine
authorAndre Heider <a.heider@gmail.com>
Wed, 6 Feb 2019 01:26:45 +0000 (02:26 +0100)
committerKenneth Graunke <kenneth@whitecape.org>
Thu, 21 Feb 2019 18:26:12 +0000 (10:26 -0800)
Signed-off-by: Andre Heider <a.heider@gmail.com>
meson.build
src/gallium/targets/d3dadapter9/meson.build

index 2d18881fff441d2ef572e886de654dd77008e592..44bc2f7c2a4036c54463c4a39462551f00a7b98f 100644 (file)
@@ -618,7 +618,8 @@ if with_gallium_st_nine
   if not with_gallium_softpipe
     error('The nine state tracker requires gallium softpipe/llvmpipe.')
   elif not (with_gallium_radeonsi or with_gallium_nouveau or with_gallium_r600
-            or with_gallium_r300 or with_gallium_svga or with_gallium_i915)
+            or with_gallium_r300 or with_gallium_svga or with_gallium_i915
+            or with_gallium_iris)
     error('The nine state tracker requires at least one non-swrast gallium driver.')
   endif
   if not with_dri3
index bc72b1110a0855b45d1db19c9cdc23a0fd395483..db8c6b0a692181919c20e05d63217ac1d5a2e2ff 100644 (file)
@@ -50,12 +50,12 @@ libgallium_nine = shared_library(
   link_with : [
     libgalliumvl_stub, libgallium, libnine_st, libmesa_util,
     libpipe_loader_static, libws_null, libwsw, libswdri,
-    libswkmsdri,
+    libswkmsdri, libnir,
   ],
   dependencies : [
     dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
-    driver_i915, driver_svga,
+    driver_i915, driver_svga, driver_iris
   ],
   name_prefix : '',
   version : '.'.join(nine_version),