[Mesa-dev] [PATCH] meson: Add Haiku platform support v2

[Alexander von Gluck IV]

February 15, 2018 3:22 PM, "Alexander von Gluck IV" <kallisti5 at unixzen.com> wrote:
> ---
> include/meson.build | 8 +++++
> meson.build | 18 +++++++---
> src/egl/meson.build | 35 +++++++++++++-----
> src/gallium/meson.build | 9 +++++
> src/gallium/state_trackers/hgl/meson.build | 41 +++++++++++++++++++++
> src/gallium/targets/haiku-softpipe/meson.build | 50 ++++++++++++++++++++++++++
> src/gallium/winsys/sw/hgl/meson.build | 29 +++++++++++++++
> src/hgl/GLDispatcher.h | 2 +-
> src/hgl/meson.build | 38 ++++++++++++++++++++
> src/mapi/es1api/meson.build | 2 +-
> src/mapi/es2api/meson.build | 2 +-
> src/meson.build | 7 +++-
> 12 files changed, 224 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

Sorry for the v2.. I did a test build on Linux and noticed I broke egl.

A diff of what changed in v2:


$ git diff
diff --git a/src/egl/meson.build b/src/egl/meson.build
index 1fd2b241bb..8880d4631b 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -148,7 +148,7 @@ if with_platform_haiku
 else
   incs_for_egl += [inc_loader, inc_gbm]
   c_args_for_egl += [
-    '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir),
+    '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
     '-D_EGL_BUILT_IN_DRIVER_DRI2',
   ]
   link_for_egl += [libloader, libxmlconfig]
@@ -181,8 +181,6 @@ libegl = shared_library(
   c_args : [
     c_vis_args,
     c_args_for_egl,
-    '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
-    '-D_EGL_BUILT_IN_DRIVER_DRI2',
     '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_ at 0@'.format(egl_native_platform.to_upper()),
   ],
   include_directories : incs_for_egl,





There are a lot of changes here...

If it isn't perfect I ask to get it in to make adjustments to avoid the need
of rebasing over and over.

As for Haiku support, meson successfully generates all the needed binaries... there
are a few minor issues around TLS i need to sort still however.

Thanks!

 -- Alex