re-add swrast

SolDev69 · Nov 29, 2023 · 45d6be5 · 45d6be5
1 parent bd57ecd
commit 45d6be5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -58,7 +58,7 @@ jobs:
             -Dopengl=true \
             -Dosmesa=true \
             -Dvulkan-drivers= \
-            -Dgallium-drivers=freedreno \
+            -Dgallium-drivers=swrast,freedreno \
             -Dfreedreno-kmds=kgsl \
             -Dshared-glapi=false
           ninja -C "build-android" install

diff --git a/meson.build b/meson.build
@@ -1879,6 +1879,9 @@ if dep_unwind.found()
 endif
 
 if with_osmesa
+  if not with_gallium_softpipe
+    error('OSMesa gallium requires gallium softpipe or llvmpipe.')
+  endif
   if host_machine.system() == 'windows'
     osmesa_lib_name = 'osmesa'
   else