Index: third_party/khronos/EGL/eglplatform.h |
diff --git a/third_party/khronos/EGL/eglplatform.h b/third_party/khronos/EGL/eglplatform.h |
index ed5aab2a30cd1bf176da33b6bf89f1037833fe48..dfbc52cea2af3b82e9ad0904353231e2395a7481 100644 |
--- a/third_party/khronos/EGL/eglplatform.h |
+++ b/third_party/khronos/EGL/eglplatform.h |
@@ -2,7 +2,7 @@ |
#define __eglplatform_h_ |
/* |
-** Copyright (c) 2007-2009 The Khronos Group Inc. |
+** Copyright (c) 2007-2016 The Khronos Group Inc. |
** |
** Permission is hereby granted, free of charge, to any person obtaining a |
** copy of this software and/or associated documentation files (the |
@@ -25,7 +25,7 @@ |
*/ |
/* Platform-specific types and definitions for egl.h |
- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ |
+ * $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $ |
* |
* 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 |
@@ -83,7 +83,6 @@ typedef int EGLNativeDisplayType; |
typedef void *EGLNativeWindowType; |
typedef void *EGLNativePixmapType; |
-// From Android NDK. |
#elif defined(__ANDROID__) || defined(ANDROID) |
#include <android/native_window.h> |
@@ -96,6 +95,7 @@ typedef void* EGLNativeDisplayType; |
#elif defined(USE_OZONE) |
+/* Chromium-specific */ |
typedef intptr_t EGLNativeDisplayType; |
typedef intptr_t EGLNativeWindowType; |
typedef intptr_t EGLNativePixmapType; |
@@ -112,7 +112,7 @@ typedef Window EGLNativeWindowType; |
#elif defined(__APPLE__) |
-// TODO(gman): these are place holders. |
+/* Chromium-specific __APPLE__ EGLNative* definition */ |
typedef void *EGLNativeDisplayType; |
typedef int EGLNativePixmapType; |
#ifdef __OBJC__ |
@@ -142,4 +142,12 @@ typedef EGLNativeWindowType NativeWindowType; |
*/ |
typedef khronos_int32_t EGLint; |
+ |
+/* C++ / C typecast macros for special EGL handle values */ |
+#if defined(__cplusplus) |
+#define EGL_CAST(type, value) (static_cast<type>(value)) |
+#else |
+#define EGL_CAST(type, value) ((type) (value)) |
+#endif |
+ |
#endif /* __eglplatform_h */ |