Move transferFrom commands from GrOp and into GrRenderTask.
These Ops don't need to go through the GrGpuCommandBuffer.
Change-Id: Ifa9c7d801c97c225989d2542709c89f36ddfdc5e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/235799
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrTextureResolveRenderTask.cpp b/src/gpu/GrTextureResolveRenderTask.cpp
index eaae8db..613f6bd 100644
--- a/src/gpu/GrTextureResolveRenderTask.cpp
+++ b/src/gpu/GrTextureResolveRenderTask.cpp
@@ -14,26 +14,26 @@
#include "src/gpu/GrTexturePriv.h"
sk_sp<GrRenderTask> GrTextureResolveRenderTask::Make(
- sk_sp<GrTextureProxy> textureProxyPtr, GrTextureResolveFlags flags, const GrCaps& caps) {
- GrTextureProxy* textureProxy = textureProxyPtr.get();
+ sk_sp<GrTextureProxy> textureProxy, GrTextureResolveFlags flags, const GrCaps& caps) {
+ GrTextureProxy* textureProxyPtr = textureProxy.get();
sk_sp<GrTextureResolveRenderTask> resolveTask(
- new GrTextureResolveRenderTask(std::move(textureProxyPtr), flags));
+ new GrTextureResolveRenderTask(std::move(textureProxy), flags));
// Add the target as a dependency: We will read the existing contents of this texture while
// generating mipmap levels and/or resolving MSAA.
//
// NOTE: This must be called before makeClosed.
resolveTask->addDependency(
- textureProxy, GrMipMapped::kNo, GrTextureResolveManager(nullptr), caps);
- textureProxy->setLastRenderTask(resolveTask.get());
+ textureProxyPtr, GrMipMapped::kNo, GrTextureResolveManager(nullptr), caps);
+ textureProxyPtr->setLastRenderTask(resolveTask.get());
// We only resolve the texture; nobody should try to do anything else with this opList.
resolveTask->makeClosed(caps);
if (GrTextureResolveFlags::kMipMaps & flags) {
- SkASSERT(GrMipMapped::kYes == textureProxy->mipMapped());
- SkASSERT(textureProxy->mipMapsAreDirty());
- textureProxy->markMipMapsClean();
+ SkASSERT(GrMipMapped::kYes == textureProxyPtr->mipMapped());
+ SkASSERT(textureProxyPtr->mipMapsAreDirty());
+ textureProxyPtr->markMipMapsClean();
}
return resolveTask;