[Mesa-dev] [PATCH 8/9] meson: build classic osmesa

Thu Oct 26 09:25:10 UTC 2017

On Wednesday, 2017-10-25 15:58:22 -0700, Dylan Baker wrote:
> From: Dylan Baker <baker.dylan.c at gmail.com>
> 
> This builds the classic (non-gallium) osmesa with meson. This has been
> tested with the osdemo application from mesa-demos.
> 
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  include/meson.build                 |  2 +-
>  meson.build                         | 26 ++++++++++++++------
>  meson_options.txt                   | 14 +++++++++++
>  src/mapi/glapi/meson.build          |  2 +-
>  src/mesa/drivers/osmesa/meson.build | 48 +++++++++++++++++++++++++++++++++++++
>  src/mesa/meson.build                |  3 +++
>  src/meson.build                     |  1 -
>  7 files changed, 86 insertions(+), 10 deletions(-)
>  create mode 100644 src/mesa/drivers/osmesa/meson.build
> 
> diff --git a/include/meson.build b/include/meson.build
> index 88e66a1a8f4..b5f533bd185 100644
> --- a/include/meson.build
> +++ b/include/meson.build
> @@ -55,7 +55,7 @@ if with_glx != 'disabled'
>    install_headers('GL/glx.h', 'GL/glext.h', 'GL/glx_mangle.h', subdir : 'GL')
>  endif
>  
> -if with_osmesa
> +if with_osmesa != 'none'
>    install_headers('GL/osmesa.h', subdir : 'GL')
>  endif
>  
> diff --git a/meson.build b/meson.build
> index 5b31194b0df..79ce59c6b27 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -46,6 +46,8 @@ with_valgrind = get_option('valgrind')
>  with_libunwind = get_option('libunwind')
>  with_asm = get_option('asm')
>  with_llvm = get_option('llvm')
> +with_osmesa = get_option('osmesa')
> +with_glx_direct = true
>  if get_option('texture-float')
>    pre_args += '-DTEXTURE_FLOAT_ENABLED'
>    message('WARNING: Floating-point texture enabled. Please consult docs/patents.txt and your lawyer before building mesa.')
> @@ -67,9 +69,6 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
>  # Only build shared_glapi if at least one OpenGL API is enabled
>  with_shared_glapi = get_option('shared-glapi') and with_any_opengl
>  
> -# TODO: these will need options, but at the moment they just control header
> -# installs
> -with_osmesa = false
>  
>  # shared-glapi is required if at least two OpenGL APIs are being built
>  if not with_shared_glapi
> @@ -230,9 +229,6 @@ if with_glvnd and with_glx != 'dri'
>    message('glvnd requires dri based glx')
>  endif
>  
> -# TODO: toggle for this
> -with_glx_direct = true
> -

unrelated hunk?

>  if with_vulkan_icd_dir == ''
>    with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
>  endif
> @@ -704,7 +700,22 @@ endif
>  
>  # TODO: glx provider
>  
> -# TODO: osmesa provider
> +if with_osmesa != 'none'
> +  if with_osmesa == 'classic' and not with_dri_swrast
> +    error('OSMesa classic requires dri (classic) swrast.')
> +  endif
> +  osmesa_lib_name = 'OSMesa'
> +  osmesa_bits = get_option('osmesa-bits')
> +  if osmesa_bits != '8'
> +    if with_dri or with_glx != 'disabled'
> +      error('OSMesa bits must be 8 if building glx or dir based drivers')
> +    endif
> +    osmesa_lib_name = osmesa_lib_name + osmesa_bits
> +    pre_args += [
> +      '-DCHAN_BITS=@0@'.format(osmesa_bits), '-DDEFAULT_SOFTWARE_DEPTH_BITS=31'
> +    ]
> +  endif
> +endif
>  
>  # TODO: symbol mangling
>  
> @@ -731,6 +742,7 @@ dep_xext = []
>  dep_xdamage = []
>  dep_xfixes = []
>  dep_x11_xcb = []
> +dep_xcb = []
>  dep_xcb_glx = []
>  dep_xcb_dri2 = []
>  dep_xcb_dri3 = []
> diff --git a/meson_options.txt b/meson_options.txt
> index b44c93df001..97aca571a48 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -160,3 +160,17 @@ option(
>    value : false,
>    description : 'Enable floating point textures and renderbuffers. This option may be patent encumbered, please read docs/patents.txt and consult with your lawyer before turning this on.'
>  )
> +option(
> +  'osmesa',
> +  type : 'combo',
> +  value : 'none',
> +  choices : ['none', 'classic'],
> +  description : 'Build OSmesa.'
> +)
> +option(
> +  'osmesa-bits',
> +  type : 'combo',
> +  value : '8',
> +  choices : ['8', '16', '32'],
> +  description : 'Number of channel bits for OSMesa.'
> +)
> diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
> index 74f84d289ba..d2d86afd6c1 100644
> --- a/src/mapi/glapi/meson.build
> +++ b/src/mapi/glapi/meson.build
> @@ -69,7 +69,7 @@ endif
>  libglapi_static = static_library(
>    'glapi_static',
>    static_glapi_files,
> -  include_directories : [inc_mesa, inc_include, inc_src],
> +  include_directories : [inc_mesa, inc_include, inc_src, inc_mapi],
>    c_args : [c_msvc_compat_args, static_glapi_args],
>    dependencies : [dep_thread, dep_selinux],
>    build_by_default : false,
> diff --git a/src/mesa/drivers/osmesa/meson.build b/src/mesa/drivers/osmesa/meson.build
> new file mode 100644
> index 00000000000..14c61a85d60
> --- /dev/null
> +++ b/src/mesa/drivers/osmesa/meson.build
> @@ -0,0 +1,48 @@
> +# 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.
> +
> +osmesa_link_with = []
> +
> +if with_shared_glapi
> +  osmesa_link_with += libglapi
> +endif
> +
> +libosmesa = shared_library(
> +  osmesa_lib_name,
> +  ['osmesa.c', glapitable_h, glapitemp_h],
> +  c_args : c_vis_args,
> +  cpp_args : cpp_vis_args,
> +  link_args : ld_args_gc_sections,
> +  include_directories : [
> +    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
> +  ],
> +  link_with : [libmesa_classic, libglapi_static, osmesa_link_with],
> +  dependencies : [dep_thread],

+ dep_selinux, so it's wired in when selinux support is added :)

Other than that,
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

> +  version : '8.0.0',
> +  install : true,
> +)
> +
> +pkg.generate(
> +  name : 'osmesa',
> +  description : 'Mesa Off-screen Rendering Library',
> +  version : '8',
> +  libraries : libosmesa,
> +  libraries_private : gl_priv_libs,
> +)
> diff --git a/src/mesa/meson.build b/src/mesa/meson.build
> index 846a40da822..20d06aad4dd 100644
> --- a/src/mesa/meson.build
> +++ b/src/mesa/meson.build
> @@ -718,6 +718,9 @@ libmesa_gallium = static_library(
>  )
>  
>  subdir('drivers/dri')
> +if with_osmesa == 'classic'
> +  subdir('drivers/osmesa')
> +endif
>  if with_tests
>    subdir('main/tests')
>  endif
> diff --git a/src/meson.build b/src/meson.build
> index c32b666c8bc..b88db7fa40c 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -46,7 +46,6 @@ subdir('util')
>  subdir('mapi/glapi/gen')
>  subdir('mapi')
>  # TODO: opengl
> -# TODO: osmesa
>  subdir('compiler')
>  subdir('egl/wayland/wayland-drm')
>  subdir('vulkan')
> -- 
> 2.14.2
> 