diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 19:09:02 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 19:09:02 +0000 |
| commit | 3d944a8430e2b872fccfd3ddd8fd00db07256baa (patch) | |
| tree | 6987e7c8632e632a54520af96ed483d1ee2a681d /webkit | |
| parent | b4dcf9553fe3934188b6b30b62d50e3d144d1233 (diff) | |
| download | chromium_src-3d944a8430e2b872fccfd3ddd8fd00db07256baa.zip chromium_src-3d944a8430e2b872fccfd3ddd8fd00db07256baa.tar.gz chromium_src-3d944a8430e2b872fccfd3ddd8fd00db07256baa.tar.bz2 | |
Added temporary #ifdefs to support incompatible ANGLE API upgrade.
BUG=174821
Review URL: https://codereview.chromium.org/12210057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index a100b1f..847acda 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -1797,7 +1797,11 @@ bool WebGraphicsContext3DInProcessImpl::AngleValidateShaderSource( char* source = entry->source.get(); if (!ShCompile(compiler, &source, 1, SH_OBJECT_CODE)) { +#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108 int logSize = 0; +#else + size_t logSize = 0; +#endif ShGetInfo(compiler, SH_INFO_LOG_LENGTH, &logSize); if (logSize > 1) { entry->log.reset(new char[logSize]); @@ -1806,7 +1810,11 @@ bool WebGraphicsContext3DInProcessImpl::AngleValidateShaderSource( return false; } +#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108 int length = 0; +#else + size_t length = 0; +#endif ShGetInfo(compiler, SH_OBJECT_CODE_LENGTH, &length); if (length > 1) { entry->translated_source.reset(new char[length]); |