Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: third_party/khronos/KHR/khrplatform.h

Issue 2767063002: 16-bit video upload to float: intermediate R16_EXT and copy to float. (Closed)
Patch Set: Nit. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/khronos/GLES3/gl3platform.h ('k') | third_party/khronos/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/khronos/KHR/khrplatform.h
diff --git a/third_party/khronos/KHR/khrplatform.h b/third_party/khronos/KHR/khrplatform.h
index 328bd65fcef3368a9dca21d5a51d3127ab39d82f..ee724088e2e3ca2faf7b3a50f1a8e9634a4772de 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: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
+ * $Revision: 32517 $ on $Date: 2016-03-11 02:41:19 -0800 (Fri, 11 Mar 2016) $
*
* Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos
@@ -101,6 +101,9 @@
# define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C
+#elif defined(__ANDROID__)
+# include <sys/cdefs.h>
+# define KHRONOS_APICALL __attribute__((visibility("default"))) __NDK_FPABI__
#else
# define KHRONOS_APICALL
#endif
@@ -121,7 +124,6 @@
/*-------------------------------------------------------------------------
* Chromium-specific overrides of KHRONOS_APICALL and KHRONOS_APIENTRY
*-----------------------------------------------------------------------*/
-
#undef KHRONOS_APICALL
#if defined(GLES2_USE_MOJO)
#include "mojo/public/c/gles2/gles2_export.h"
@@ -236,7 +238,7 @@ typedef signed short int khronos_int16_t;
typedef unsigned short int khronos_uint16_t;
/*
- * Types that differ between LLP64 and LP64 architectures - in LLP64,
+ * 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.
*/
« no previous file with comments | « third_party/khronos/GLES3/gl3platform.h ('k') | third_party/khronos/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698