diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/ui/gl/scoped_binders.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/ui/gl/scoped_binders.cc')
| -rw-r--r-- | chromium/ui/gl/scoped_binders.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/ui/gl/scoped_binders.cc b/chromium/ui/gl/scoped_binders.cc index 86009350e9d..eef92c10733 100644 --- a/chromium/ui/gl/scoped_binders.cc +++ b/chromium/ui/gl/scoped_binders.cc @@ -44,6 +44,9 @@ ScopedTextureBinder::ScopedTextureBinder(unsigned int target, unsigned int id) case GL_TEXTURE_CUBE_MAP: target_getter = GL_TEXTURE_BINDING_CUBE_MAP; break; + case GL_TEXTURE_EXTERNAL_OES: + target_getter = GL_TEXTURE_BINDING_EXTERNAL_OES; + break; default: NOTIMPLEMENTED() << "Target not part of OpenGL ES 2.0 spec."; } |