commit f4d429c1cbc1351ea9f1ac74e0f22b085d275179
author Jamie Madill <jmadill@chromium.org> Thu Sep 13 11:20:52 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Sep 13 16:19:36 2018 +0000
tree 5040fb9dc73c51a6d41cef9f46aa4381a9b94390
parent 17dff6d2f9217cf28dd3bab9d60bc5d03c01ea71

Fix EGL enum allocation.

The following enums had a small typo causing them to be takend from an
unused block:

EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE
EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM
EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE

Fix this by temporarily defining a secondary enum. Once Chromium is
fixed upstream we can remove the temporary enum.

Reported by dan.glastonbury@gmail.com.

Bug: angleproject:2806
Change-Id: I2ce1dec0a30d5e83f2bec0ae243fd860cbcea4fc
Reviewed-on: https://chromium-review.googlesource.com/1220371
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 0cb16bc..a307400 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -198,7 +198,9 @@
 
 bool GetWebGLContext(const egl::AttributeMap &attribs)
 {
-    return (attribs.get(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE, EGL_FALSE) == EGL_TRUE);
+    // TODO(jmadill): Remove this. http://anglebug.com/2806
+    return (attribs.get(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE, EGL_FALSE) == EGL_TRUE) ||
+           (attribs.get(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE_OLD, EGL_FALSE) == EGL_TRUE);
 }
 
 bool GetExtensionsEnabled(const egl::AttributeMap &attribs, bool webGLContext)
@@ -210,7 +212,16 @@
 
 bool GetBindGeneratesResource(const egl::AttributeMap &attribs)
 {
-    return (attribs.get(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM, EGL_TRUE) == EGL_TRUE);
+    // TODO(jmadill): Remove this. http://anglebug.com/2806
+    if (attribs.contains(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM))
+    {
+        return (attribs.get(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM, EGL_TRUE) == EGL_TRUE);
+    }
+    else
+    {
+        return (attribs.get(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM_OLD, EGL_TRUE) ==
+                EGL_TRUE);
+    }
 }
 
 bool GetClientArraysEnabled(const egl::AttributeMap &attribs)