diff options
| author | Andre Heider <[email protected]> | 2019-02-06 02:26:45 +0100 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2019-02-21 10:26:12 -0800 |
| commit | f89a57881826b743a2f8b04f3143c6a4299e7a9b (patch) | |
| tree | ca6837dfee95110f4a61729b8c73649f9065d586 | |
| parent | be49fb051d236306579e33b90a65cb7b7b94c3e2 (diff) | |
iris: fix build with gallium nine
Signed-off-by: Andre Heider <[email protected]>
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/meson.build | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 2d18881fff4..44bc2f7c2a4 100644 --- a/meson.build +++ b/meson.build @@ -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 diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build index bc72b1110a0..db8c6b0a692 100644 --- a/src/gallium/targets/d3dadapter9/meson.build +++ b/src/gallium/targets/d3dadapter9/meson.build @@ -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), |