Index: third_party/khronos/KHR/khrplatform.h |
diff --git a/third_party/khronos/KHR/khrplatform.h b/third_party/khronos/KHR/khrplatform.h |
index 8ec0d199ff04d27e5f2e9eb37c97c14ad770f993..444ec663ebe8b9b0dc99aa5a7853c0f8e1df1b72 100644 |
--- a/third_party/khronos/KHR/khrplatform.h |
+++ b/third_party/khronos/KHR/khrplatform.h |
@@ -26,7 +26,7 @@ |
/* Khronos platform-specific types and definitions. |
* |
- * $Revision: 9356 $ on $Date: 2009-10-21 02:52:25 -0700 (Wed, 21 Oct 2009) $ |
+ * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ |
* |
* Adopters may modify this file to suit their platform. Adopters are |
* encouraged to submit platform specific modifications to the Khronos |
@@ -119,6 +119,28 @@ |
#endif |
/*------------------------------------------------------------------------- |
+ * Chromium-specific overrides of KHRONOS_APICALL and KHRONOS_APIENTRY |
+ *-----------------------------------------------------------------------*/ |
+ |
+#undef KHRONOS_APICALL |
+#if defined(COMPONENT_BUILD) |
+#if defined(WIN32) |
+#if defined(GLES2_C_LIB_IMPLEMENTATION) |
+# define KHRONOS_APICALL __declspec(dllexport) |
+#else |
+# define KHRONOS_APICALL __declspec(dllimport) |
+#endif /* defined(GLES2_C_LIB_IMPLEMENTATION) */ |
+#else |
+# define KHRONOS_APICALL __attribute__((visibility("default"))) |
+#endif /* defined(WIN32) */ |
+#else |
+# define KHRONOS_APICALL |
+#endif |
+ |
+#undef KHRONOS_APIENTRY |
+#define KHRONOS_APIENTRY |
+ |
+/*------------------------------------------------------------------------- |
* Definition of KHRONOS_APIATTRIBUTES |
*------------------------------------------------------------------------- |
* This follows the closing parenthesis of the function prototype arguments. |
@@ -221,10 +243,23 @@ typedef signed char khronos_int8_t; |
typedef unsigned char khronos_uint8_t; |
typedef signed short int khronos_int16_t; |
typedef unsigned short int khronos_uint16_t; |
+ |
+/* |
+ * Types that differ between LLP64 and LP64 architectures - in LLP64, |
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears |
+ * to be the only LLP64 architecture in current use. |
+ */ |
+#ifdef _WIN64 |
+typedef signed long long int khronos_intptr_t; |
+typedef unsigned long long int khronos_uintptr_t; |
+typedef signed long long int khronos_ssize_t; |
+typedef unsigned long long int khronos_usize_t; |
+#else |
typedef signed long int khronos_intptr_t; |
typedef unsigned long int khronos_uintptr_t; |
typedef signed long int khronos_ssize_t; |
typedef unsigned long int khronos_usize_t; |
+#endif |
#if KHRONOS_SUPPORT_FLOAT |
/* |