commit 4f6592fa4ce9534b7ec66c13f6f21dbd6a1c234a
author Jamie Madill <jmadill@chromium.org> Tue Nov 27 16:37:45 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Nov 28 00:59:29 2018 +0000
tree 3c3851740c2a1d34789f0fedf45e545b65735a21
parent fdbdb2b247ffa4cf66bc2cd3a5bb45a056bd88a3

Remove gl::Error.

Removes several TODOs. Only egl::Error remains.

Also slightly decreases binary size.

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

src/libANGLE/renderer/renderer_utils.cpp

diff --git a/src/libANGLE/renderer/renderer_utils.cpp b/src/libANGLE/renderer/renderer_utils.cpp
index b01cbd1..7ff150c 100644
--- a/src/libANGLE/renderer/renderer_utils.cpp
+++ b/src/libANGLE/renderer/renderer_utils.cpp
@@ -431,20 +431,24 @@
     gl::Texture *tex = new gl::Texture(implFactory, std::numeric_limits<GLuint>::max(), createType);
     angle::UniqueObjectPointer<gl::Texture, gl::Context> t(tex, context);
 
+    // This is a bit of a kludge but is necessary to consume the error.
+    gl::Context *mutableContext = const_cast<gl::Context *>(context);
+
     if (createType == gl::TextureType::_2DMultisample)
     {
-        ANGLE_TRY(t->setStorageMultisample(context, createType, 1, GL_RGBA8, colorSize, true));
+        ANGLE_TRY(
+            t->setStorageMultisample(mutableContext, createType, 1, GL_RGBA8, colorSize, true));
     }
     else
     {
-        ANGLE_TRY(t->setStorage(context, createType, 1, GL_RGBA8, colorSize));
+        ANGLE_TRY(t->setStorage(mutableContext, createType, 1, GL_RGBA8, colorSize));
     }
 
     if (type == gl::TextureType::CubeMap)
     {
         for (gl::TextureTarget face : gl::AllCubeFaceTextureTargets())
         {
-            ANGLE_TRY(t->setSubImage(context, unpack, nullptr, face, 0, area, GL_RGBA,
+            ANGLE_TRY(t->setSubImage(mutableContext, unpack, nullptr, face, 0, area, GL_RGBA,
                                      GL_UNSIGNED_BYTE, color));
         }
     }
@@ -455,7 +459,7 @@
     }
     else
     {
-        ANGLE_TRY(t->setSubImage(context, unpack, nullptr,
+        ANGLE_TRY(t->setSubImage(mutableContext, unpack, nullptr,
                                  gl::NonCubeTextureTypeToTarget(createType), 0, area, GL_RGBA,
                                  GL_UNSIGNED_BYTE, color));
     }