Dylan Baker <dy...@pnwbakers.com> writes:

> v2: - drop with_ from dri_drivers_path variable (Eric A)
>
> Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
> ---
>  meson.build                      | 6 ++++++
>  meson_options.txt                | 2 ++
>  src/glx/meson.build              | 2 +-
>  src/mesa/drivers/dri/meson.build | 2 +-
>  4 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 94b26414c1f..716976ccfc6 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -42,6 +42,11 @@ with_asm = get_option('asm')
>  with_appledri = false
>  with_windowsdri = false
>  
> +dri_drivers_path = get_option('dri-drivers-path')
> +if dri_drivers_path == ''
> +  dri_drivers_path = join_paths(get_option('libdir'), 'dri')
> +endif
> +
>  with_gles1 = get_option('gles1')
>  with_gles2 = get_option('gles2')
>  with_opengl = get_option('opengl')
> @@ -574,6 +579,7 @@ if with_platform_x11
>        dependency('xcb-dri2', version : '>= 1.8'),
>        dependency('xcb-xfixes'),
>      ]
> +    pre_args += '-DHAVE_X11_PLATFORM'

Still this tray hunk in this patch.

Other than that, this one is:

Reviewed-by: Eric Anholt <e...@anholt.net>

>      if with_dri3
>        pre_args += '-DHAVE_DRI3'
>        dep_xcb_dri3 = [

Attachment: signature.asc
Description: PGP signature

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to