Revert "egl: Check if API is supported when using eglBindAPI."

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

diff --git a/src/egl/main/eglcurrent.h b/src/egl/main/eglcurrent.h
index e5c94ce60ab8723a68c68ae7d8b76bd90c22b4cf..1e386acdafb9c0550801536da02e2af85f56bcb6 100644 (file)
--- a/src/egl/main/eglcurrent.h
+++ b/src/egl/main/eglcurrent.h
@@ -1,14 +1,48 @@
+/**************************************************************************
+ *
+ * Copyright 2009-2010 Chia-I Wu <olvaffe@gmail.com>
+ * 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 EGLCURRENT_INCLUDED
 #define EGLCURRENT_INCLUDED
 
+#include "c99_compat.h"
 
 #include "egltypedefs.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define _EGL_API_ALL_BITS \
    (EGL_OPENGL_ES_BIT   | \
     EGL_OPENVG_BIT      | \
     EGL_OPENGL_ES2_BIT  | \
+    EGL_OPENGL_ES3_BIT_KHR | \
     EGL_OPENGL_BIT)
 
 
@@ -32,7 +66,7 @@ struct _egl_thread_info
 /**
  * Return true if a client API enum is recognized.
  */
-static INLINE EGLBoolean
+static inline EGLBoolean
 _eglIsApiValid(EGLenum api)
 {
    return (api >= _EGL_API_FIRST_API && api <= _EGL_API_LAST_API);
@@ -43,7 +77,7 @@ _eglIsApiValid(EGLenum api)
  * Convert a client API enum to an index, for use by thread info.
  * The client API enum is assumed to be valid.
  */
-static INLINE EGLint
+static inline EGLint
 _eglConvertApiToIndex(EGLenum api)
 {
    return api - _EGL_API_FIRST_API;
@@ -54,14 +88,14 @@ _eglConvertApiToIndex(EGLenum api)
  * Convert an index, used by thread info, to a client API enum.
  * The index is assumed to be valid.
  */
-static INLINE EGLenum
+static inline EGLenum
 _eglConvertApiFromIndex(EGLint idx)
 {
    return _EGL_API_FIRST_API + idx;
 }
 
 
-PUBLIC _EGLThreadInfo *
+extern _EGLThreadInfo *
 _eglGetCurrentThread(void);
 
 
@@ -73,16 +107,20 @@ extern EGLBoolean
 _eglIsCurrentThreadDummy(void);
 
 
-PUBLIC _EGLContext *
+extern _EGLContext *
 _eglGetAPIContext(EGLenum api);
 
 
-PUBLIC _EGLContext *
+extern _EGLContext *
 _eglGetCurrentContext(void);
 
 
-PUBLIC EGLBoolean
+extern EGLBoolean
 _eglError(EGLint errCode, const char *msg);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* EGLCURRENT_INCLUDED */