meson: build r200 driver

v2: - remove TODO that is done

Build tested only

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/meson.build b/meson.build
index 5ca5c64954a2ab9f6dc3b9943db3a893aed9af77..b6293760fafc5d9a0ff8d3c2ba4d4740498e69ec 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -88,6 +88,7 @@ with_dri = false
 with_dri_i915 = false
 with_dri_i965 = false
 with_dri_r100 = false
+with_dri_r200 = false
 with_dri_swrast = false
 _drivers = get_option('dri-drivers')
 if _drivers != ''
@@ -95,6 +96,7 @@ if _drivers != ''
   with_dri_i915 = _split.contains('i915')
   with_dri_i965 = _split.contains('i965')
   with_dri_r100 = _split.contains('r100')
+  with_dri_r200 = _split.contains('r200')
   with_dri_swrast = _split.contains('swrast')
   with_dri = true
 endif
@@ -629,7 +631,7 @@ dep_libdrm_freedreno = []
 if with_amd_vk or with_gallium_radeonsi
   dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.85')
 endif
-if with_gallium_radeonsi or with_dri_r100 # older radeon too
+if with_gallium_radeonsi or with_dri_r100 or with_dri_r200
   dep_libdrm_radeon = dependency('libdrm_radeon', version : '>= 2.4.71')
 endif
 if with_gallium_nouveau

diff --git a/meson_options.txt b/meson_options.txt
index b0d32cdc94f659a5937c21978a7900a004c81d45..6208cb54187db12a07f2ced98d10adabd5e1e093 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,7 +34,7 @@ option(
 option(
   'dri-drivers',
   type : 'string',
-  value : 'i915,i965,r100',
+  value : 'i915,i965,r100,r200',
   description : 'comma separated list of dri drivers to build.'
 )
 option(

diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index bb65fb2521037f365f1e7a424294ff89ef8aeaa9..5385dcc016f3d91d39ebe39b9e15ac82e06be707 100644 (file)
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -34,6 +34,9 @@ endif
 if with_dri_r100
   subdir('radeon')
 endif
+if with_dri_r200
+  subdir('r200')
+endif
 
 if dri_drivers != []
   libmesa_dri_drivers = shared_library(

diff --git a/src/mesa/drivers/dri/r200/meson.build b/src/mesa/drivers/dri/r200/meson.build
new file mode 100644 (file)
index 0000000..8389b4f
--- /dev/null
+++ b/src/mesa/drivers/dri/r200/meson.build
@@ -0,0 +1,91 @@
+# 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
+# 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_r200 = files(
+  'radeon_buffer_objects.c',
+  'radeon_buffer_objects.h',
+  'radeon_cmdbuf.h',
+  'radeon_common.c',
+  'radeon_common.h',
+  'radeon_common_context.c',
+  'radeon_common_context.h',
+  'radeon_debug.c',
+  'radeon_debug.h',
+  'radeon_dma.c',
+  'radeon_dma.h',
+  'radeon_fbo.c',
+  'radeon_fog.c',
+  'radeon_fog.h',
+  'radeon_mipmap_tree.c',
+  'radeon_mipmap_tree.h',
+  'radeon_pixel_read.c',
+  'radeon_queryobj.c',
+  'radeon_queryobj.h',
+  'radeon_span.c',
+  'radeon_span.h',
+  'radeon_tex_copy.c',
+  'radeon_texture.c',
+  'radeon_texture.h',
+  'radeon_tile.c',
+  'radeon_tile.h',
+  'r200_blit.c',
+  'r200_blit.h',
+  'r200_cmdbuf.c',
+  'r200_context.c',
+  'r200_context.h',
+  'r200_fragshader.c',
+  'r200_ioctl.c',
+  'r200_ioctl.h',
+  'r200_maos.c',
+  'r200_maos.h',
+  'r200_reg.h',
+  'r200_sanity.c',
+  'r200_sanity.h',
+  'r200_state.c',
+  'r200_state.h',
+  'r200_state_init.c',
+  'r200_swtcl.c',
+  'r200_swtcl.h',
+  'r200_tcl.c',
+  'r200_tcl.h',
+  'r200_tex.c',
+  'r200_tex.h',
+  'r200_texstate.c',
+  'r200_vertprog.c',
+  'r200_vertprog.h',
+  'radeon_chipset.h',
+  'radeon_screen.c',
+  'radeon_screen.h',
+  'server/radeon_reg.h',
+)
+
+libr200 = static_library(
+  'r200',
+  [files_r200, xmlpool_options_h],
+  include_directories : [
+    inc_common, inc_dri_common, inc_util, include_directories('server'),
+  ],
+  c_args : [c_vis_args, '-DRADEON_R200'],
+  cpp_args : [cpp_vis_args],
+  dependencies : [dep_libdrm, dep_libdrm_radeon],
+)
+
+dri_drivers += libr200
+dri_link += 'r200_dri.so'