GL: Update BlitGL to use ANGLE_GL_TRY.

src/libANGLE/renderer/gl/BlitGL.h

@@ -107,7 +107,8 @@ class BlitGL : angle::NonCopyable
                                             bool unpackPremultiplyAlpha,
                                             bool unpackUnmultiplyAlpha);
 
-    angle::Result copyTexSubImage(TextureGL *source,
+    angle::Result copyTexSubImage(const gl::Context *context,
+                                  TextureGL *source,
                                   size_t sourceLevel,
                                   TextureGL *dest,
                                   gl::TextureTarget destTarget,
@@ -116,25 +117,31 @@ class BlitGL : angle::NonCopyable
                                   const gl::Offset &destOffset,
                                   bool *copySucceededOut);
 
-    angle::Result clearRenderableTexture(TextureGL *source,
+    angle::Result clearRenderableTexture(const gl::Context *context,
+                                         TextureGL *source,
                                          GLenum sizedInternalFormat,
                                          int numTextureLayers,
                                          const gl::ImageIndex &imageIndex,
                                          bool *clearSucceededOut);
 
-    angle::Result clearRenderbuffer(RenderbufferGL *source, GLenum sizedInternalFormat);
+    angle::Result clearRenderbuffer(const gl::Context *context,
+                                    RenderbufferGL *source,
+                                    GLenum sizedInternalFormat);
 
-    angle::Result clearFramebuffer(FramebufferGL *source);
+    angle::Result clearFramebuffer(const gl::Context *context, FramebufferGL *source);
 
-    angle::Result clearRenderableTextureAlphaToOne(GLuint texture,
+    angle::Result clearRenderableTextureAlphaToOne(const gl::Context *context,
+                                                   GLuint texture,
                                                    gl::TextureTarget target,
                                                    size_t level);
 
-    angle::Result initializeResources();
+    angle::Result initializeResources(const gl::Context *context);
 
   private:
-    void orphanScratchTextures();
-    void setScratchTextureParameter(GLenum param, GLenum value);
+    angle::Result orphanScratchTextures(const gl::Context *context);
+    angle::Result setScratchTextureParameter(const gl::Context *context,
+                                             GLenum param,
+                                             GLenum value);
 
     const FunctionsGL *mFunctions;
     const angle::FeaturesGL &mFeatures;

src/libANGLE/renderer/gl/RenderbufferGL.cpp

@@ -113,7 +113,7 @@ GLuint RenderbufferGL::getRenderbufferID() const
 angle::Result RenderbufferGL::initializeContents(const gl::Context *context,
                                                  const gl::ImageIndex &imageIndex)
 {
-    return mBlitter->clearRenderbuffer(this, mNativeInternalFormat);
+    return mBlitter->clearRenderbuffer(context, this, mNativeInternalFormat);
 }
 
 GLenum RenderbufferGL::getNativeInternalFormat() const

src/libANGLE/renderer/gl/SurfaceGL.cpp

@@ -41,7 +41,7 @@ angle::Result SurfaceGL::initializeContents(const gl::Context *context,
     ASSERT(framebufferGL->isDefault());
 
     BlitGL *blitter = GetBlitGL(context);
-    ANGLE_TRY(blitter->clearFramebuffer(framebufferGL));
+    ANGLE_TRY(blitter->clearFramebuffer(context, framebufferGL));
 
     return angle::Result::Continue;
 }

src/libANGLE/renderer/gl/TextureGL.cpp

@@ -879,8 +879,8 @@ angle::Result TextureGL::copySubTextureHelper(const gl::Context *context,
         !destSRGB && sourceGL->getType() == gl::TextureType::_2D)
     {
         bool copySucceeded = false;
-        ANGLE_TRY(blitter->copyTexSubImage(sourceGL, sourceLevel, this, target, level, sourceArea,
-                                           destOffset, &copySucceeded));
+        ANGLE_TRY(blitter->copyTexSubImage(context, sourceGL, sourceLevel, this, target, level,
+                                           sourceArea, destOffset, &copySucceeded));
         if (copySucceeded)
         {
             return angle::Result::Continue;
@@ -1802,7 +1802,7 @@ angle::Result TextureGL::initializeContents(const gl::Context *context,
         int levelDepth = mState.getImageDesc(imageIndex).size.depth;
 
         bool clearSucceeded = false;
-        ANGLE_TRY(blitter->clearRenderableTexture(this, nativeInternalFormat, levelDepth,
+        ANGLE_TRY(blitter->clearRenderableTexture(context, this, nativeInternalFormat, levelDepth,
                                                   imageIndex, &clearSucceeded));
         if (clearSucceeded)
         {

src/libANGLE/renderer/gl/cgl/IOSurfaceSurfaceCGL.mm

@@ -319,7 +319,8 @@ angle::Result IOSurfaceSurfaceCGL::initializeAlphaChannel(const gl::Context *con
     }
 
     BlitGL *blitter = GetBlitGL(context);
-    ANGLE_TRY(blitter->clearRenderableTextureAlphaToOne(texture, gl::TextureTarget::Rectangle, 0));
+    ANGLE_TRY(blitter->clearRenderableTextureAlphaToOne(context, texture,
+                                                        gl::TextureTarget::Rectangle, 0));
     mAlphaInitialized = true;
     return angle::Result::Continue;
 }