Chromium Code Reviews

Unified Diff: third_party/khronos/EGL/eglplatform.h

Issue 8423038: Move GL headers from gpu to third_party/khronos (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: third_party/khronos/EGL/eglplatform.h
diff --git a/gpu/gles2_conform_support/egl/native/EGL/eglplatform.h b/third_party/khronos/EGL/eglplatform.h
similarity index 91%
rename from gpu/gles2_conform_support/egl/native/EGL/eglplatform.h
rename to third_party/khronos/EGL/eglplatform.h
index b01aa4d9b50099283913c11d70d2dbf448ac7077..6d34ab55db9fda679e8839b754dad4adffe375c9 100644
--- a/gpu/gles2_conform_support/egl/native/EGL/eglplatform.h
+++ b/third_party/khronos/EGL/eglplatform.h
@@ -25,7 +25,7 @@
*/
/* Platform-specific types and definitions for egl.h
- * $Revision: 9724 $ on $Date: 2009-12-02 02:05:33 -0800 (Wed, 02 Dec 2009) $
+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
*
* 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
@@ -47,11 +47,11 @@
*/
#ifndef EGLAPI
-#define EGLAPI //KHRONOS_APICALL
+#define EGLAPI KHRONOS_APICALL
#endif
#ifndef EGLAPIENTRY
-#define EGLAPIENTRY //KHRONOS_APIENTRY
+#define EGLAPIENTRY KHRONOS_APIENTRY
#endif
#define EGLAPIENTRYP EGLAPIENTRY*
@@ -60,6 +60,11 @@
* Windows Device Context. They must be defined in platform-specific
* code below. The EGL-prefixed versions of Native*Type are the same
* types, renamed in EGL 1.3 so all types in the API start with "EGL".
+ *
+ * Khronos STRONGLY RECOMMENDS that you use the default definitions
+ * provided below, since these changes affect both binary and source
+ * portability of applications using EGL running on different EGL
+ * implementations.
*/
#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
@@ -88,13 +93,6 @@ typedef Display *EGLNativeDisplayType;
typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType;
-#elif defined(__APPLE__)
-
-// TODO(gman): these are place holders.
-typedef void *EGLNativeDisplayType;
-typedef int EGLNativePixmapType;
-typedef int EGLNativeWindowType;
-
#else
#error "Platform not recognized"
#endif

Powered by Google App Engine