[Mesa-dev] [PATCH v2 07/12] meson: build glx

Thu Oct 5 21:03:34 UTC 2017

Quoting Eric Anholt (2017-10-05 12:18:39)
> Dylan Baker <dylan at pnwbakers.com> writes:
> 
> > This gets GLX and the loader building. The resulting GLX and i965 have
> > been tested on piglit and seem to work fine. This patch leaves a lot of
> > todo's in it's wake, GLX is quite complicated, and the build options
> > involved are many, and the goal at the moment is to get dri and gallium
> > drivers building.
> >
> > v2: - fix typo "vaule" -> "value"
> >     - put the not on the correct element of the conditional
> >     - Put correct description of dri3 option in this patch not the next
> >       one (Eric A)
> >     - fix non glvnd version (Eric A)
> >     - build glx tests
> >     - move loader include variables to this patch (Eric A)
> >
> > Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> 
> > diff --git a/src/glx/meson.build b/src/glx/meson.build
> > new file mode 100644
> > index 00000000000..ad9a559b908
> > --- /dev/null
> > +++ b/src/glx/meson.build
> > @@ -0,0 +1,185 @@
> > +# 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.
> > +
> > +# TODO: 
> > +#subdir('windows')
> > +
> > +files_libglx = files(
> > +  'clientattrib.c',
> > +  'clientinfo.c',
> > +  'compsize.c',
> > +  'create_context.c',
> > +  'eval.c',
> > +  'glxclient.h',
> > +  'glxcmds.c',
> > +  'glxconfig.c',
> > +  'glxconfig.h',
> > +  'glxcurrent.c',
> > +  'glx_error.c',
> > +  'glx_error.h',
> > +  'glxext.c',
> > +  'glxextensions.c',
> > +  'glxextensions.h',
> > +  'glxhash.c',
> > +  'glxhash.h',
> > +  'glx_pbuffer.c',
> > +  'glx_query.c',
> > +  'indirect_glx.c',
> > +  'indirect_init.h',
> > +  'indirect_texture_compression.c',
> > +  'indirect_transpose_matrix.c',
> > +  'indirect_vertex_array.c',
> > +  'indirect_vertex_array.h',
> > +  'indirect_vertex_array_priv.h',
> > +  'indirect_vertex_program.c',
> > +  'indirect_window_pos.c',
> > +  'packrender.h',
> > +  'packsingle.h',
> > +  'pixel.c',
> > +  'pixelstore.c',
> > +  'query_renderer.c',
> > +  'render2.c',
> > +  'renderpix.c',
> > +  'single2.c',
> > +  'singlepix.c',
> > +  'vertarr.c',
> > +)
> > +
> > +extra_libs_libglx = []
> > +
> > +if with_dri
> > +  files_libglx += files(
> > +    'dri_common.c',
> > +    'dri_common.h',
> > +    'dri_common_query_renderer.c',
> > +    'dri_common_interop.c',
> > +    'xfont.c',
> > +    'drisw_glx.c',
> > +    'drisw_priv.h',
> > +  )
> > +endif
> > +
> > +# dri2
> > +if with_dri and with_dri_platform == 'drm' and dep_libdrm.found()
> > +  files_libglx += files(
> > +    'dri2.c',
> > +    'dri2_glx.c',
> > +    'dri2.h',
> > +    'dri2_priv.h',
> > +    'dri_glx.c',
> > +    'dri_sarea.h',
> > +    'XF86dri.c',
> > +    'xf86dri.h',
> > +    'xf86dristr.h',
> > +  )
> > +endif
> > +
> > +if with_dri3
> > +  files_libglx += files('dri3_glx.c', 'dri3_priv.h')
> > +endif
> > +
> > +if with_appledri
> > +  files_libglx += files('applegl_glx.c')
> > +elif with_windowsdri
> > +  files_libglx += files('driwindows_glx.c')
> > +  # TODO
> > +  #extra_libs_libglx += [
> > +    #libwindowsdri,
> > +    #libwindowsglx,
> > +  #]
> > +endif
> > +
> > +dri_driver_dir = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
> > +if not with_glvnd
> > +  gl_lib_name = 'GL'
> > +  gl_lib_version = '1.0'
> 
> I think things are still busted here.  We want GL_LIB_NAME to be
> "libGL.so.1", but the installed lib should be libGL.so.1.2.  I don't
> think the change this time got either of those.

Ohhhh. Yeah. I can fix that.

> 
> > +else
> > +  gl_lib_name = 'GLX_mesa'
> > +  gl_lib_version = '0'
> > +  files_libglx += files(
> > +    'g_glxglvnddispatchfuncs.c',
> > +    'g_glxglvnddispatchindices.h',
> > +    'glxglvnd.c',
> > +    'glxglvnd.h',
> > +    'glxglvnddispatchfuncs.h',
> > +  )
> > +endif
> > +
> > +gl_lib_cargs = [
> > +  '-D_REENTRANT', '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir),
> > +]
> > +
> > +if dep_xf86vm != [] and dep_xf86vm.found()
> > +  gl_lib_cargs += '-DHAVE_XF86VIDMODE'
> > +endif
> > +
> > +libglx = static_library(
> > +  'glx',
> > +  [files_libglx, glx_generated],
> > +  include_directories : [
> > +    inc_common, inc_glapi, inc_loader,
> > +    include_directories('../../include/GL/internal'),
> > +  ],
> > +  c_args : [c_vis_args, gl_lib_cargs,
> > +            '-DGL_LIB_NAME="lib at 0@.so. at 1@"'.format(gl_lib_name, gl_lib_version)],
> > +  link_with : [libloader, libloader_dri3_helper, libmesa_util, libxmlconfig],
> > +  dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
> > +  build_by_default : false,
> > +)
> > +
> > +# workaround for bug #2180
> > +dummy_c = custom_target(
> > +  'dummy_c',
> > +  output : 'dummy.c',
> > +  command : [prog_touch, '@OUTPUT@'],
> > +)
> > +
> > +if with_glx == 'dri'
> > +  libgl = shared_library(
> > +    gl_lib_name,
> > +    dummy_c,  # workaround for bug #2180
> > +    include_directories : [
> > +      inc_common, inc_glapi, inc_loader,
> > +      include_directories('../../include/GL/internal'),
> > +    ],
> > +    link_with : [libglapi_static, libglapi],
> > +    link_whole : libglx,
> > +    link_args : [ld_args_bsymbolic, ld_args_gc_sections],
> > +    dependencies : [dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11,
> > +                    dep_xcb_dri2, dep_xcb_dri3],
> > +    version : gl_lib_version,
> > +    install : true,
> > +  )
> > +
> > +  pkg.generate(
> > +    name : 'gl',
> > +    filebase : 'gl',
> > +    description : 'Mesa OpenGL Library',
> > +    version : meson.project_version(),
> > +    libraries : libgl,
> > +    variables : ['glx_tls=yes']
> > +    # TODO: libs.private
> > +    # TODO: requires.private
> > +  )
> > +endif
> > +
> > +if with_tests
> > +  subdir('tests')
> > +endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171005/516735d5/attachment.sig>