Merge branch 'master' into js-modules

1 files changed, 0 insertions, 12 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/gl/BlitGL.h b/gfx/angle/src/libANGLE/renderer/gl/BlitGL.h
index b306ede29..3ab8319bb 100755
--- a/gfx/angle/src/libANGLE/renderer/gl/BlitGL.h
+++ b/gfx/angle/src/libANGLE/renderer/gl/BlitGL.h
@@ -52,26 +52,14 @@ class BlitGL : public angle::NonCopyable
                                                   const gl::Rectangle &sourceArea,
                                                   const gl::Framebuffer *source);
 
-    gl::Error blitColorBufferWithShader(const gl::Framebuffer *source,
-                                        const gl::Framebuffer *dest,
-                                        const gl::Rectangle &sourceArea,
-                                        const gl::Rectangle &destArea,
-                                        GLenum filter);
-
     gl::Error initializeResources();
 
   private:
-    void orphanScratchTextures();
-    void setScratchTextureParameter(GLenum param, GLenum value);
-
     const FunctionsGL *mFunctions;
     const WorkaroundsGL &mWorkarounds;
     StateManagerGL *mStateManager;
 
     GLuint mBlitProgram;
-    GLint mSourceTextureLocation;
-    GLint mScaleLocation;
-    GLint mOffsetLocation;
 
     GLuint mScratchTextures[2];
     GLuint mScratchFBO;