commit aa0e45c23226cc14362f51b32912d4a93935742f
author Chris Dalton <csmartdalton@google.com> Mon Mar 16 10:05:11 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 16 19:53:26 2020 +0000
tree b58dc2aad4f4625fd0b0c9e32946bbe787fafea4
parent 04ef810839cbbe4bdd5419e2d09627bbdf94c678

Add pass-through helper methods from GrOpFlushState to GrOpsRenderPass

Change-Id: Ifa18e909978367a4502dbf6b35a62a437e83b5c2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/276842
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrOpsRenderPass.cpp

diff --git a/src/gpu/GrOpsRenderPass.cpp b/src/gpu/GrOpsRenderPass.cpp
index 2c17828..2429381 100644
--- a/src/gpu/GrOpsRenderPass.cpp
+++ b/src/gpu/GrOpsRenderPass.cpp
@@ -42,8 +42,7 @@
     this->onExecuteDrawable(std::move(drawable));
 }
 
-void GrOpsRenderPass::bindPipeline(const GrProgramInfo& programInfo, const SkRect& drawBounds,
-                                   const SkIRect* optionalScissorRect) {
+void GrOpsRenderPass::bindPipeline(const GrProgramInfo& programInfo, const SkRect& drawBounds) {
 #ifdef SK_DEBUG
     // Both the 'programInfo' and this renderPass have an origin. Since they come from the same
     // place (i.e., the target renderTargetProxy) they had best agree.
@@ -105,11 +104,6 @@
     fDrawPipelineStatus = DrawPipelineStatus::kOk;
     fXferBarrierType = programInfo.pipeline().xferBarrierType(fRenderTarget->asTexture(),
                                                               *this->gpu()->caps());
-
-    if (optionalScissorRect) {
-        SkASSERT(programInfo.pipeline().isScissorTestEnabled());
-        this->setScissorRect(*optionalScissorRect);
-    }
 }
 
 void GrOpsRenderPass::setScissorRect(const SkIRect& scissor) {
@@ -149,14 +143,6 @@
     SkDEBUGCODE(fTextureBindingStatus = DynamicStateStatus::kConfigured);
 }
 
-void GrOpsRenderPass::bindTextures(const GrPrimitiveProcessor& primProc,
-                                   const GrSurfaceProxy& singlePrimProcTexture,
-                                   const GrPipeline& pipeline) {
-    SkASSERT(primProc.numTextureSamplers() == 1);
-    const GrSurfaceProxy* ptr = &singlePrimProcTexture;
-    this->bindTextures(primProc, &ptr, pipeline);
-}
-
 void GrOpsRenderPass::drawMeshes(const GrProgramInfo& programInfo, const GrSimpleMesh meshes[],
                                  int meshCount) {
     if (programInfo.hasFixedScissor()) {