commit 3e77d6eff2386dde071d2ef8a4cf09bdc2f75877
author John Stiles <johnstiles@google.com> Fri Jun 04 15:30:50 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 04 20:26:07 2021 +0000
tree 394a7aa82c4baf8e675e46e5ad9141a55a061318
parent 8cb7c3be75a7bedadef0d89ab93cd5b79c0ae255

Remove unused 'offset' parameter from peekDstTexture.

The dest-texture uniforms are being set directly inside GrPipeline now;
our callers don't have any other reason to inspect the offset.

Change-Id: I319287cc26767a4ea294da6615e83168500b318f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/415876
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrPipeline.cpp

diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 4b2dfdf..115de1e 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -137,8 +137,7 @@
 
 void GrPipeline::setDstTextureUniforms(const GrGLSLProgramDataManager& pdm,
                                        GrGLSLBuiltinUniformHandles* fBuiltinUniformHandles) const {
-    SkIPoint offset;
-    GrTexture* dstTexture = this->peekDstTexture(&offset);
+    GrTexture* dstTexture = this->peekDstTexture();
 
     if (dstTexture) {
         if (fBuiltinUniformHandles->fDstTextureCoordsUni.isValid()) {

src/gpu/GrPipeline.h

diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 4a44f8a..68594ca 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -142,17 +142,11 @@
      */
     const GrSurfaceProxyView& dstProxyView() const { return fDstProxyView; }
 
-    /**
-     * If the GrXferProcessor uses a texture to access the dst color, then this returns that
-     * texture and the offset to the dst contents within that texture.
-     */
-    GrTexture* peekDstTexture(SkIPoint* offset = nullptr) const {
+    /** If this GrXferProcessor uses a texture to access the dst color, returns that texture. */
+    GrTexture* peekDstTexture() const {
         if (!this->usesDstTexture()) {
             return nullptr;
         }
-        if (offset) {
-            *offset = fDstTextureOffset;
-        }
 
         if (GrTextureProxy* dstProxy = fDstProxyView.asTextureProxy()) {
             return dstProxy->peekTexture();

src/gpu/dawn/GrDawnProgramBuilder.cpp

diff --git a/src/gpu/dawn/GrDawnProgramBuilder.cpp b/src/gpu/dawn/GrDawnProgramBuilder.cpp
index 94cea2f..d9c995b 100644
--- a/src/gpu/dawn/GrDawnProgramBuilder.cpp
+++ b/src/gpu/dawn/GrDawnProgramBuilder.cpp
@@ -533,8 +533,7 @@
         }
     }
 
-    SkIPoint offset;
-    if (GrTexture* dstTexture = pipeline.peekDstTexture(&offset)) {
+    if (GrTexture* dstTexture = pipeline.peekDstTexture()) {
         set_texture(gpu, GrSamplerState::Filter::kNearest, dstTexture, &bindings, &binding);
     }