[Mesa-dev] [PATCH 33/33] intel: add aubinator ui

[Dylan Baker]

Quoting Lionel Landwerlin (2017-10-30 09:58:46)
[snip]
> diff --git a/meson.build b/meson.build
> index 24d997b3e0a..e5e691e276c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -43,6 +43,7 @@ pre_args = [
>  with_vulkan_icd_dir = get_option('vulkan-icd-dir')
>  with_tests = get_option('build-tests')
>  with_valgrind = get_option('valgrind')
> +with_intel_tools = get_option('intel-tools')
>  with_libunwind = get_option('libunwind')
>  with_asm = get_option('asm')
>  with_llvm = get_option('llvm')
> @@ -209,7 +210,7 @@ if with_glx != 'disabled'
>      else
>        error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
>      endif
> -  elif with_glx == 'gallium-xlib' 
> +  elif with_glx == 'gallium-xlib'
>      if not with_gallium
>        error('Gallium-xlib based GLX requires at least one gallium driver')
>      elif with_dri
> @@ -696,6 +697,8 @@ if dep_valgrind.found() and with_valgrind
>    pre_args += '-DHAVE_VALGRIND'
>  endif
>  
> +dep_aubinator_ui = dependency('gtk+-3.0 cogl-2.0-experimental', required : false)
> +

I think it was mentioned on IRC, but this works but is explicitly not supported
by meson (I think there are patches to break it)

what I would do is:

dep_aubinator_ui = [
  dependency('gtk+-3.0'),
  dependency('cogl-2.0-experimental'),
]
wtih_aubinator_ui = dep_aubinator_ui[0].found() and dep_aubinator_ui[1].found()
  

[snip]

>  
> +if dep_aubinator_ui.found()

Then this would become:

if with_aubinator_ui
> +  inc_imgui = include_directories('imgui')
> +  aubinator_ui = executable(
> +    'aubinator_ui',
> +    files('aubinator_ui.cpp',
> +          'aubinator_imgui_widgets.cpp',
> +          'aubinator_imgui_widgets.h',
> +          'imgui/imconfig.h',
> +          'imgui/imgui.cpp',
> +          'imgui/imgui_demo.cpp',
> +          'imgui/imgui_draw.cpp',
> +          'imgui/imgui.h',
> +          'imgui/imgui_impl_gtk3_cogl.cpp',
> +          'imgui/imgui_impl_gtk3_cogl.h',
> +          'imgui/imgui_internal.h',
> +          'imgui/stb_rect_pack.h',
> +          'imgui/stb_textedit.h',
> +          'imgui/stb_truetype.h',
> +          'memory.c', 'memory.h',
> +          'disasm.c', 'gen_disasm.h', 'intel_aub.h'),

You actually don't need to list the .h files here, meson will ask gcc/clang for
the header dependencies.

> +    dependencies : [dep_aubinator_ui, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
> +    include_directories : [inc_common, inc_intel, inc_imgui],
> +    link_with : [libisl, libintel_common, libintel_compiler, libmesa_util],
> +    c_args : [c_vis_args, no_override_init_args],

I think you want "cpp_args : cpp_vis_args," as well

> +    build_by_default : false,
> +  )
> +endif
> +
>  aubinator_error_decode = executable(
>    'aubinator_error_decode',
>    files('aubinator_error_decode.c', 'disasm.c', 'gen_disasm.h'),
> @@ -37,3 +65,12 @@ aubinator_error_decode = executable(
>    c_args : [c_vis_args, no_override_init_args],
>    build_by_default : false,
>  )
> +
> +memory_tests = executable(
> +  'memory_tests',
> +  files('memory.c', 'memory.h'),

You don't need the .h file here ether

> +  include_directories : inc_common,
> +  link_with : libmesa_util,
> +  c_args : [c_vis_args, no_override_init_args, '-DBUILD_TESTS'],
> +  build_by_default : false,
> +)
> -- 
> 2.15.0.rc2
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- 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/20171031/cdaa465d/attachment.sig>