Re: [Mesa-dev] [PATCH] meson: Add Haiku platform support v4
On Monday, 2018-02-19 11:20:37 +, Eric Engestrom wrote:
> On Friday, 2018-02-16 14:27:03 -0600, Alexander von Gluck IV wrote:
> > ---
> > include/meson.build| 8 +
> > meson.build| 16 +++---
> > src/egl/meson.build| 36 +++---
> > src/gallium/meson.build| 9 ++
> > src/gallium/state_trackers/hgl/meson.build | 41
> > ++
> > src/gallium/targets/haiku-softpipe/meson.build | 40
> > +
> > src/gallium/winsys/sw/hgl/meson.build | 29 ++
> > src/hgl/meson.build| 36 ++
> > src/mapi/es1api/meson.build| 2 +-
> > src/mapi/es2api/meson.build| 2 +-
> > src/meson.build| 7 -
> > 11 files changed, 209 insertions(+), 17 deletions(-)
> > create mode 100644 src/gallium/state_trackers/hgl/meson.build
> > create mode 100644 src/gallium/targets/haiku-softpipe/meson.build
> > create mode 100644 src/gallium/winsys/sw/hgl/meson.build
> > create mode 100644 src/hgl/meson.build
> >
> > diff --git a/include/meson.build b/include/meson.build
> > index 1cbc68182c..28ffb33215 100644
> > --- a/include/meson.build
> > +++ b/include/meson.build
> > @@ -22,6 +22,7 @@ inc_drm_uapi = include_directories('drm-uapi')
> > inc_vulkan = include_directories('vulkan')
> > inc_d3d9 = include_directories('D3D9')
> > inc_gl_internal = include_directories('GL/internal')
> > +inc_haikugl = include_directories('HaikuGL')
> >
> > if with_gles1
> >install_headers(
> > @@ -80,6 +81,13 @@ if with_gallium_st_nine
> >)
> > endif
> >
> > +if with_platform_haiku
> > + install_headers(
> > +'HaikuGL/GLRenderer.h', 'HaikuGL/GLView.h', 'HaikuGL/OpenGLKit.h',
> > +subdir : 'opengl',
> > + )
> > +endif
> > +
> > # Only install the headers if we are building a stand alone implementation
> > and
> > # not an ICD enabled implementation
> > if with_gallium_opencl and not with_opencl_icd
> > diff --git a/meson.build b/meson.build
> > index d6ffa30d9e..120042fb24 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -99,7 +99,7 @@ if _drivers == 'auto'
> > else
> >error('Unknown architecture. Please pass -Ddri-drivers to set driver
> > options. Patches gladly accepted to fix this.')
> > endif
> > - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> > + elif ['darwin', 'windows', 'cygwin',
> > 'haiku'].contains(host_machine.system())
> > # only swrast would make sense here, but gallium swrast is a much
> > better default
> > _drivers = ''
> >else
> > @@ -144,7 +144,7 @@ if _drivers == 'auto'
> > else
> >error('Unknown architecture. Please pass -Dgallium-drivers to set
> > driver options. Patches gladly accepted to fix this.')
> > endif
> > - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> > + elif ['darwin', 'windows', 'cygwin',
> > 'haiku'].contains(host_machine.system())
> > _drivers = 'swrast'
> >else
> > error('Unknown OS. Please pass -Dgallium-drivers to set driver
> > options. Patches gladly accepted to fix this.')
> > @@ -181,7 +181,7 @@ if _vulkan_drivers == 'auto'
> > else
> >error('Unknown architecture. Please pass -Dvulkan-drivers to set
> > driver options. Patches gladly accepted to fix this.')
> > endif
> > - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> > + elif ['darwin', 'windows', 'cygwin',
> > 'haiku'].contains(host_machine.system())
> > # No vulkan driver supports windows or macOS currently
> > _vulkan_drivers = ''
> >else
> > @@ -242,6 +242,8 @@ if _platforms == 'auto'
> > _platforms = 'x11,wayland,drm,surfaceless'
> >elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> > _platforms = 'x11,surfaceless'
> > + elif ['haiku'].contains(host_machine.system())
> > +_platforms = 'haiku'
> >else
> > error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
> > gladly accepted to fix this.')
> >endif
> > @@ -252,6 +254,7 @@ if _platforms != ''
> >with_platform_x11 = _split.contains('x11')
> >with_platform_wayland = _split.contains('wayland')
> >with_platform_drm = _split.contains('drm')
> > + with_platform_haiku = _split.contains('haiku')
> >with_platform_surfaceless = _split.contains('surfaceless')
> >egl_native_platform = _split[0]
> > endif
> > @@ -260,6 +263,8 @@ with_glx = get_option('glx')
> > if with_glx == 'auto'
> >if with_dri
> > with_glx = 'dri'
> > + elif with_platform_haiku
> > +with_glx = 'disabled'
> >elif with_gallium
> > # Even when building just gallium drivers the user probably wants dri
> > with_glx = 'dri'
> > @@ -375,7 +380,7 @@ if with_any_vk and
Re: [Mesa-dev] [PATCH] meson: Add Haiku platform support v4
On Friday, 2018-02-16 14:27:03 -0600, Alexander von Gluck IV wrote:
> ---
> include/meson.build| 8 +
> meson.build| 16 +++---
> src/egl/meson.build| 36 +++---
> src/gallium/meson.build| 9 ++
> src/gallium/state_trackers/hgl/meson.build | 41
> ++
> src/gallium/targets/haiku-softpipe/meson.build | 40 +
> src/gallium/winsys/sw/hgl/meson.build | 29 ++
> src/hgl/meson.build| 36 ++
> src/mapi/es1api/meson.build| 2 +-
> src/mapi/es2api/meson.build| 2 +-
> src/meson.build| 7 -
> 11 files changed, 209 insertions(+), 17 deletions(-)
> create mode 100644 src/gallium/state_trackers/hgl/meson.build
> create mode 100644 src/gallium/targets/haiku-softpipe/meson.build
> create mode 100644 src/gallium/winsys/sw/hgl/meson.build
> create mode 100644 src/hgl/meson.build
>
> diff --git a/include/meson.build b/include/meson.build
> index 1cbc68182c..28ffb33215 100644
> --- a/include/meson.build
> +++ b/include/meson.build
> @@ -22,6 +22,7 @@ inc_drm_uapi = include_directories('drm-uapi')
> inc_vulkan = include_directories('vulkan')
> inc_d3d9 = include_directories('D3D9')
> inc_gl_internal = include_directories('GL/internal')
> +inc_haikugl = include_directories('HaikuGL')
>
> if with_gles1
>install_headers(
> @@ -80,6 +81,13 @@ if with_gallium_st_nine
>)
> endif
>
> +if with_platform_haiku
> + install_headers(
> +'HaikuGL/GLRenderer.h', 'HaikuGL/GLView.h', 'HaikuGL/OpenGLKit.h',
> +subdir : 'opengl',
> + )
> +endif
> +
> # Only install the headers if we are building a stand alone implementation
> and
> # not an ICD enabled implementation
> if with_gallium_opencl and not with_opencl_icd
> diff --git a/meson.build b/meson.build
> index d6ffa30d9e..120042fb24 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -99,7 +99,7 @@ if _drivers == 'auto'
> else
>error('Unknown architecture. Please pass -Ddri-drivers to set driver
> options. Patches gladly accepted to fix this.')
> endif
> - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> + elif ['darwin', 'windows', 'cygwin',
> 'haiku'].contains(host_machine.system())
> # only swrast would make sense here, but gallium swrast is a much better
> default
> _drivers = ''
>else
> @@ -144,7 +144,7 @@ if _drivers == 'auto'
> else
>error('Unknown architecture. Please pass -Dgallium-drivers to set
> driver options. Patches gladly accepted to fix this.')
> endif
> - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> + elif ['darwin', 'windows', 'cygwin',
> 'haiku'].contains(host_machine.system())
> _drivers = 'swrast'
>else
> error('Unknown OS. Please pass -Dgallium-drivers to set driver options.
> Patches gladly accepted to fix this.')
> @@ -181,7 +181,7 @@ if _vulkan_drivers == 'auto'
> else
>error('Unknown architecture. Please pass -Dvulkan-drivers to set
> driver options. Patches gladly accepted to fix this.')
> endif
> - elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> + elif ['darwin', 'windows', 'cygwin',
> 'haiku'].contains(host_machine.system())
> # No vulkan driver supports windows or macOS currently
> _vulkan_drivers = ''
>else
> @@ -242,6 +242,8 @@ if _platforms == 'auto'
> _platforms = 'x11,wayland,drm,surfaceless'
>elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
> _platforms = 'x11,surfaceless'
> + elif ['haiku'].contains(host_machine.system())
> +_platforms = 'haiku'
>else
> error('Unknown OS. Please pass -Dplatforms to set platforms. Patches
> gladly accepted to fix this.')
>endif
> @@ -252,6 +254,7 @@ if _platforms != ''
>with_platform_x11 = _split.contains('x11')
>with_platform_wayland = _split.contains('wayland')
>with_platform_drm = _split.contains('drm')
> + with_platform_haiku = _split.contains('haiku')
>with_platform_surfaceless = _split.contains('surfaceless')
>egl_native_platform = _split[0]
> endif
> @@ -260,6 +263,8 @@ with_glx = get_option('glx')
> if with_glx == 'auto'
>if with_dri
> with_glx = 'dri'
> + elif with_platform_haiku
> +with_glx = 'disabled'
>elif with_gallium
> # Even when building just gallium drivers the user probably wants dri
> with_glx = 'dri'
> @@ -375,7 +380,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3)
>error('Vulkan drivers require dri3 for X11 support')
> endif
> if with_dri or with_gallium
> - if with_glx == 'disabled' and not with_egl
> + if with_glx == 'disabled' and not with_egl and not with_platform_haiku
> error('building dri or gallium drivers
Re: [Mesa-dev] [PATCH] meson: Add Haiku platform support v4
Quoting Alexander von Gluck IV (2018-02-16 12:27:03)
> + link_with : [libglapi_static, libglapi],
> + dependencies : cpp.find_library('be'),
I think that we end up calling cpp.find_library('be') it might be worth just
adding this to the top meson.build file as dep_be, but I'm okay doing that as a
follow up.
Reviewed-by: Dylan Baker
signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
