Dylan Baker <dy...@pnwbakers.com> writes: > --- > src/gallium/meson.build | 3 ++ > src/gallium/state_trackers/wgl/meson.build | 50 ++++++++++++++++++++++ > 2 files changed, 53 insertions(+) > create mode 100644 src/gallium/state_trackers/wgl/meson.build > > diff --git a/src/gallium/meson.build b/src/gallium/meson.build > index 7754dbdee3c..a4f28dc4757 100644 > --- a/src/gallium/meson.build > +++ b/src/gallium/meson.build > @@ -191,6 +191,9 @@ if with_gallium_st_nine > subdir('state_trackers/nine') > subdir('targets/d3dadapter9') > endif > +if with_platform_windows > + subdir('state_trackers/wgl') > +endif > if with_tests > subdir('targets/graw-null') > if with_glx == 'gallium-xlib' > diff --git a/src/gallium/state_trackers/wgl/meson.build > b/src/gallium/state_trackers/wgl/meson.build > new file mode 100644 > index 00000000000..d78d2b02e83 > --- /dev/null > +++ b/src/gallium/state_trackers/wgl/meson.build > @@ -0,0 +1,50 @@ > +# 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. > + > +inc_wgl = include_directories('.') > + > +libwgl = static_library( > + 'wgl', > + files( > + 'stw_context.c', > + 'stw_device.c', > + 'stw_ext_context.c', > + 'stw_ext_extensionsstring.c', > + 'stw_ext_pbuffer.c', > + 'stw_ext_pixelformat.c', > + 'stw_ext_rendertexture.c', > + 'stw_ext_swapinterval.c', > + 'stw_framebuffer.c', > + 'stw_getprocaddress.c', > + 'stw_nopfuncs.c', > + 'stw_nopfuncs.h', > + 'stw_pixelformat.c', > + 'stw_st.c', > + 'stw_tls.c', > + 'stw_wgl.c', > + ), > + c_args : [ > + '-D_GDI32_', '-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN', > + '-D_GLAPI_NO_EXPORTS', # XXX: only without gles > + ],
In the patch 16 you handled the "without gles" thing, why not here? Other than that, 17-18 have my r-b.
signature.asc
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev