diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:39:17 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:39:17 +0000 |
| commit | 96fba197b33d6d831f5cfd2469202db4b6506557 (patch) | |
| tree | 84987c766b9437b61de2df51e4f3314d525aceaa /third_party | |
| parent | e6aa46992d11da1581f65c47e4f4c9bf81a27036 (diff) | |
| download | chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.zip chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.gz chromium_src-96fba197b33d6d831f5cfd2469202db4b6506557.tar.bz2 | |
Revert r118240 - gles_2_c_lib as a component.
Broke compile on windows.
TBR=gman@chromium.org
BUG=107735
TEST=waterfall greens up again
Review URL: https://chromiumcodereview.appspot.com/9264003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/GLES2/gl2.h | 2 | ||||
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 2 | ||||
| -rw-r--r-- | third_party/khronos/GLES2/gl2platform.h | 14 |
3 files changed, 5 insertions, 13 deletions
diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h index 34d06ac..39aa414 100644 --- a/third_party/khronos/GLES2/gl2.h +++ b/third_party/khronos/GLES2/gl2.h @@ -486,6 +486,8 @@ typedef khronos_ssize_t GLsizeiptr; /*------------------------------------------------------------------------- * GL core functions. *-----------------------------------------------------------------------*/ +#undef GL_APICALL +#define GL_APICALL #undef GL_APIENTRY #define GL_APIENTRY diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 60b8566..ad13aa3 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -1398,7 +1398,7 @@ typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUM) (); #ifdef GL_GLEXT_PROTOTYPES #define glEnableFeatureCHROMIUM GLES2_GET_FUN(EnableFeatureCHROMIUM) #if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL GLboolean GL_APIENTRY glEnableFeatureCHROMIUM (const GLchar *feature); +GL_APICALL void GL_APIENTRY glEnableFeatureCHROMIUM (const GLchar *feature); #endif #else typedef void (GL_APIENTRYP PFNGLENABLEFEATURECHROMIUM) (const GLchar *feature); diff --git a/third_party/khronos/GLES2/gl2platform.h b/third_party/khronos/GLES2/gl2platform.h index f1c8520..c9fa3c4 100644 --- a/third_party/khronos/GLES2/gl2platform.h +++ b/third_party/khronos/GLES2/gl2platform.h @@ -19,18 +19,8 @@ #include <KHR/khrplatform.h> -#if defined(COMPONENT_BUILD) -#if defined(WIN32) -#if defined(GLES2_C_LIB_IMPLEMENTATION) -#define GL_APICALL __declspec(dllexport) -#else -#define GL_APICALL __declspec(dllimport) -#endif /* defined(GLES2_C_LIB_IMPLEMENTATION) */ -#else /* defined(WIN32) */ -#define GL_APICALL __attribute__((visibility("default"))) -#endif -#else -# define GL_APICALL +#ifndef GL_APICALL +#define GL_APICALL KHRONOS_APICALL #endif #ifndef GL_APIENTRY |