egl/dri2: implement EGL_KHR_wait_sync

[mesa.git] / src / egl / main / eglcontext.h

diff --git a/src/egl/main/eglcontext.h b/src/egl/main/eglcontext.h
index 8cd0df173135bd69079541114619bf5dc13ad021..241917f3bead6df77675da829bb62d6c9448a3da 100644 (file)
--- a/src/egl/main/eglcontext.h
+++ b/src/egl/main/eglcontext.h
@@ -1,6 +1,37 @@
+/**************************************************************************
+ *
+ * Copyright 2008 VMware, Inc.
+ * Copyright 2009-2010 Chia-I Wu <olvaffe@gmail.com>
+ * Copyright 2010-2011 LunarG, Inc.
+ * All Rights Reserved.
+ *
+ * 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, sub license, 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 (including the
+ * next paragraph) 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.
+ *
+ **************************************************************************/
+
+
 #ifndef EGLCONTEXT_INCLUDED
 #define EGLCONTEXT_INCLUDED
 
+#include "c99_compat.h"
 
 #include "egltypedefs.h"
 #include "egldisplay.h"
@@ -22,14 +53,18 @@ struct _egl_context
    _EGLConfig *Config;
 
    EGLint ClientAPI; /**< EGL_OPENGL_ES_API, EGL_OPENGL_API, EGL_OPENVG_API */
-   EGLint ClientVersion; /**< 1 = OpenGLES 1.x, 2 = OpenGLES 2.x */
+   EGLint ClientMajorVersion;
+   EGLint ClientMinorVersion;
+   EGLint Flags;
+   EGLint Profile;
+   EGLint ResetNotificationStrategy;
 
    /* The real render buffer when a window surface is bound */
    EGLint WindowRenderBuffer;
 };
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglInitContext(_EGLContext *ctx, _EGLDisplay *dpy,
                 _EGLConfig *config, const EGLint *attrib_list);
 
@@ -38,7 +73,7 @@ extern EGLBoolean
 _eglQueryContext(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx, EGLint attribute, EGLint *value);
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglBindContext(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read,
                 _EGLContext **old_ctx,
                 _EGLSurface **old_draw, _EGLSurface **old_read);
@@ -47,7 +82,7 @@ _eglBindContext(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read,
 /**
  * Increment reference count for the context.
  */
-static INLINE _EGLContext *
+static inline _EGLContext *
 _eglGetContext(_EGLContext *ctx)
 {
    if (ctx)
@@ -59,7 +94,7 @@ _eglGetContext(_EGLContext *ctx)
 /**
  * Decrement reference count for the context.
  */
-static INLINE EGLBoolean
+static inline EGLBoolean
 _eglPutContext(_EGLContext *ctx)
 {
    return (ctx) ? _eglPutResource(&ctx->Resource) : EGL_FALSE;
@@ -70,7 +105,7 @@ _eglPutContext(_EGLContext *ctx)
  * Link a context to its display and return the handle of the link.
  * The handle can be passed to client directly.
  */
-static INLINE EGLContext
+static inline EGLContext
 _eglLinkContext(_EGLContext *ctx)
 {
    _eglLinkResource(&ctx->Resource, _EGL_RESOURCE_CONTEXT);
@@ -82,7 +117,7 @@ _eglLinkContext(_EGLContext *ctx)
  * Unlink a linked context from its display.
  * Accessing an unlinked context should generate EGL_BAD_CONTEXT error.
  */
-static INLINE void
+static inline void
 _eglUnlinkContext(_EGLContext *ctx)
 {
    _eglUnlinkResource(&ctx->Resource, _EGL_RESOURCE_CONTEXT);
@@ -93,7 +128,7 @@ _eglUnlinkContext(_EGLContext *ctx)
  * Lookup a handle to find the linked context.
  * Return NULL if the handle has no corresponding linked context.
  */
-static INLINE _EGLContext *
+static inline _EGLContext *
 _eglLookupContext(EGLContext context, _EGLDisplay *dpy)
 {
    _EGLContext *ctx = (_EGLContext *) context;
@@ -106,7 +141,7 @@ _eglLookupContext(EGLContext context, _EGLDisplay *dpy)
 /**
  * Return the handle of a linked context, or EGL_NO_CONTEXT.
  */
-static INLINE EGLContext
+static inline EGLContext
 _eglGetContextHandle(_EGLContext *ctx)
 {
    _EGLResource *res = (_EGLResource *) ctx;