This is a requirement of the next patch. Since meson does not have
forward declarations, and we're going to define the driver dependencies
in the drivers folder they need to be after the winsys so that the
winsys libs are defined first.
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
src/gallium/meson.build | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index be830f5f7d6..4aa10826204 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -48,32 +48,32 @@ if with_gallium_r600
subdir('drivers/r600')
endif
if with_gallium_radeonsi
+ subdir('winsys/amdgpu/drm')
subdir('drivers/radeon')
subdir('drivers/radeonsi')
- subdir('winsys/amdgpu/drm')
endif
if with_gallium_nouveau
- subdir('drivers/nouveau')
subdir('winsys/nouveau/drm')
+ subdir('drivers/nouveau')
endif
if with_gallium_freedreno
- subdir('drivers/freedreno')
subdir('winsys/freedreno/drm')
+ subdir('drivers/freedreno')
endif
if with_gallium_pl111
subdir('winsys/pl111/drm')
endif
if with_gallium_vc4
- subdir('drivers/vc4')
subdir('winsys/vc4/drm')
+ subdir('drivers/vc4')
endif
if with_gallium_vc5
- subdir('drivers/vc5')
subdir('winsys/vc5/drm')
+ subdir('drivers/vc5')
endif
if with_gallium_etnaviv
- subdir('drivers/etnaviv')
subdir('winsys/etnaviv/drm')
+ subdir('drivers/etnaviv')
endif
if with_gallium_imx
subdir('winsys/imx/drm')
@@ -83,13 +83,13 @@ if with_gallium_i915
subdir('drivers/i915')
endif
if with_gallium_svga
- subdir('drivers/svga')
subdir('winsys/svga/drm')
+ subdir('drivers/svga')
endif
if with_gallium_virgl
- subdir('drivers/virgl')
subdir('winsys/virgl/drm')
subdir('winsys/virgl/vtest')
+ subdir('drivers/virgl')
endif
# TODO: SWR
# TODO: clover
--
2.15.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
