Remove some unused GrGLGpu member fields and functions.

bsalomon · Skia Commit-Bot · commit ede88ab2b414 · 2019-01-28T15:29:56.000Z
-Members related to already removed stencil clear program. -hasExtension() inline memeber function -declaration for unimplemented setTextureSwizze() member function. Change-Id: Ibe6054fcb7f7c8c69cfcbbbb12df95f9dcebf9fe Reviewed-on: https://skia-review.googlesource.com/c/187305 Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com> Auto-Submit: Brian Salomon <bsalomon@google.com> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
@@ -376,7 +376,6 @@ GrGLGpu::~GrGLGpu() {
     fPathRendering.reset();
     fCopyProgramArrayBuffer.reset();
     fMipmapProgramArrayBuffer.reset();
-    fStencilClipClearArrayBuffer.reset();
 
     fHWProgram.reset();
     if (fHWProgramID) {
@@ -407,10 +406,6 @@ GrGLGpu::~GrGLGpu() {
         }
     }
 
-    if (fStencilClipClearProgram) {
-        GL_CALL(DeleteProgram(fStencilClipClearProgram));
-    }
-
     delete fProgramCache;
     fSamplerObjectCache.reset();
 }
@@ -440,9 +435,6 @@ void GrGLGpu::disconnect(DisconnectType type) {
                 GL_CALL(DeleteProgram(fMipmapPrograms[i].fProgram));
             }
         }
-        if (fStencilClipClearProgram) {
-            GL_CALL(DeleteProgram(fStencilClipClearProgram));
-        }
 
         if (fSamplerObjectCache) {
             fSamplerObjectCache->release();
@@ -472,8 +464,6 @@ void GrGLGpu::disconnect(DisconnectType type) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(fMipmapPrograms); ++i) {
         fMipmapPrograms[i].fProgram = 0;
     }
-    fStencilClipClearProgram = 0;
-    fStencilClipClearArrayBuffer.reset();
 
     if (this->glCaps().shaderCaps()->pathRenderingSupport()) {
         this->glPathRendering()->disconnect(type);
diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h
@@ -250,8 +250,6 @@ class GrGLGpu final : public GrGpu, private GrMesh::SendToGpuImpl {
     // binds texture unit in GL
     void setTextureUnit(int unitIdx);
 
-    void setTextureSwizzle(int unitIdx, GrGLenum target, const GrGLenum swizzle[]);
-
     /**
      * primitiveProcessorTextures must contain GrPrimitiveProcessor::numTextureSamplers() *
      * numPrimitiveProcessorTextureSets entries.
@@ -286,8 +284,6 @@ class GrGLGpu final : public GrGpu, private GrMesh::SendToGpuImpl {
 
     void onFinishFlush(bool insertedSemaphores) override;
 
-    bool hasExtension(const char* ext) const { return fGLContext->hasExtension(ext); }
-
     bool copySurfaceAsDraw(GrSurface* dst, GrSurfaceOrigin dstOrigin,
                            GrSurface* src, GrSurfaceOrigin srcOrigin,
                            const SkIRect& srcRect, const SkIPoint& dstPoint);
@@ -614,9 +610,6 @@ class GrGLGpu final : public GrGpu, private GrMesh::SendToGpuImpl {
     }                                       fMipmapPrograms[4];
     sk_sp<GrGLBuffer>                       fMipmapProgramArrayBuffer;
 
-    GrGLuint                                fStencilClipClearProgram = 0;
-    sk_sp<GrGLBuffer>                       fStencilClipClearArrayBuffer;
-
     static int TextureToCopyProgramIdx(GrTexture* texture);
 
     static int TextureSizeToMipmapProgramIdx(int width, int height) {

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,6 @@ GrGLGpu::~GrGLGpu() {`
`376`	`376`	`fPathRendering.reset();`
`377`	`377`	`fCopyProgramArrayBuffer.reset();`
`378`	`378`	`fMipmapProgramArrayBuffer.reset();`
`379`		`- fStencilClipClearArrayBuffer.reset();`
`380`	`379`
`381`	`380`	`fHWProgram.reset();`
`382`	`381`	`if (fHWProgramID) {`
`@@ -407,10 +406,6 @@ GrGLGpu::~GrGLGpu() {`
`407`	`406`	`}`
`408`	`407`	`}`
`409`	`408`
`410`		`- if (fStencilClipClearProgram) {`
`411`		`- GL_CALL(DeleteProgram(fStencilClipClearProgram));`
`412`		`- }`
`413`		`-`
`414`	`409`	`delete fProgramCache;`
`415`	`410`	`fSamplerObjectCache.reset();`
`416`	`411`	`}`
`@@ -440,9 +435,6 @@ void GrGLGpu::disconnect(DisconnectType type) {`
`440`	`435`	`GL_CALL(DeleteProgram(fMipmapPrograms[i].fProgram));`
`441`	`436`	`}`
`442`	`437`	`}`
`443`		`- if (fStencilClipClearProgram) {`
`444`		`- GL_CALL(DeleteProgram(fStencilClipClearProgram));`
`445`		`- }`
`446`	`438`
`447`	`439`	`if (fSamplerObjectCache) {`
`448`	`440`	`fSamplerObjectCache->release();`
`@@ -472,8 +464,6 @@ void GrGLGpu::disconnect(DisconnectType type) {`
`472`	`464`	`for (size_t i = 0; i < SK_ARRAY_COUNT(fMipmapPrograms); ++i) {`
`473`	`465`	`fMipmapPrograms[i].fProgram = 0;`
`474`	`466`	`}`
`475`		`- fStencilClipClearProgram = 0;`
`476`		`- fStencilClipClearArrayBuffer.reset();`
`477`	`467`
`478`	`468`	`if (this->glCaps().shaderCaps()->pathRenderingSupport()) {`
`479`	`469`	`this->glPathRendering()->disconnect(type);`