[Mesa-dev] [PATCH 14/20] meson: build gallium winsys for dri, null, and wrapper

Dylan Baker Wed, 11 Oct 2017 10:42:55 -0700

Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
 meson.build                                     |  4 ++
 src/gallium/meson.build                         |  8 ++--
 src/gallium/{ => winsys/sw/dri}/meson.build     | 55 +++---------------------
 src/gallium/{ => winsys/sw/kms-dri}/meson.build | 57 ++++---------------------
 src/gallium/{ => winsys/sw/null}/meson.build    | 55 +++---------------------
 src/gallium/{ => winsys/sw/wrapper}/meson.build | 55 +++---------------------
 6 files changed, 38 insertions(+), 196 deletions(-)
 copy src/gallium/{ => winsys/sw/dri}/meson.build (53%)
 copy src/gallium/{ => winsys/sw/kms-dri}/meson.build (51%)
 copy src/gallium/{ => winsys/sw/null}/meson.build (53%)
 copy src/gallium/{ => winsys/sw/wrapper}/meson.build (53%)


diff --git a/meson.build b/meson.build
index a6ee0bf0f0f..cb883b085b6 100644
--- a/meson.build
+++ b/meson.build
@@ -515,11 +515,15 @@ else
   dep_clock = cc.find_library('rt')
 endif
 
+with_gallium_drisw_kms = false
 # TODO: conditionalize libdrm requirement
 dep_libdrm = dependency('libdrm', version : '>= 2.4.75',
                         required : with_dri2 or with_dri3)
 if dep_libdrm.found()
   pre_args += '-DHAVE_LIBDRM'
+  if with_dri_platform == 'drm' and with_dri
+    with_gallium_drisw_kms = true
+  endif
 endif
 
 # TODO: some of these may be conditional
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 0a808d3cfda..d500cf5493c 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -30,6 +30,10 @@ subdir('drivers/trace')
 subdir('drivers/rbug')
 subdir('drivers/radeon')
 subdir('drivers/radeonsi')
+subdir('winsys/sw/null')
+subdir('winsys/sw/dri')
+subdir('winsys/sw/kms-dri')
+subdir('winsys/sw/wrapper')
 subdir('winsys/radeon/drm')
 subdir('winsys/amdgpu/drm')
 subdir('state_trackers/dri')
@@ -47,11 +51,7 @@ subdir('state_trackers/dri')
 # TODO: SWR
 # TODO: vc4
 # TODO: virgl
-# TODO: winsys/sw/null
 # TODO: winsys/sw/xlib
-# TODO: winsys/sw/dri
-# TODO: winsys/sw/kms-dri
-# TODO: winsys/sw/wrapper
 # TODO: clover
 if with_dri
   #subdir('targets/dri')
diff --git a/src/gallium/meson.build b/src/gallium/winsys/sw/dri/meson.build
similarity index 53%
copy from src/gallium/meson.build
copy to src/gallium/winsys/sw/dri/meson.build
index 0a808d3cfda..6ada8d1bc7d 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/winsys/sw/dri/meson.build
@@ -18,51 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_gallium = include_directories('include')
-inc_gallium_drivers = include_directories('drivers')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
-subdir('drivers/ddebug')
-subdir('drivers/noop')
-subdir('drivers/trace')
-subdir('drivers/rbug')
-subdir('drivers/radeon')
-subdir('drivers/radeonsi')
-subdir('winsys/radeon/drm')
-subdir('winsys/amdgpu/drm')
-subdir('state_trackers/dri')
-# TODO: freedreno
-# TODO: i915
-# TODO: nouveau
-# TODO: SVGA
-# TODO: r300
-# TODO: r600
-# TODO: etnaviv
-# TODO: IMX
-# TODO: PL111
-# TODO: softpipe
-# TODO: llvmpipe
-# TODO: SWR
-# TODO: vc4
-# TODO: virgl
-# TODO: winsys/sw/null
-# TODO: winsys/sw/xlib
-# TODO: winsys/sw/dri
-# TODO: winsys/sw/kms-dri
-# TODO: winsys/sw/wrapper
-# TODO: clover
-if with_dri
-  #subdir('targets/dri')
-endif
-# TODO: dricommon
-# TODO: xlib-glx
-# TODO: OMX
-# TODO: osmesa
-# TODO: VA
-# TODO: vdpau
-# TODO: xa
-# TODO: xvmc
-# TODO: nine
-# TODO: tests
+libswdri = static_library(
+  'swdri',
+  files('dri_sw_winsys.c', 'dri_sw_winsys.h'),
+  c_args : c_vis_args,
+  include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
+  build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/winsys/sw/kms-dri/meson.build
similarity index 51%
copy from src/gallium/meson.build
copy to src/gallium/winsys/sw/kms-dri/meson.build
index 0a808d3cfda..a26644d4f7d 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/winsys/sw/kms-dri/meson.build
@@ -1,4 +1,4 @@
-# Copyright ?? 2017 Dylan Baker
+# Copyright ?? 2017 Intel Corporation
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,51 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_gallium = include_directories('include')
-inc_gallium_drivers = include_directories('drivers')
-inc_gallium_winsys = include_directories('winsys')
 
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
-subdir('drivers/ddebug')
-subdir('drivers/noop')
-subdir('drivers/trace')
-subdir('drivers/rbug')
-subdir('drivers/radeon')
-subdir('drivers/radeonsi')
-subdir('winsys/radeon/drm')
-subdir('winsys/amdgpu/drm')
-subdir('state_trackers/dri')
-# TODO: freedreno
-# TODO: i915
-# TODO: nouveau
-# TODO: SVGA
-# TODO: r300
-# TODO: r600
-# TODO: etnaviv
-# TODO: IMX
-# TODO: PL111
-# TODO: softpipe
-# TODO: llvmpipe
-# TODO: SWR
-# TODO: vc4
-# TODO: virgl
-# TODO: winsys/sw/null
-# TODO: winsys/sw/xlib
-# TODO: winsys/sw/dri
-# TODO: winsys/sw/kms-dri
-# TODO: winsys/sw/wrapper
-# TODO: clover
-if with_dri
-  #subdir('targets/dri')
-endif
-# TODO: dricommon
-# TODO: xlib-glx
-# TODO: OMX
-# TODO: osmesa
-# TODO: VA
-# TODO: vdpau
-# TODO: xa
-# TODO: xvmc
-# TODO: nine
-# TODO: tests
+libswkmsdri = static_library(
+  'swkmsdri',
+  files('kms_dri_sw_winsys.c', 'kms_dri_sw_winsys.h'),
+  c_args : c_vis_args,
+  include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
+  dependencies : dep_libdrm,
+  build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/winsys/sw/null/meson.build
similarity index 53%
copy from src/gallium/meson.build
copy to src/gallium/winsys/sw/null/meson.build
index 0a808d3cfda..08b0ff7e828 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/winsys/sw/null/meson.build
@@ -18,51 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_gallium = include_directories('include')
-inc_gallium_drivers = include_directories('drivers')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
-subdir('drivers/ddebug')
-subdir('drivers/noop')
-subdir('drivers/trace')
-subdir('drivers/rbug')
-subdir('drivers/radeon')
-subdir('drivers/radeonsi')
-subdir('winsys/radeon/drm')
-subdir('winsys/amdgpu/drm')
-subdir('state_trackers/dri')
-# TODO: freedreno
-# TODO: i915
-# TODO: nouveau
-# TODO: SVGA
-# TODO: r300
-# TODO: r600
-# TODO: etnaviv
-# TODO: IMX
-# TODO: PL111
-# TODO: softpipe
-# TODO: llvmpipe
-# TODO: SWR
-# TODO: vc4
-# TODO: virgl
-# TODO: winsys/sw/null
-# TODO: winsys/sw/xlib
-# TODO: winsys/sw/dri
-# TODO: winsys/sw/kms-dri
-# TODO: winsys/sw/wrapper
-# TODO: clover
-if with_dri
-  #subdir('targets/dri')
-endif
-# TODO: dricommon
-# TODO: xlib-glx
-# TODO: OMX
-# TODO: osmesa
-# TODO: VA
-# TODO: vdpau
-# TODO: xa
-# TODO: xvmc
-# TODO: nine
-# TODO: tests
+libws_null = static_library(
+  'ws_null',
+  files('null_sw_winsys.c', 'null_sw_winsys.h'),
+  c_args : c_vis_args,
+  include_directories : [inc_gallium, inc_src, inc_gallium_aux, inc_include],
+  build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/winsys/sw/wrapper/meson.build
similarity index 53%
copy from src/gallium/meson.build
copy to src/gallium/winsys/sw/wrapper/meson.build
index 0a808d3cfda..4672261f216 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/winsys/sw/wrapper/meson.build
@@ -18,51 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_gallium = include_directories('include')
-inc_gallium_drivers = include_directories('drivers')
-inc_gallium_winsys = include_directories('winsys')
-
-subdir('auxiliary')
-subdir('auxiliary/pipe-loader')
-subdir('drivers/ddebug')
-subdir('drivers/noop')
-subdir('drivers/trace')
-subdir('drivers/rbug')
-subdir('drivers/radeon')
-subdir('drivers/radeonsi')
-subdir('winsys/radeon/drm')
-subdir('winsys/amdgpu/drm')
-subdir('state_trackers/dri')
-# TODO: freedreno
-# TODO: i915
-# TODO: nouveau
-# TODO: SVGA
-# TODO: r300
-# TODO: r600
-# TODO: etnaviv
-# TODO: IMX
-# TODO: PL111
-# TODO: softpipe
-# TODO: llvmpipe
-# TODO: SWR
-# TODO: vc4
-# TODO: virgl
-# TODO: winsys/sw/null
-# TODO: winsys/sw/xlib
-# TODO: winsys/sw/dri
-# TODO: winsys/sw/kms-dri
-# TODO: winsys/sw/wrapper
-# TODO: clover
-if with_dri
-  #subdir('targets/dri')
-endif
-# TODO: dricommon
-# TODO: xlib-glx
-# TODO: OMX
-# TODO: osmesa
-# TODO: VA
-# TODO: vdpau
-# TODO: xa
-# TODO: xvmc
-# TODO: nine
-# TODO: tests
+libwsw = static_library(
+  'wsw',
+  files('wrapper_sw_winsys.c', 'wrapper_sw_winsys.h'),
+  c_args : c_vis_args,
+  include_directories : [inc_gallium, inc_include, inc_src, inc_gallium_aux],
+  build_by_default : false,
+)
-- 
2.14.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 14/20] meson: build gallium winsys for dri, null, and wrapper

Reply via email to