diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:35:21 +0000 |
| commit | 3c0edf1d82131458b0aa7c5115a53e62a6421f21 (patch) | |
| tree | 1ea30c39763a51a590e0d0abb47080447f18fed1 /third_party | |
| parent | 6954b285be656e38ed8462c8b296c3a8576193e8 (diff) | |
| download | chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.zip chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.gz chromium_src-3c0edf1d82131458b0aa7c5115a53e62a6421f21.tar.bz2 | |
Revert r118525 / Re-land r118240 - the build failure was a flake.
This change re-enables building gles2_c_lib as a component.
TBR=gman@chromium.org
BUG=107735
TEST=waterfall stays green
Review URL: https://chromiumcodereview.appspot.com/9150022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118263 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, 13 insertions, 5 deletions
diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h index 39aa414..34d06ac 100644 --- a/third_party/khronos/GLES2/gl2.h +++ b/third_party/khronos/GLES2/gl2.h @@ -486,8 +486,6 @@ 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 ad13aa3..60b8566 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 void GL_APIENTRY glEnableFeatureCHROMIUM (const GLchar *feature); +GL_APICALL GLboolean 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 c9fa3c4..f1c8520 100644 --- a/third_party/khronos/GLES2/gl2platform.h +++ b/third_party/khronos/GLES2/gl2platform.h @@ -19,8 +19,18 @@ #include <KHR/khrplatform.h> -#ifndef GL_APICALL -#define GL_APICALL KHRONOS_APICALL +#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 #endif #ifndef GL_APIENTRY |