Import Mesa 21.1.5

1 files changed, 32 insertions, 17 deletions

diff --git a/lib/mesa/src/gallium/meson.build b/lib/mesa/src/gallium/meson.build
index 1f81fcf1f..733ab71e9 100644
--- a/lib/mesa/src/gallium/meson.build
+++ b/lib/mesa/src/gallium/meson.build
@@ -52,7 +52,7 @@ else
 endif
 if with_gallium_softpipe
   subdir('drivers/softpipe')
-  if with_llvm
+  if draw_with_llvm
     subdir('drivers/llvmpipe')
   endif
 else
@@ -137,7 +137,9 @@ else
   driver_i915 = declare_dependency()
 endif
 if with_gallium_svga
-  subdir('winsys/svga/drm')
+  if not with_platform_windows
+     subdir('winsys/svga/drm')
+  endif
   subdir('drivers/svga')
 else
   driver_svga = declare_dependency()
@@ -156,64 +158,73 @@ if with_gallium_lima
 else
   driver_lima = declare_dependency()
 endif
-
 if with_gallium_zink
   subdir('drivers/zink')
 else
   driver_zink = declare_dependency()
 endif
-
+if with_gallium_d3d12
+  subdir('drivers/d3d12')
+else
+  driver_d3d12 = declare_dependency()
+endif
 if with_gallium_opencl
   # TODO: this isn't really clover specific, but ATM clover is the only
   # consumer
   subdir('targets/pipe-loader')
 
-  subdir('state_trackers/clover')
+  subdir('frontends/clover')
   subdir('targets/opencl')
 endif
 if with_dri
-  subdir('state_trackers/dri')
+  subdir('frontends/dri')
   subdir('targets/dri')
 endif
-if with_osmesa == 'gallium'
-  subdir('state_trackers/osmesa')
+if with_osmesa
+  subdir('frontends/osmesa')
   subdir('targets/osmesa')
 endif
 if with_glx == 'gallium-xlib'
   subdir('winsys/sw/xlib')
-  subdir('state_trackers/glx/xlib')
+  subdir('frontends/glx/xlib')
   subdir('targets/libgl-xlib')
 endif
 if with_gallium_vdpau
-  subdir('state_trackers/vdpau')
+  subdir('frontends/vdpau')
   subdir('targets/vdpau')
 endif
 if with_gallium_xvmc
-  subdir('state_trackers/xvmc')
+  subdir('frontends/xvmc')
   subdir('targets/xvmc')
 endif
 if with_gallium_omx != 'disabled'
-  subdir('state_trackers/omx')
+  subdir('frontends/omx')
   subdir('targets/omx')
 endif
 if with_gallium_va
-  subdir('state_trackers/va')
+  subdir('frontends/va')
   subdir('targets/va')
 endif
 if with_gallium_xa
-  subdir('state_trackers/xa')
+  subdir('frontends/xa')
   subdir('targets/xa')
 endif
 if with_platform_haiku
-  subdir('state_trackers/hgl')
+  subdir('frontends/hgl')
   subdir('targets/haiku-softpipe')
 endif
 if with_gallium_st_nine
-  subdir('state_trackers/nine')
+  subdir('frontends/nine')
   subdir('targets/d3dadapter9')
 endif
 if with_platform_windows
-  subdir('state_trackers/wgl')
+  subdir('frontends/wgl')
+  if with_gallium_d3d12
+    subdir('winsys/d3d12/wgl')
+    subdir('targets/libgl-d3d12')
+  else
+    winsys_d3d12_wgl = declare_dependency()
+  endif
   subdir('targets/libgl-gdi')
 endif
 if with_tests
@@ -225,3 +236,7 @@ if with_tests
   endif
   subdir('tests')
 endif
+if with_swrast_vk
+  subdir('frontends/lavapipe')
+  subdir('targets/lavapipe')
+endif