Quoting Marc Dietrich (2018-01-24 08:05:52) > Second hunk of fixes found by manual comparison with autotools generated > compiler flags. > > Signed-off-by: Marc Dietrich <marvi...@gmx.de> > --- > - Why do we need two version macros? > - And why do we either define DEBUG or NDEBUG? > - Also autotools define some PACKAGE_ macros which are never used - maybe > time for a cleanup... > > meson.build | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/meson.build b/meson.build > index 9e3b98641f..62205aa250 100644 > --- a/meson.build > +++ b/meson.build > @@ -37,7 +37,7 @@ pre_args = [ > '-D__STDC_FORMAT_MACROS', > '-D__STDC_LIMIT_MACROS', > '-DVERSION="@0@"'.format(meson.project_version()), > - '-DPACKAGE_VERSION=VERSION', > + '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()), > > '-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa";', > ]
This hunk is just stylistic, after the pre-processor runs they will be
identical, that said I don't have a problem merging this.
>
> @@ -648,6 +648,8 @@ endif
> # Define DEBUG for debug builds only (debugoptimized is not included on this
> one)
> if get_option('buildtype') == 'debug'
> pre_args += '-DDEBUG'
> +else
> + pre_args += '-DNDEBUG'
> endif
NAK on this hunk. meson has -Db_ndebug for controlling NDEBUG.
DEBUG is a mesa thing for turning expensive debug code on and off, NDEBUG is for
controlling asserts; for example, the NIR validator (which is pretty expensive)
is controlled by DEBUG.
>
> if get_option('shader-cache')
> @@ -762,7 +764,7 @@ foreach a : ['-Werror=pointer-arith', '-Werror=vla']
> endforeach
>
> if host_machine.cpu_family().startswith('x86')
> - pre_args += '-DHAVE_SSE41'
> + pre_args += '-DUSE_SSE41'
> with_sse41 = true
> sse41_args = ['-msse4.1']
Fixes: 84486f64626a ("meson: Enable SSE4.1 optimizations")
>
> @@ -1015,7 +1017,7 @@ if with_llvm
> _llvm_patch = _llvm_patch.split('s')[0]
> endif
> pre_args += [
> - '-DHAVE_LLVM=0x0@0@@1@@2@'.format(_llvm_version[0], _llvm_version[1],
> _llvm_patch),
> + '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]),
> '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch),
Fixes: e6418ab1566d ("meson: build "radv" vulkan driver for radeon hardware")
> ]
> elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr
> --
> 2.16.0
>
The rest of this looks good, but it needs to be split into several patches. Each
one of them fixes a bug (except the 1st which is just a stylistic change). I've
commented inline with the Fixes tag each patch needs in it's commit message so
they get pulled into the 18.0 release.
Dylan
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
