[Mesa-dev] [PATCH v3 19/48] meson: build libgl-gdi target

[Dylan Baker]

Quoting Eric Anholt (2018-08-07 11:12:27)
> Dylan Baker <dylan at pnwbakers.com> writes:
> 
> > ---
> >  src/gallium/meson.build                   |  1 +
> >  src/gallium/targets/libgl-gdi/meson.build | 44 +++++++++++++++++++++++
> >  2 files changed, 45 insertions(+)
> >  create mode 100644 src/gallium/targets/libgl-gdi/meson.build
> >
> > diff --git a/src/gallium/meson.build b/src/gallium/meson.build
> > index a4f28dc4757..5019477788b 100644
> > --- a/src/gallium/meson.build
> > +++ b/src/gallium/meson.build
> > @@ -193,6 +193,7 @@ if with_gallium_st_nine
> >  endif
> >  if with_platform_windows
> >    subdir('state_trackers/wgl')
> > +  subdir('targets/libgl-gdi')
> >  endif
> >  if with_tests
> >    subdir('targets/graw-null')
> > diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
> > new file mode 100644
> > index 00000000000..63cc40b97bc
> > --- /dev/null
> > +++ b/src/gallium/targets/libgl-gdi/meson.build
> > @@ -0,0 +1,44 @@
> > +# Copyright © 2018 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.
> > +
> > +if cc.get_id() == 'gcc' and host_machine.cpu_family() == 'x86_64'
> > +  ogldef = files('../../state_trackers/wgl/opengl32.mingw.def')[0]
> > +else
> > +  ogldef = files('../../state_trackers/wgl/opengl32.def')[0]
> > +endif
> 
> I think you flipped the polarity of the x86_64 check.  Also, please copy
> over the comment explaining what this is about.

You are indeed correct.

> 
> > +libopengl32 = shared_library(
> > +  'opengl32',
> > +  ['libgl_gdi.c'],
> > +  vs_module_defs : ogldef,
> > +  include_directories : [
> > +    inc_common, inc_wgl, inc_gallium_winsys_sw, inc_gallium_drivers,
> > +  ],
> > +  link_whole : [libwgl],
> > +  link_with : [
> > +    libmesa_util, libgallium, libglsl, libmesa_gallium, libwsgdi,
> > +    libglapi_static, libglapi
> > +  ],
> > +  dependencies : [
> > +    dep_ws2_32, idep_nir, driver_swrast, driver_swr,
> > +  ],
> > +  name_prefix : '',  # otherwise mingw will create libopengl32.dll
> > +  install : true,
> 
> Looks like you're missing the HAVE_SWR, HAVE_LLVMPIPE definitions.

driver_swrast and driver_swr provide those definitions (driver_swrast is
llvmpipe if that's enabled otherwise it's softpipe).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180809/3835454e/attachment-0001.sig>