Mesa (master): meson: Refuse to build lavapipe without llvmpipe

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3aa8cbc7840f0d4216e84a71754faecf847de564
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3aa8cbc7840f0d4216e84a71754faecf847de564

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Thu Apr  8 09:33:46 2021 -0700

meson: Refuse to build lavapipe without llvmpipe

This config doesn't work, and as of recently it no longer links.
Let's fail it early.

Fixes: 7b79db11c2e ("lavapipe: enable correct workgroup sizing")
Acked-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10107>

---

 meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 5b2e706e70e..9d77bdd7a0b 100644
--- a/meson.build
+++ b/meson.build
@@ -1605,6 +1605,8 @@ if with_llvm
 
   if draw_with_llvm
     pre_args += '-DDRAW_LLVM_AVAILABLE'
+  elif with_swrast_vk
+    error('Lavapipe requires LLVM draw support.')
   elif with_gallium_swr
     error('SWR requires LLVM draw support.')
   endif
@@ -1634,8 +1636,8 @@ if with_llvm
       cpp_args += '-fno-rtti'
     endif
   endif
-elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr
-  error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.')
+elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_swrast_vk
+  error('The following drivers require LLVM: Radv, RadeonSI, SWR, Lavapipe. One of these is enabled, but LLVM is disabled.')
 elif with_gallium_opencl
   error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.')
 elif with_microsoft_clc