X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmain%2Fegldisplay.h;h=84cfbe19f7e79ea2377ab2474cfa9cf872bc8fdb;hb=a1cb407b049bb431b0f6f21e6e376d11f136af67;hp=67a2e244e20513598ad3f13d82a90aaff3d2aa6e;hpb=5eca41665bbd6deb5ffff011e47ff0cec41916da;p=mesa.git

diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index 67a2e244e20..84cfbe19f7e 100644
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2008 VMware, Inc.
  * Copyright 2009-2010 Chia-I Wu <olvaffe@gmail.com>
  * Copyright 2010-2011 LunarG, Inc.
  * All Rights Reserved.
@@ -31,21 +31,26 @@
 #ifndef EGLDISPLAY_INCLUDED
 #define EGLDISPLAY_INCLUDED
 
+#include "c99_compat.h"
+#include "c11/threads.h"
 
 #include "egltypedefs.h"
 #include "egldefines.h"
-#include "eglmutex.h"
 #include "eglarray.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum _egl_platform_type {
    _EGL_PLATFORM_WINDOWS,
    _EGL_PLATFORM_X11,
    _EGL_PLATFORM_WAYLAND,
    _EGL_PLATFORM_DRM,
-   _EGL_PLATFORM_FBDEV,
    _EGL_PLATFORM_NULL,
    _EGL_PLATFORM_ANDROID,
+   _EGL_PLATFORM_HAIKU,
 
    _EGL_NUM_PLATFORMS,
    _EGL_INVALID_PLATFORM = -1
@@ -85,16 +90,18 @@ struct _egl_resource
  */
 struct _egl_extensions
 {
-   EGLBoolean MESA_screen_surface;
-   EGLBoolean MESA_copy_context;
    EGLBoolean MESA_drm_display;
    EGLBoolean MESA_drm_image;
+   EGLBoolean MESA_configless_context;
 
    EGLBoolean WL_bind_wayland_display;
+   EGLBoolean WL_create_wayland_buffer_from_image;
 
    EGLBoolean KHR_image_base;
    EGLBoolean KHR_image_pixmap;
    EGLBoolean KHR_vg_parent_image;
+   EGLBoolean KHR_get_all_proc_addresses;
+   EGLBoolean KHR_gl_colorspace;
    EGLBoolean KHR_gl_texture_2D_image;
    EGLBoolean KHR_gl_texture_cubemap_image;
    EGLBoolean KHR_gl_texture_3D_image;
@@ -102,16 +109,27 @@ struct _egl_extensions
 
    EGLBoolean KHR_reusable_sync;
    EGLBoolean KHR_fence_sync;
+   EGLBoolean KHR_wait_sync;
+   EGLBoolean KHR_cl_event2;
 
-   EGLBoolean KHR_surfaceless_gles1;
-   EGLBoolean KHR_surfaceless_gles2;
-   EGLBoolean KHR_surfaceless_opengl;
+   EGLBoolean KHR_surfaceless_context;
+   EGLBoolean KHR_create_context;
 
    EGLBoolean NOK_swap_region;
    EGLBoolean NOK_texture_from_pixmap;
 
    EGLBoolean ANDROID_image_native_buffer;
-   EGLBoolean ANDROID_swap_rectangle;
+
+   EGLBoolean CHROMIUM_sync_control;
+
+   EGLBoolean NV_post_sub_buffer;
+
+   EGLBoolean EXT_create_context_robustness;
+   EGLBoolean EXT_buffer_age;
+   EGLBoolean EXT_swap_buffers_with_damage;
+   EGLBoolean EXT_image_dma_buf_import;
+
+   EGLBoolean MESA_image_dma_buf_export;
 };
 
 
@@ -120,7 +138,7 @@ struct _egl_display
    /* used to link displays */
    _EGLDisplay *Next;
 
-   _EGLMutex Mutex;
+   mtx_t Mutex;
 
    _EGLPlatformType Platform; /**< The type of the platform display */
    void *PlatformDisplay;     /**< A pointer to the platform display */
@@ -136,14 +154,13 @@ struct _egl_display
 
    /* these fields are set by the driver during init */
    void *DriverData;          /**< Driver private data */
-   EGLint VersionMajor;       /**< EGL major version */
-   EGLint VersionMinor;       /**< EGL minor version */
+   EGLint Version;            /**< EGL version major*10+minor */
    EGLint ClientAPIs;         /**< Bitmask of APIs supported (EGL_xxx_BIT) */
    _EGLExtensions Extensions; /**< Extensions supported */
 
    /* these fields are derived from above */
-   char VersionString[1000];                       /**< EGL_VERSION */
-   char ClientAPIsString[1000];                    /**< EGL_CLIENT_APIS */
+   char VersionString[100];                        /**< EGL_VERSION */
+   char ClientAPIsString[100];                     /**< EGL_CLIENT_APIS */
    char ExtensionsString[_EGL_MAX_EXTENSIONS_LEN]; /**< EGL_EXTENSIONS */
 
    _EGLArray *Screens;
@@ -155,7 +172,7 @@ struct _egl_display
 
 
 extern _EGLPlatformType
-_eglGetNativePlatform(EGLNativeDisplayType nativeDisplay);
+_eglGetNativePlatform(void *nativeDisplay);
 
 
 extern void
@@ -166,11 +183,11 @@ extern _EGLDisplay *
 _eglFindDisplay(_EGLPlatformType plat, void *plat_dpy);
 
 
-PUBLIC void
+extern void
 _eglReleaseDisplayResources(_EGLDriver *drv, _EGLDisplay *dpy);
 
 
-PUBLIC void
+extern void
 _eglCleanupDisplay(_EGLDisplay *disp);
 
 
@@ -178,7 +195,7 @@ extern EGLBoolean
 _eglCheckDisplayHandle(EGLDisplay dpy);
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy);
 
 
@@ -186,7 +203,7 @@ _eglCheckResource(void *res, _EGLResourceType type, _EGLDisplay *dpy);
  * Lookup a handle to find the linked display.
  * Return NULL if the handle has no corresponding linked display.
  */
-static INLINE _EGLDisplay *
+static inline _EGLDisplay *
 _eglLookupDisplay(EGLDisplay display)
 {
    _EGLDisplay *dpy = (_EGLDisplay *) display;
@@ -199,7 +216,7 @@ _eglLookupDisplay(EGLDisplay display)
 /**
  * Return the handle of a linked display, or EGL_NO_DISPLAY.
  */
-static INLINE EGLDisplay
+static inline EGLDisplay
 _eglGetDisplayHandle(_EGLDisplay *dpy)
 {
    return (EGLDisplay) ((dpy) ? dpy : EGL_NO_DISPLAY);
@@ -210,11 +227,11 @@ extern void
 _eglInitResource(_EGLResource *res, EGLint size, _EGLDisplay *dpy);
 
 
-PUBLIC void
+extern void
 _eglGetResource(_EGLResource *res);
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglPutResource(_EGLResource *res);
 
 
@@ -229,11 +246,36 @@ _eglUnlinkResource(_EGLResource *res, _EGLResourceType type);
 /**
  * Return true if the resource is linked.
  */
-static INLINE EGLBoolean
+static inline EGLBoolean
 _eglIsResourceLinked(_EGLResource *res)
 {
    return res->IsLinked;
 }
 
+#ifdef HAVE_X11_PLATFORM
+_EGLDisplay*
+_eglGetX11Display(Display *native_display, const EGLint *attrib_list);
+#endif
+
+#ifdef HAVE_DRM_PLATFORM
+struct gbm_device;
+
+_EGLDisplay*
+_eglGetGbmDisplay(struct gbm_device *native_display,
+                  const EGLint *attrib_list);
+#endif
+
+#ifdef HAVE_WAYLAND_PLATFORM
+struct wl_display;
+
+_EGLDisplay*
+_eglGetWaylandDisplay(struct wl_display *native_display,
+                      const EGLint *attrib_list);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* EGLDISPLAY_INCLUDED */