summaryrefslogtreecommitdiff
path: root/include/GLES2/gl2platform.h
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-05-31 10:15:55 +0800
committerChia-I Wu <olv@lunarg.com>2010-05-31 10:43:17 +0800
commit59f8dca7cf7ce2b21d3bfe59c55bd3927de7f39c (patch)
tree9469f2978162b8851354053776f3ffb6f2c08c50 /include/GLES2/gl2platform.h
parent8e1b375a8d186c0241239630f766f20513fa5371 (diff)
Update OpenGL ES headers.
Diffstat (limited to 'include/GLES2/gl2platform.h')
-rw-r--r--include/GLES2/gl2platform.h82
1 files changed, 20 insertions, 62 deletions
diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h
index 7e3dbc64b4..c9fa3c4d64 100644
--- a/include/GLES2/gl2platform.h
+++ b/include/GLES2/gl2platform.h
@@ -1,72 +1,30 @@
#ifndef __gl2platform_h_
#define __gl2platform_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */
/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-**
-** http://oss.sgi.com/projects/FreeB
-**
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-**
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-*/
-
-/*-------------------------------------------------------------------------
- * Definition of GL_APICALL and GL_APIENTRY
- *-----------------------------------------------------------------------*/
-
-#ifdef _WIN32
-# ifdef __GL_EXPORTS
-# define GL_APICALL __declspec(dllexport)
-# else
-# define GL_APICALL __declspec(dllimport)
-# endif
-# ifdef UNDER_CE
-# define GL_APIENTRY
-# else
-# define GL_APIENTRY __stdcall
-# endif
-#else
-# ifdef __GL_EXPORTS
-# define GL_APICALL
-# else
-# define GL_APICALL extern
-# endif
-# define GL_APIENTRY
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/* Platform-specific types and definitions for OpenGL ES 2.X gl2.h
+ *
+ * Adopters may modify khrplatform.h and this file to suit their platform.
+ * You are encouraged to submit all modifications to the Khronos group so that
+ * they can be included in future versions of this file. Please submit changes
+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
+ * by filing a bug against product "OpenGL-ES" component "Registry".
+ */
+
+#include <KHR/khrplatform.h>
+
+#ifndef GL_APICALL
+#define GL_APICALL KHRONOS_APICALL
#endif
-
-#ifdef __cplusplus
-}
+#ifndef GL_APIENTRY
+#define GL_APIENTRY KHRONOS_APIENTRY
#endif
#endif /* __gl2platform_h_ */