Tested with a GK107.
v2: - Add target for nouveau standalone compiler. This target is not
built by default.
Signed-off-by: Dylan Baker
---
meson.build | 6 +
src/gallium/drivers/nouveau/meson.build | 224 +++
src/gallium/meson.build | 3 +-
src/gallium/targets/dri/meson.build | 5 +
src/gallium/{ => winsys/nouveau/drm}/meson.build | 57 +-
5 files changed, 247 insertions(+), 48 deletions(-)
create mode 100644 src/gallium/drivers/nouveau/meson.build
copy src/gallium/{ => winsys/nouveau/drm}/meson.build (53%)
diff --git a/meson.build b/meson.build
index 80ff434fc58..84c147e866e 100644
--- a/meson.build
+++ b/meson.build
@@ -90,11 +90,13 @@ endif
with_gallium = false
with_gallium_radeonsi = false
+with_gallium_nouveau = false
with_gallium_softpipe = false
_drivers = get_option('gallium-drivers')
if _drivers != ''
_split = _drivers.split(',')
with_gallium_radeonsi = _split.contains('radeonsi')
+ with_gallium_nouveau = _split.contains('nouveau')
with_gallium = true
with_dri = true
endif
@@ -544,12 +546,16 @@ dep_m = cc.find_library('m', required : false)
dep_libdrm_amdgpu = []
dep_libdrm_radeon = []
+dep_libdrm_nouveau = []
if with_amd_vk or with_gallium_radeonsi
dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.82')
endif
if with_gallium_radeonsi # older radeon too
dep_libdrm_radeon = dependency('libdrm_radeon', version : '>= 2.4.82')
endif
+if with_gallium_nouveau
+ dep_libdrm_nouveau = dependency('libdrm_nouveau', version : '>= 2.4.66')
+endif
llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
if with_amd_vk
diff --git a/src/gallium/drivers/nouveau/meson.build
b/src/gallium/drivers/nouveau/meson.build
new file mode 100644
index 000..2bc6142879e
--- /dev/null
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -0,0 +1,224 @@
+# Copyright ?? 2017 Dylan Baker
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+files_libnouveau = files(
+ 'nouveau_buffer.c',
+ 'nouveau_buffer.h',
+ 'nouveau_context.h',
+ 'nouveau_debug.h',
+ 'nouveau_fence.c',
+ 'nouveau_fence.h',
+ 'nouveau_gldefs.h',
+ 'nouveau_heap.c',
+ 'nouveau_heap.h',
+ 'nouveau_mm.c',
+ 'nouveau_mm.h',
+ 'nouveau_screen.c',
+ 'nouveau_screen.h',
+ 'nouveau_statebuf.h',
+ 'nouveau_video.c',
+ 'nouveau_video.h',
+ 'nouveau_vp3_video_bsp.c',
+ 'nouveau_vp3_video.c',
+ 'nouveau_vp3_video.h',
+ 'nouveau_vp3_video_vp.c',
+ 'nouveau_winsys.h',
+ 'nv17_mpeg.xml.h',
+ 'nv31_mpeg.xml.h',
+ 'nv_m2mf.xml.h',
+ 'nv_object.xml.h',
+ 'nv30/nv01_2d.xml.h',
+ 'nv30/nv30-40_3d.xml.h',
+ 'nv30/nv30_clear.c',
+ 'nv30/nv30_context.c',
+ 'nv30/nv30_context.h',
+ 'nv30/nv30_draw.c',
+ 'nv30/nv30_format.c',
+ 'nv30/nv30_format.h',
+ 'nv30/nv30_fragprog.c',
+ 'nv30/nv30_fragtex.c',
+ 'nv30/nv30_miptree.c',
+ 'nv30/nv30_push.c',
+ 'nv30/nv30_query.c',
+ 'nv30/nv30_resource.c',
+ 'nv30/nv30_resource.h',
+ 'nv30/nv30_screen.c',
+ 'nv30/nv30_screen.h',
+ 'nv30/nv30_state.c',
+ 'nv30/nv30_state.h',
+ 'nv30/nv30_state_validate.c',
+ 'nv30/nv30_texture.c',
+ 'nv30/nv30_transfer.c',
+ 'nv30/nv30_transfer.h',
+ 'nv30/nv30_vbo.c',
+ 'nv30/nv30_vertprog.c',
+ 'nv30/nv30_vertprog.h',
+ 'nv30/nv30_winsys.h',
+ 'nv30/nv40_vertprog.h',
+ 'nv30/nv40_verttex.c',
+ 'nv30/nvfx_fragprog.c',
+ 'nv30/nvfx_shader.h',
+ 'nv30/nvfx_vertprog.c',
+ 'nv50/g80_defs.xml.h',
+ 'nv50/g80_texture.xml.h',
+ 'nv50/nv50_2d.xml.h',
+ 'nv50/nv50_3ddefs.xml.h',
+ 'nv50/nv50_3d.xml.h',
+ 'nv50/nv50_blit.h',
+ 'nv50/nv50_compute.c',
+ 'nv50/nv50_compute.xml.h',
+ 'nv50/nv50_context.c',
+ 'nv50/nv50_context.h',
+ 'nv50/nv50_formats.c',
+ 'nv50/nv50_miptree.c',
+ 'nv50/nv50_program.c',
+ 'nv50/nv50_program.h',
+ 'nv50/nv50_push.c',
+ 'nv50/nv50_query.c',
+ 'nv50/nv50_query.h',
+ 'nv50/nv50_query_hw.c',
+ 'nv50/nv50_query_hw.h',
+ 'nv50/nv50_
