Mesa (master): egl: Add Haiku code and support
Alexander von Gluck IV
kallisti5 at kemper.freedesktop.org
Tue Dec 23 20:34:47 UTC 2014
Module: Mesa
Branch: master
Commit: 400b833592d9aad7b2c4627a897380642d52189f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=400b833592d9aad7b2c4627a897380642d52189f
Author: Alexander von Gluck IV <kallisti5 at unixzen.com>
Date: Mon Dec 22 10:10:13 2014 -0500
egl: Add Haiku code and support
* This is the cleaned up work of the Haiku GCI student
Adrián Arroyo Calle adrian.arroyocalle at gmail.com
* Several patches were consolidated to prevent
unnecessary touching of non-related code
---
include/EGL/eglplatform.h | 10 +-
src/SConscript | 4 +
src/egl/drivers/haiku/SConscript | 35 +++
src/egl/drivers/haiku/egl_haiku.cpp | 438 +++++++++++++++++++++++++++++++++++
src/egl/main/SConscript | 23 +-
src/egl/main/eglapi.c | 2 +
src/egl/main/egldisplay.c | 7 +-
src/egl/main/egldisplay.h | 1 +
src/egl/main/egldriver.c | 6 +
src/gallium/SConscript | 2 +-
10 files changed, 523 insertions(+), 5 deletions(-)
diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index 21b18fe..2eb6865 100644
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -106,7 +106,7 @@ typedef void *EGLNativeDisplayType;
#elif defined(__unix__)
-#ifdef MESA_EGL_NO_X11_HEADERS
+#if defined(MESA_EGL_NO_X11_HEADERS)
typedef void *EGLNativeDisplayType;
typedef khronos_uintptr_t EGLNativePixmapType;
@@ -124,8 +124,16 @@ typedef Window EGLNativeWindowType;
#endif /* MESA_EGL_NO_X11_HEADERS */
+#elif __HAIKU__
+#include <kernel/image.h>
+typedef void *EGLNativeDisplayType;
+typedef khronos_uintptr_t EGLNativePixmapType;
+typedef khronos_uintptr_t EGLNativeWindowType;
+
#else
+
#error "Platform not recognized"
+
#endif
/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
diff --git a/src/SConscript b/src/SConscript
index 2657bba..eb4cd3c 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -33,6 +33,10 @@ if not env['embedded']:
if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
SConscript('glx/SConscript')
if env['platform'] not in ['darwin', 'haiku', 'sunos']:
+ SConscript('egl/drivers/dri2/SConscript')
+ SConscript('egl/main/SConscript')
+ if env['platform'] == 'haiku':
+ SConscript('egl/drivers/haiku/SConscript')
SConscript('egl/main/SConscript')
if env['gles']:
diff --git a/src/egl/drivers/haiku/SConscript b/src/egl/drivers/haiku/SConscript
new file mode 100644
index 0000000..2c38599
--- /dev/null
+++ b/src/egl/drivers/haiku/SConscript
@@ -0,0 +1,35 @@
+Import('*')
+
+env = env.Clone()
+
+env.Append(CPPDEFINES = [
+ 'DEFAULT_DRIVER_DIR=\\"\\"',
+])
+
+env.Append(CPPPATH = [
+ '#/include',
+ '#/src/egl/main',
+ '#/src/loader',
+])
+
+sources = [
+ 'egl_haiku.cpp'
+]
+
+if env['platform'] == 'haiku':
+ env.Append(CPPDEFINES = [
+ 'HAVE_HAIKU_PLATFORM',
+ '_EGL_NATIVE_PLATFORM=haiku',
+ ])
+
+env.Prepend(LIBS = [
+ libloader,
+])
+
+egl_haiku = env.ConvenienceLibrary(
+#egl_dri2 = env.SharedLibrary(
+ target = 'egl_haiku',
+ source = sources,
+)
+
+Export('egl_haiku')
diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
new file mode 100644
index 0000000..ff6e171
--- /dev/null
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
@@ -0,0 +1,438 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2014 Adrián Arroyo Calle <adrian.arroyocalle at gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <errno.h>
+#include <dlfcn.h>
+#include <stdio.h>
+
+extern "C" {
+#include "loader.h"
+#include "eglconfig.h"
+#include "eglcontext.h"
+#include "egldisplay.h"
+#include "egldriver.h"
+#include "eglcurrent.h"
+#include "egllog.h"
+#include "eglsurface.h"
+#include "eglimage.h"
+#include "egltypedefs.h"
+}
+
+#include <InterfaceKit.h>
+#include <OpenGLKit.h>
+
+
+#define CALLOC_STRUCT(T) (struct T *) calloc(1, sizeof(struct T))
+
+
+_EGL_DRIVER_STANDARD_TYPECASTS(haiku_egl)
+
+
+struct haiku_egl_driver
+{
+ _EGLDriver base;
+
+ void *handle;
+ _EGLProc (*get_proc_address)(const char *procname);
+ void (*glFlush)(void);
+};
+
+struct haiku_egl_config
+{
+ _EGLConfig base;
+};
+
+struct haiku_egl_context
+{
+ _EGLContext ctx;
+};
+
+struct haiku_egl_surface
+{
+ _EGLSurface surf;
+ BGLView* gl;
+};
+
+
+/*
+static void
+swrastCreateDrawable(struct dri2_egl_display * dri2_dpy,
+ struct dri2_egl_surface * dri2_surf, int depth)
+{
+
+}
+
+
+static void
+swrastDestroyDrawable(struct dri2_egl_display * dri2_dpy,
+ struct dri2_egl_surface * dri2_surf)
+{
+
+}
+
+
+static void
+swrastGetDrawableInfo(__DRIdrawable * draw, int *x, int *y,
+ int *w, int *h, void *loaderPrivate)
+{
+
+}
+
+
+static void
+swrastPutImage(__DRIdrawable * draw, int op, int x, int y,
+ int w, int h, char *data, void *loaderPrivate)
+{
+
+}
+
+
+static void
+swrastGetImage(__DRIdrawable * read, int x, int y,
+ int w, int h, char *data, void *loaderPrivate)
+{
+
+}
+*/
+
+
+static void
+haiku_log(EGLint level, const char *msg)
+{
+ switch (level) {
+ case _EGL_DEBUG:
+ fprintf(stderr,"%s", msg);
+ break;
+ case _EGL_INFO:
+ fprintf(stderr,"%s", msg);
+ break;
+ case _EGL_WARNING:
+ fprintf(stderr,"%s", msg);
+ break;
+ case _EGL_FATAL:
+ fprintf(stderr,"%s", msg);
+ break;
+ default:
+ break;
+ }
+}
+
+
+/**
+ * Called via eglCreateWindowSurface(), drv->API.CreateWindowSurface().
+ */
+static _EGLSurface *
+haiku_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
+ _EGLConfig *conf, void *native_surface, const EGLint *attrib_list)
+{
+ return NULL;
+}
+
+
+/**
+ * Called via eglCreateWindowSurface(), drv->API.CreateWindowSurface().
+ */
+static _EGLSurface *
+haiku_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
+ _EGLConfig *conf, void *native_window, const EGLint *attrib_list)
+{
+ struct haiku_egl_surface* surface;
+ surface = (struct haiku_egl_surface*)calloc(1,sizeof (*surface));
+
+ _eglInitSurface(&surface->surf, disp, EGL_WINDOW_BIT, conf, attrib_list);
+ (&surface->surf)->SwapInterval = 1;
+
+ _eglLog(_EGL_DEBUG, "Creating window");
+ BWindow* win = (BWindow*)native_window;
+
+ _eglLog(_EGL_DEBUG, "Creating GL view");
+ surface->gl = new BGLView(win->Bounds(), "OpenGL", B_FOLLOW_ALL_SIDES, 0,
+ BGL_RGB | BGL_DOUBLE | BGL_ALPHA);
+
+ _eglLog(_EGL_DEBUG, "Adding GL");
+ win->AddChild(surface->gl);
+
+ _eglLog(_EGL_DEBUG, "Showing window");
+ win->Show();
+ return &surface->surf;
+}
+
+
+static _EGLSurface *
+haiku_create_pixmap_surface(_EGLDriver *drv, _EGLDisplay *disp,
+ _EGLConfig *conf, void *native_pixmap, const EGLint *attrib_list)
+{
+ return NULL;
+}
+
+
+static _EGLSurface *
+haiku_create_pbuffer_surface(_EGLDriver *drv, _EGLDisplay *disp,
+ _EGLConfig *conf, const EGLint *attrib_list)
+{
+ return NULL;
+}
+
+
+static EGLBoolean
+haiku_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
+{
+ return EGL_TRUE;
+}
+
+
+static EGLBoolean
+haiku_add_configs_for_visuals(_EGLDisplay *dpy)
+{
+ printf("Adding configs\n");
+ struct haiku_egl_config conf, *final;
+ //conf=CALLOC_STRUCT(haiku_egl_config);
+ memset(&conf, 0, sizeof(conf));
+ _eglInitConfig(&conf.base, dpy, 1);
+ _eglLog(_EGL_DEBUG,"Config inited\n");
+ _eglSetConfigKey(&conf.base, EGL_RED_SIZE ,8);
+ _eglSetConfigKey(&conf.base, EGL_BLUE_SIZE ,8);
+ _eglSetConfigKey(&conf.base, EGL_GREEN_SIZE ,8);
+ _eglSetConfigKey(&conf.base, EGL_LUMINANCE_SIZE ,0);
+ _eglSetConfigKey(&conf.base, EGL_ALPHA_SIZE ,8);
+ _eglSetConfigKey(&conf.base, EGL_COLOR_BUFFER_TYPE ,EGL_RGB_BUFFER);
+ EGLint r = (_eglGetConfigKey(&conf.base, EGL_RED_SIZE)
+ + _eglGetConfigKey(&conf.base, EGL_GREEN_SIZE)
+ + _eglGetConfigKey(&conf.base, EGL_BLUE_SIZE)
+ + _eglGetConfigKey(&conf.base, EGL_ALPHA_SIZE));
+ _eglSetConfigKey(&conf.base, EGL_BUFFER_SIZE, r);
+ _eglSetConfigKey(&conf.base, EGL_CONFIG_CAVEAT, EGL_NONE);
+ _eglSetConfigKey(&conf.base, EGL_CONFIG_ID, 1);
+ _eglSetConfigKey(&conf.base, EGL_BIND_TO_TEXTURE_RGB ,EGL_FALSE);
+ _eglSetConfigKey(&conf.base, EGL_BIND_TO_TEXTURE_RGBA ,EGL_FALSE);
+ _eglSetConfigKey(&conf.base, EGL_STENCIL_SIZE ,0);
+ _eglSetConfigKey(&conf.base, EGL_TRANSPARENT_TYPE ,EGL_NONE);
+ _eglSetConfigKey(&conf.base, EGL_NATIVE_RENDERABLE ,EGL_TRUE); // Let's say yes
+ _eglSetConfigKey(&conf.base, EGL_NATIVE_VISUAL_ID ,0); // No visual
+ _eglSetConfigKey(&conf.base, EGL_NATIVE_VISUAL_TYPE ,EGL_NONE); // No visual
+ _eglSetConfigKey(&conf.base, EGL_RENDERABLE_TYPE ,0x8);
+ _eglSetConfigKey(&conf.base, EGL_SAMPLE_BUFFERS ,0); // TODO: How to get the right value ?
+ _eglSetConfigKey(&conf.base, EGL_SAMPLES ,_eglGetConfigKey(&conf.base, EGL_SAMPLE_BUFFERS) == 0 ? 0 : 0);
+ _eglSetConfigKey(&conf.base, EGL_DEPTH_SIZE ,24); // TODO: How to get the right value ?
+ _eglSetConfigKey(&conf.base, EGL_LEVEL ,0);
+ _eglSetConfigKey(&conf.base, EGL_MAX_PBUFFER_WIDTH ,0); // TODO: How to get the right value ?
+ _eglSetConfigKey(&conf.base, EGL_MAX_PBUFFER_HEIGHT ,0); // TODO: How to get the right value ?
+ _eglSetConfigKey(&conf.base, EGL_MAX_PBUFFER_PIXELS ,0); // TODO: How to get the right value ?
+ _eglSetConfigKey(&conf.base, EGL_SURFACE_TYPE, EGL_WINDOW_BIT /*| EGL_PIXMAP_BIT | EGL_PBUFFER_BIT*/);
+
+ printf("Config configurated\n");
+ if (!_eglValidateConfig(&conf.base, EGL_FALSE)) {
+ _eglLog(_EGL_DEBUG, "Haiku failed to validate config");
+ return EGL_FALSE;
+ }
+ printf("Validated config\n");
+
+ final = CALLOC_STRUCT(haiku_egl_config);
+ memcpy(final, &conf, sizeof(conf));
+
+ _eglLinkConfig(&final->base);
+ if (!_eglGetArraySize(dpy->Configs)) {
+ _eglLog(_EGL_WARNING, "Haiku: failed to create any config");
+ return EGL_FALSE;
+ }
+ printf("Config succesfull\n");
+
+ return EGL_TRUE;
+}
+
+extern "C"
+EGLBoolean
+init_haiku(_EGLDriver *drv, _EGLDisplay *dpy)
+{
+ _eglLog(_EGL_DEBUG,"\nInitializing Haiku EGL\n");
+ //_EGLDisplay* egl_dpy;
+
+ printf("Initializing Haiku EGL\n");
+ _eglSetLogProc(haiku_log);
+
+ loader_set_logger(_eglLog);
+
+ /*egl_dpy = (_EGLDisplay*) calloc(1, sizeof(_EGLDisplay));
+ if (!egl_dpy)
+ return _eglError(EGL_BAD_ALLOC, "eglInitialize");
+
+ dpy->DriverData=(void*) egl_dpy;
+ if (!dpy->PlatformDisplay) {
+ // OPEN DEVICE
+ //dri2_dpy->bwindow = (void*)haiku_create_window();
+ //dri2_dpy->own_device = true;
+ } else {
+ //dri2_dpy->bwindow = (BWindow*)dpy->PlatformDisplay;
+ }*/
+
+ //dri2_dpy->driver_name = strdup("swrast");
+ //if (!dri2_load_driver_swrast(dpy))
+ // goto cleanup_conn;
+
+ /*dri2_dpy->swrast_loader_extension.base.name = __DRI_SWRAST_LOADER;
+ dri2_dpy->swrast_loader_extension.base.version = __DRI_SWRAST_LOADER_VERSION;
+ dri2_dpy->swrast_loader_extension.getDrawableInfo = swrastGetDrawableInfo;
+ dri2_dpy->swrast_loader_extension.putImage = swrastPutImage;
+ dri2_dpy->swrast_loader_extension.getImage = swrastGetImage;
+
+ dri2_dpy->extensions[0] = &dri2_dpy->swrast_loader_extension.base;
+ dri2_dpy->extensions[1] = NULL;
+ dri2_dpy->extensions[2] = NULL;*/
+
+ /*if (dri2_dpy->bwindow) {
+ if (!dri2_haiku_add_configs_for_visuals(dri2_dpy, dpy))
+ goto cleanup_configs;
+ }*/
+ _eglLog(_EGL_DEBUG,"Add configs");
+ haiku_add_configs_for_visuals(dpy);
+
+ dpy->VersionMajor=1;
+ dpy->VersionMinor=4;
+
+ //dpy->Extensions.KHR_create_context = true;
+
+ //dri2_dpy->vtbl = &dri2_haiku_display_vtbl;
+ _eglLog(_EGL_DEBUG, "Initialization finished");
+
+ return EGL_TRUE;
+}
+
+
+extern "C"
+EGLBoolean
+haiku_terminate(_EGLDriver* drv,_EGLDisplay* dpy)
+{
+ return EGL_TRUE;
+}
+
+
+extern "C"
+_EGLContext*
+haiku_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
+ _EGLContext *share_list, const EGLint *attrib_list)
+{
+ _eglLog(_EGL_DEBUG,"Creating context");
+ struct haiku_egl_context* context;
+ context=(struct haiku_egl_context*)calloc(1,sizeof (*context));
+ if(!_eglInitContext(&context->ctx, disp, conf, attrib_list))
+ printf("ERROR creating context");
+ _eglLog(_EGL_DEBUG, "Context created");
+ return &context->ctx;
+}
+
+
+extern "C"
+EGLBoolean
+haiku_destroy_context(_EGLDriver* drv, _EGLDisplay *disp, _EGLContext* ctx)
+{
+ ctx=NULL;
+ return EGL_TRUE;
+}
+
+
+extern "C"
+EGLBoolean
+haiku_make_current(_EGLDriver* drv, _EGLDisplay* dpy, _EGLSurface *dsurf,
+ _EGLSurface *rsurf, _EGLContext *ctx)
+{
+ struct haiku_egl_context* cont=haiku_egl_context(ctx);
+ struct haiku_egl_surface* surf=haiku_egl_surface(dsurf);
+ _EGLContext *old_ctx;
+ _EGLSurface *old_dsurf, *old_rsurf;
+ _eglBindContext(ctx, dsurf, rsurf, &old_ctx, &old_dsurf, &old_rsurf);
+ //cont->ctx.DrawSurface=&surf->surf;
+ surf->gl->LockGL();
+ return EGL_TRUE;
+}
+
+
+extern "C"
+EGLBoolean
+haiku_swap_buffers(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf)
+{
+ struct haiku_egl_surface* surface=haiku_egl_surface(surf);
+ surface->gl->SwapBuffers();
+ //gl->Render();
+ return EGL_TRUE;
+}
+
+
+extern "C"
+void
+haiku_unload(_EGLDriver* drv)
+{
+
+}
+
+
+/**
+ * This is the main entrypoint into the driver, called by libEGL.
+ * Create a new _EGLDriver object and init its dispatch table.
+ */
+extern "C"
+_EGLDriver*
+_eglBuiltInDriverHaiku(const char *args)
+{
+ _eglLog(_EGL_DEBUG,"Driver loaded");
+ struct haiku_egl_driver* driver;
+ driver=(struct haiku_egl_driver*)calloc(1,sizeof(*driver));
+ _eglInitDriverFallbacks(&driver->base);
+ driver->base.API.Initialize = init_haiku;
+ driver->base.API.Terminate = haiku_terminate;
+ driver->base.API.CreateContext = haiku_create_context;
+ driver->base.API.DestroyContext = haiku_destroy_context;
+ driver->base.API.MakeCurrent = haiku_make_current;
+ driver->base.API.CreateWindowSurface = haiku_create_window_surface;
+ driver->base.API.CreatePixmapSurface = haiku_create_pixmap_surface;
+ driver->base.API.CreatePbufferSurface = haiku_create_pbuffer_surface;
+ driver->base.API.DestroySurface = haiku_destroy_surface;
+ /*
+ driver->API.GetProcAddress = dri2_get_proc_address;
+ driver->API.WaitClient = dri2_wait_client;
+ driver->API.WaitNative = dri2_wait_native;
+ driver->API.BindTexImage = dri2_bind_tex_image;
+ driver->API.ReleaseTexImage = dri2_release_tex_image;
+ driver->API.SwapInterval = dri2_swap_interval;
+ */
+
+ driver->base.API.SwapBuffers = haiku_swap_buffers;
+ /*
+ driver->API.SwapBuffersWithDamageEXT = dri2_swap_buffers_with_damage;
+ driver->API.SwapBuffersRegionNOK = dri2_swap_buffers_region;
+ driver->API.PostSubBufferNV = dri2_post_sub_buffer;
+ driver->API.CopyBuffers = dri2_copy_buffers,
+ driver->API.QueryBufferAge = dri2_query_buffer_age;
+ driver->API.CreateImageKHR = dri2_create_image;
+ driver->API.DestroyImageKHR = dri2_destroy_image_khr;
+ driver->API.CreateWaylandBufferFromImageWL = dri2_create_wayland_buffer_from_image;
+ driver->API.GetSyncValuesCHROMIUM = dri2_get_sync_values_chromium;
+ */
+
+ driver->base.Name = "Haiku";
+ driver->base.Unload = haiku_unload;
+
+ _eglLog(_EGL_DEBUG, "API Calls defined");
+
+ return &driver->base;
+}
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
index 390f28a..2ea2261 100644
--- a/src/egl/main/SConscript
+++ b/src/egl/main/SConscript
@@ -18,21 +18,40 @@ if env['platform'] == 'windows':
'_EGL_GET_CORE_ADDRESSES',
'KHRONOS_DLL_EXPORTS',
])
+elif env['platform'] == 'haiku':
+ env.Append(CPPDEFINES = [
+ '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU',
+ '_EGL_OS_UNIX',
+ '_EGL_BUILT_IN_DRIVER_HAIKU',
+ ])
+ env.Prepend(LIBS = [
+ egl_haiku,
+ libloader,
+ ])
else:
env.Append(CPPDEFINES = [
'_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11',
'_EGL_OS_UNIX',
])
+ env.Prepend(LIBS = [
+ egl_dri2,
+ libloader,
+ ])
env.Append(CPPPATH = [
'#/include',
])
+
# parse Makefile.sources
egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES')
-egl = env.ConvenienceLibrary(
- target = 'egl',
+# libEGL.dll
+env['LIBPREFIX'] = 'lib'
+env['SHLIBPREFIX'] = 'lib'
+
+egl = env.SharedLibrary(
+ target = 'EGL',
source = egl_sources,
)
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 511848f..db44a26 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -821,9 +821,11 @@ eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
/* surface must be bound to current context in EGL 1.4 */
+ #ifndef _EGL_BUILT_IN_DRIVER_HAIKU
if (_eglGetContextHandle(ctx) == EGL_NO_CONTEXT ||
surf != ctx->DrawSurface)
RETURN_EGL_ERROR(disp, EGL_BAD_SURFACE, EGL_FALSE);
+ #endif
ret = drv->API.SwapBuffers(drv, disp, surf);
diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index 76dfee7..a167ae5 100644
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -75,7 +75,8 @@ static const struct {
{ _EGL_PLATFORM_DRM, "drm" },
{ _EGL_PLATFORM_FBDEV, "fbdev" },
{ _EGL_PLATFORM_NULL, "null" },
- { _EGL_PLATFORM_ANDROID, "android" }
+ { _EGL_PLATFORM_ANDROID, "android" },
+ { _EGL_PLATFORM_HAIKU, "haiku" }
};
@@ -177,6 +178,10 @@ _eglNativePlatformDetectNativeDisplay(void *nativeDisplay)
/* If not matched to any other platform, fallback to x11. */
return _EGL_PLATFORM_X11;
#endif
+
+#ifdef HAVE_HAIKU_PLATFORM
+ return _EGL_PLATFORM_HAIKU;
+#endif
}
return _EGL_INVALID_PLATFORM;
diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index d4b9602..bcdc2b2 100644
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -46,6 +46,7 @@ enum _egl_platform_type {
_EGL_PLATFORM_FBDEV,
_EGL_PLATFORM_NULL,
_EGL_PLATFORM_ANDROID,
+ _EGL_PLATFORM_HAIKU,
_EGL_NUM_PLATFORMS,
_EGL_INVALID_PLATFORM = -1
diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 8cf777d..7ad14d3 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -52,6 +52,9 @@
#include <unistd.h>
#endif
+#ifdef _EGL_BUILT_IN_DRIVER_HAIKU
+_EGLDriver* _eglBuiltInDriverHaiku(const char* args);
+#endif
typedef struct _egl_module {
char *Path;
@@ -73,6 +76,9 @@ const struct {
#ifdef _EGL_BUILT_IN_DRIVER_DRI2
{ "egl_dri2", _eglBuiltInDriverDRI2 },
#endif
+#ifdef _EGL_BUILT_IN_DRIVER_HAIKU
+ { "egl_haiku", _eglBuiltInDriverHaiku },
+#endif
{ NULL, NULL }
};
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 977e3fb..25d0af6 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -63,7 +63,7 @@ SConscript([
if not env['embedded']:
SConscript('state_trackers/vega/SConscript')
- if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
+ if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'sunos'):
SConscript([
'state_trackers/egl/SConscript',
'targets/egl-static/SConscript',
More information about the mesa-commit
mailing list