Convert DstTexture to DstProxy
The last GrTexture-based TextureSampler::reset call must be removed before the TextureSamplers can become purely GrTextureProxy-backed
Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler))
Change-Id: Ic1435177d8b5d9bd3fc38b4903c9baae8205cfb0
Reviewed-on: https://skia-review.googlesource.com/16908
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index 0fc7b7f..438a7bd 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -102,7 +102,7 @@
struct DrawOpArgs {
GrRenderTarget* fRenderTarget;
const GrAppliedClip* fAppliedClip;
- GrXferProcessor::DstTexture fDstTexture;
+ GrXferProcessor::DstProxy fDstProxy;
};
void setDrawOpArgs(DrawOpArgs* opArgs) { fOpArgs = opArgs; }
@@ -224,8 +224,8 @@
const GrAppliedClip* clip() const { return this->state()->drawOpArgs().fAppliedClip; }
- const GrXferProcessor::DstTexture& dstTexture() const {
- return this->state()->drawOpArgs().fDstTexture;
+ const GrXferProcessor::DstProxy& dstProxy() const {
+ return this->state()->drawOpArgs().fDstProxy;
}
template <typename... Args>
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 7c0338c..73ae9c6 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -44,9 +44,13 @@
fXferProcessor = args.fProcessors->refXferProcessor();
- if (args.fDstTexture.texture()) {
- fDstTexture.reset(args.fDstTexture.texture());
- fDstTextureOffset = args.fDstTexture.offset();
+ if (args.fDstProxy.proxy()) {
+ if (!args.fDstProxy.proxy()->instantiate(args.fResourceProvider)) {
+ this->markAsBad();
+ }
+
+ fDstTextureProxy.reset(args.fDstProxy.proxy());
+ fDstTextureOffset = args.fDstProxy.offset();
}
// Copy GrFragmentProcessors from GrPipelineBuilder to Pipeline, possibly removing some of the
@@ -91,7 +95,7 @@
GrFragmentProcessor::TextureAccessIter iter(proc);
while (const GrResourceIOProcessor::TextureSampler* sampler = iter.next()) {
SkASSERT(rtp->getLastOpList());
- rtp->getLastOpList()->addDependency(sampler->texture());
+ rtp->getLastOpList()->addDependency(sampler->proxy());
}
}
#endif
@@ -104,8 +108,8 @@
}
#endif
- if (fDstTexture) {
- //SkASSERT(rtp->getLastOpList());
+ if (fDstTextureProxy) {
+ SkASSERT(rtp->getLastOpList());
// MDB TODO: re-enable when TextureSamplers store texture proxies
//rtp->getLastOpList()->addDependency(fDstTexture.get());
}
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 67e137c..fa78f34 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -75,7 +75,8 @@
const GrAppliedClip* fAppliedClip = nullptr;
GrRenderTarget* fRenderTarget = nullptr;
const GrCaps* fCaps = nullptr;
- GrXferProcessor::DstTexture fDstTexture;
+ GrResourceProvider* fResourceProvider = nullptr;
+ GrXferProcessor::DstProxy fDstProxy;
};
/**
@@ -157,11 +158,11 @@
* 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* dstTexture(SkIPoint* offset = nullptr) const {
+ GrTextureProxy* dstTextureProxy(SkIPoint* offset = nullptr) const {
if (offset) {
*offset = fDstTextureOffset;
}
- return fDstTexture.get();
+ return fDstTextureProxy.get();
}
const GrFragmentProcessor& getColorFragmentProcessor(int idx) const {
@@ -215,7 +216,8 @@
bool isBad() const { return SkToBool(fFlags & kIsBad_Flag); }
GrXferBarrierType xferBarrierType(const GrCaps& caps) const {
- if (fDstTexture.get() && fDstTexture.get() == fRenderTarget.get()->asTexture()) {
+ if (fDstTextureProxy.get() &&
+ fDstTextureProxy.get()->priv().peekTexture() == fRenderTarget.get()->asTexture()) {
return kTexture_GrXferBarrierType;
}
return this->getXferProcessor().xferBarrierType(caps);
@@ -233,11 +235,11 @@
};
using RenderTarget = GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>;
- using DstTexture = GrPendingIOResource<GrTexture, kRead_GrIOType>;
+ using DstTextureProxy = GrPendingIOResource<GrTextureProxy, kRead_GrIOType>;
using PendingFragmentProcessor = GrPendingProgramElement<const GrFragmentProcessor>;
using FragmentProcessorArray = SkAutoSTArray<8, PendingFragmentProcessor>;
- DstTexture fDstTexture;
+ DstTextureProxy fDstTextureProxy;
SkIPoint fDstTextureOffset;
RenderTarget fRenderTarget;
GrScissorState fScissorState;
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 1533257..4789e3e 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -230,18 +230,6 @@
this->reset(resourceProvider, std::move(proxy), filterMode, tileXAndY, visibility);
}
-// MDB TODO: remove this!
-void GrResourceIOProcessor::TextureSampler::reset(GrTexture* texture,
- GrSamplerParams::FilterMode filterMode,
- SkShader::TileMode tileXAndY,
- GrShaderFlags visibility) {
- SkASSERT(texture);
- fTexture.set(SkRef(texture), kRead_GrIOType);
- filterMode = SkTMin(filterMode, texture->texturePriv().highestFilterMode());
- fParams.reset(tileXAndY, filterMode);
- fVisibility = visibility;
-}
-
void GrResourceIOProcessor::TextureSampler::reset(GrResourceProvider* resourceProvider,
sk_sp<GrTextureProxy> proxy,
const GrSamplerParams& params,
diff --git a/src/gpu/GrProcessor.h b/src/gpu/GrProcessor.h
index 027a34e..c1669ef 100644
--- a/src/gpu/GrProcessor.h
+++ b/src/gpu/GrProcessor.h
@@ -222,12 +222,6 @@
*/
TextureSampler();
- // MDB TODO: this is the last GrTexture-based reset call!
- void reset(GrTexture*,
- GrSamplerParams::FilterMode = GrSamplerParams::kNone_FilterMode,
- SkShader::TileMode tileXAndY = SkShader::kClamp_TileMode,
- GrShaderFlags visibility = kFragment_GrShaderFlag);
-
// MDB TODO: ultimately we shouldn't need the resource provider parameter
TextureSampler(GrResourceProvider*, sk_sp<GrTextureProxy>, const GrSamplerParams&);
explicit TextureSampler(GrResourceProvider*, sk_sp<GrTextureProxy>,
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index 41993e1..8362e11 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -198,8 +198,8 @@
const GrXferProcessor& xp = pipeline.getXferProcessor();
const GrSurfaceOrigin* originIfDstTexture = nullptr;
GrSurfaceOrigin origin;
- if (pipeline.dstTexture()) {
- origin = pipeline.dstTexture()->origin();
+ if (pipeline.dstTextureProxy()) {
+ origin = pipeline.dstTextureProxy()->origin();
originIfDstTexture = &origin;
}
xp.getGLSLProcessorKey(shaderCaps, &b, originIfDstTexture);
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 0076812..1c92d37 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -1598,15 +1598,15 @@
}
}
- GrXferProcessor::DstTexture dstTexture;
+ GrXferProcessor::DstProxy dstProxy;
if (op->xpRequiresDstTexture(*this->caps(), &appliedClip)) {
- if (!this->setupDstTexture(fRenderTargetProxy.get(), clip, op->bounds(), &dstTexture)) {
+ if (!this->setupDstProxy(this->asRenderTargetProxy(), clip, op->bounds(), &dstProxy)) {
return SK_InvalidUniqueID;
}
}
op->setClippedBounds(bounds);
- return this->getOpList()->addOp(std::move(op), this, std::move(appliedClip), dstTexture);
+ return this->getOpList()->addOp(std::move(op), this, std::move(appliedClip), dstProxy);
}
uint32_t GrRenderTargetContext::addLegacyMeshDrawOp(GrPipelineBuilder&& pipelineBuilder,
@@ -1656,9 +1656,10 @@
args.fAppliedClip = &appliedClip;
args.fRenderTarget = rt;
args.fCaps = this->caps();
+ args.fResourceProvider = fContext->resourceProvider();
if (analysis.requiresDstTexture()) {
- if (!this->setupDstTexture(fRenderTargetProxy.get(), clip, bounds, &args.fDstTexture)) {
+ if (!this->setupDstProxy(this->asRenderTargetProxy(), clip, bounds, &args.fDstProxy)) {
return SK_InvalidUniqueID;
}
}
@@ -1671,22 +1672,15 @@
return this->getOpList()->addOp(std::move(op), this);
}
-bool GrRenderTargetContext::setupDstTexture(GrRenderTargetProxy* rtProxy, const GrClip& clip,
+bool GrRenderTargetContext::setupDstProxy(GrRenderTargetProxy* rtProxy, const GrClip& clip,
const SkRect& opBounds,
- GrXferProcessor::DstTexture* dstTexture) {
+ GrXferProcessor::DstProxy* dstProxy) {
if (this->caps()->textureBarrierSupport()) {
if (GrTextureProxy* texProxy = rtProxy->asTextureProxy()) {
- // MDB TODO: remove this instantiation. Blocked on making DstTexture be proxy-based
- sk_sp<GrTexture> tex(sk_ref_sp(texProxy->instantiate(fContext->resourceProvider())));
- if (!tex) {
- SkDebugf("setupDstTexture: instantiation of src texture failed.\n");
- return false; // We have bigger problems now
- }
-
// The render target is a texture, so we can read from it directly in the shader. The XP
// will be responsible to detect this situation and request a texture barrier.
- dstTexture->setTexture(std::move(tex));
- dstTexture->setOffset(0, 0);
+ dstProxy->setProxy(sk_ref_sp(texProxy));
+ dstProxy->setOffset(0, 0);
return true;
}
}
@@ -1752,15 +1746,7 @@
return false;
}
- GrTextureProxy* copyProxy = sContext->asTextureProxy();
- // MDB TODO: remove this instantiation once DstTexture is proxy-backed
- sk_sp<GrTexture> copy(sk_ref_sp(copyProxy->instantiate(fContext->resourceProvider())));
- if (!copy) {
- SkDebugf("setupDstTexture: instantiation of copied texture failed.\n");
- return false;
- }
-
- dstTexture->setTexture(std::move(copy));
- dstTexture->setOffset(dstOffset);
+ dstProxy->setProxy(sContext->asTextureProxyRef());
+ dstProxy->setOffset(dstOffset);
return true;
}
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index a749046..2666d5c 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -458,10 +458,10 @@
// Makes a copy of the proxy if it is necessary for the draw and places the texture that should
// be used by GrXferProcessor to access the destination color in 'result'. If the return
// value is false then a texture copy could not be made.
- bool SK_WARN_UNUSED_RESULT setupDstTexture(GrRenderTargetProxy*,
- const GrClip&,
- const SkRect& opBounds,
- GrXferProcessor::DstTexture* result);
+ bool SK_WARN_UNUSED_RESULT setupDstProxy(GrRenderTargetProxy*,
+ const GrClip&,
+ const SkRect& opBounds,
+ GrXferProcessor::DstProxy* result);
GrRenderTargetOpList* getOpList();
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index fe87bde..acd79b8 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -88,7 +88,7 @@
opArgs = {
fRecordedOps[i].fRenderTarget.get(),
fRecordedOps[i].fAppliedClip,
- fRecordedOps[i].fDstTexture
+ fRecordedOps[i].fDstProxy
};
}
flushState->setDrawOpArgs(&opArgs);
@@ -167,7 +167,7 @@
GrOpFlushState::DrawOpArgs opArgs {
fRecordedOps[i].fRenderTarget.get(),
fRecordedOps[i].fAppliedClip,
- fRecordedOps[i].fDstTexture
+ fRecordedOps[i].fDstProxy
};
flushState->setDrawOpArgs(&opArgs);
@@ -273,7 +273,7 @@
bool GrRenderTargetOpList::combineIfPossible(const RecordedOp& a, GrOp* b,
const GrAppliedClip* bClip,
- const DstTexture* bDstTexture,
+ const DstProxy* bDstProxy,
const GrCaps& caps) {
if (a.fAppliedClip) {
if (!bClip) {
@@ -285,11 +285,11 @@
} else if (bClip) {
return false;
}
- if (bDstTexture) {
- if (a.fDstTexture != *bDstTexture) {
+ if (bDstProxy) {
+ if (a.fDstProxy != *bDstProxy) {
return false;
}
- } else if (a.fDstTexture.texture()) {
+ } else if (a.fDstProxy.proxy()) {
return false;
}
return a.fOp->combineIfPossible(b, caps);
@@ -298,7 +298,7 @@
GrOp* GrRenderTargetOpList::recordOp(std::unique_ptr<GrOp> op,
GrRenderTargetContext* renderTargetContext,
GrAppliedClip* clip,
- const DstTexture* dstTexture) {
+ const DstProxy* dstProxy) {
GrRenderTarget* renderTarget = renderTargetContext->accessRenderTarget();
if (!renderTarget) {
SkASSERT(false);
@@ -345,7 +345,7 @@
candidate.fOp->uniqueID());
break;
}
- if (this->combineIfPossible(candidate, op.get(), clip, dstTexture, *caps)) {
+ if (this->combineIfPossible(candidate, op.get(), clip, dstProxy, *caps)) {
GrOP_INFO("\t\tBackward: Combining with (%s, opID: %u)\n", candidate.fOp->name(),
candidate.fOp->uniqueID());
GrOP_INFO("\t\t\tBackward: Combined op info:\n");
@@ -373,7 +373,7 @@
clip = fClipAllocator.make<GrAppliedClip>(std::move(*clip));
SkDEBUGCODE(fNumClips++;)
}
- fRecordedOps.emplace_back(std::move(op), renderTarget, clip, dstTexture);
+ fRecordedOps.emplace_back(std::move(op), renderTarget, clip, dstProxy);
fRecordedOps.back().fOp->wasRecorded(this);
fLastFullClearOp = nullptr;
fLastFullClearResourceID.makeInvalid();
@@ -404,7 +404,7 @@
break;
}
if (this->combineIfPossible(fRecordedOps[i], candidate.fOp.get(),
- candidate.fAppliedClip, &candidate.fDstTexture, caps)) {
+ candidate.fAppliedClip, &candidate.fDstProxy, caps)) {
GrOP_INFO("\t\tForward: Combining with (%s, opID: %u)\n", candidate.fOp->name(),
candidate.fOp->uniqueID());
GR_AUDIT_TRAIL_OPS_RESULT_COMBINED(fAuditTrail, op, candidate.fOp.get());
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index aa8c6c6..9556bfb 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -30,7 +30,7 @@
class GrRenderTargetOpList final : public GrOpList {
private:
- using DstTexture = GrXferProcessor::DstTexture;
+ using DstProxy = GrXferProcessor::DstProxy;
public:
GrRenderTargetOpList(GrRenderTargetProxy*, GrGpu*, GrAuditTrail*);
@@ -70,9 +70,9 @@
return this->uniqueID();
}
uint32_t addOp(std::unique_ptr<GrOp> op, GrRenderTargetContext* renderTargetContext,
- GrAppliedClip&& clip, const DstTexture& dstTexture) {
+ GrAppliedClip&& clip, const DstProxy& dstProxy) {
this->recordOp(std::move(op), renderTargetContext, clip.doesClip() ? &clip : nullptr,
- &dstTexture);
+ &dstProxy);
return this->uniqueID();
}
@@ -116,31 +116,31 @@
RecordedOp(std::unique_ptr<GrOp> op,
GrRenderTarget* rt,
const GrAppliedClip* appliedClip,
- const DstTexture* dstTexture)
+ const DstProxy* dstProxy)
: fOp(std::move(op))
, fRenderTarget(rt)
, fAppliedClip(appliedClip) {
- if (dstTexture) {
- fDstTexture = *dstTexture;
+ if (dstProxy) {
+ fDstProxy = *dstProxy;
}
}
std::unique_ptr<GrOp> fOp;
// TODO: These ops will all to target the same render target and this won't be needed.
GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> fRenderTarget;
- DstTexture fDstTexture;
+ DstProxy fDstProxy;
const GrAppliedClip* fAppliedClip;
};
// If the input op is combined with an earlier op, this returns the combined op. Otherwise, it
// returns the input op.
GrOp* recordOp(std::unique_ptr<GrOp>, GrRenderTargetContext*, GrAppliedClip* = nullptr,
- const DstTexture* = nullptr);
+ const DstProxy* = nullptr);
void forwardCombine(const GrCaps&);
// If this returns true then b has been merged into a's op.
bool combineIfPossible(const RecordedOp& a, GrOp* b, const GrAppliedClip* bClip,
- const DstTexture* bDstTexture, const GrCaps&);
+ const DstProxy* bDstTexture, const GrCaps&);
GrClearOp* fLastFullClearOp = nullptr;
GrGpuResource::UniqueID fLastFullClearResourceID = GrGpuResource::UniqueID::InvalidID();
diff --git a/src/gpu/GrXferProcessor.h b/src/gpu/GrXferProcessor.h
index a739c8b..a848a96 100644
--- a/src/gpu/GrXferProcessor.h
+++ b/src/gpu/GrXferProcessor.h
@@ -55,45 +55,55 @@
* to the space of the texture. Depending on GPU capabilities a DstTexture may be used by a
* GrXferProcessor for blending in the fragment shader.
*/
- class DstTexture {
+ class DstProxy {
public:
- DstTexture() { fOffset.set(0, 0); }
+ DstProxy() { fOffset.set(0, 0); }
- DstTexture(const DstTexture& other) {
+ DstProxy(const DstProxy& other) {
*this = other;
}
- DstTexture(GrTexture* texture, const SkIPoint& offset)
- : fTexture(SkSafeRef(texture)), fOffset(texture ? offset : SkIPoint{0, 0}) {}
+ DstProxy(sk_sp<GrTextureProxy> proxy, const SkIPoint& offset)
+ : fProxy(std::move(proxy)) {
+ if (fProxy) {
+ fOffset = offset;
+ } else {
+ fOffset.set(0, 0);
+ }
+ }
- DstTexture& operator=(const DstTexture& other) {
- fTexture = other.fTexture;
+ DstProxy& operator=(const DstProxy& other) {
+ fProxy = other.fProxy;
fOffset = other.fOffset;
return *this;
}
- bool operator==(const DstTexture& that) const {
- return fTexture == that.fTexture && fOffset == that.fOffset;
+ bool operator==(const DstProxy& that) const {
+ return fProxy == that.fProxy && fOffset == that.fOffset;
}
- bool operator!=(const DstTexture& that) const { return !(*this == that); }
+ bool operator!=(const DstProxy& that) const { return !(*this == that); }
const SkIPoint& offset() const { return fOffset; }
void setOffset(const SkIPoint& offset) { fOffset = offset; }
void setOffset(int ox, int oy) { fOffset.set(ox, oy); }
- GrTexture* texture() const { return fTexture.get(); }
+ GrTextureProxy* proxy() const { return fProxy.get(); }
- void setTexture(sk_sp<GrTexture> texture) {
- fTexture = std::move(texture);
- if (!fTexture) {
+ void setProxy(sk_sp<GrTextureProxy> proxy) {
+ fProxy = std::move(proxy);
+ if (!fProxy) {
fOffset = {0, 0};
}
}
+ bool instantiate(GrResourceProvider* resourceProvider) {
+ return SkToBool(fProxy->instantiate(resourceProvider));
+ }
+
private:
- sk_sp<GrTexture> fTexture;
- SkIPoint fOffset;
+ sk_sp<GrTextureProxy> fProxy;
+ SkIPoint fOffset;
};
/**
@@ -234,7 +244,7 @@
#endif
class GrXPFactory {
public:
- typedef GrXferProcessor::DstTexture DstTexture;
+ typedef GrXferProcessor::DstProxy DstProxy;
enum class AnalysisProperties : unsigned {
kNone = 0x0,
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index ec08bf4..8277d6e 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -92,7 +92,12 @@
const GrXferProcessor& xp = pipeline.getXferProcessor();
SkIPoint offset;
- GrTexture* dstTexture = pipeline.dstTexture(&offset);
+ GrTextureProxy* dstProxy = pipeline.dstTextureProxy(&offset);
+ GrTexture* dstTexture = nullptr;
+ if (dstProxy) {
+ dstTexture = dstProxy->priv().peekTexture();
+ }
+
fXferProcessor->setData(fProgramDataManager, xp, dstTexture, offset);
if (dstTexture) {
fGpu->bindTexture(nextTexSamplerIdx++, GrSamplerParams::ClampNoFilter(), true,
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
index 96b3359..2a89512 100644
--- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
@@ -237,7 +237,10 @@
SamplerHandle dstTextureSamplerHandle;
GrSurfaceOrigin dstTextureOrigin = kTopLeft_GrSurfaceOrigin;
- if (GrTexture* dstTexture = fPipeline.dstTexture()) {
+
+ if (GrTextureProxy* dstTextureProxy = fPipeline.dstTextureProxy()) {
+ GrTexture* dstTexture = dstTextureProxy->priv().peekTexture();
+
// GrProcessor::TextureSampler sampler(dstTexture);
SkString name("DstTextureSampler");
dstTextureSamplerHandle =
diff --git a/src/gpu/instanced/InstancedOp.cpp b/src/gpu/instanced/InstancedOp.cpp
index 83a10da..f0f1cc0 100644
--- a/src/gpu/instanced/InstancedOp.cpp
+++ b/src/gpu/instanced/InstancedOp.cpp
@@ -229,6 +229,7 @@
GrPipeline::InitArgs args;
args.fAppliedClip = state->drawOpArgs().fAppliedClip;
args.fCaps = &state->caps();
+ args.fResourceProvider = state->resourceProvider();
args.fProcessors = &fProcessors;
args.fFlags = GrAATypeIsHW(fInfo.aaType()) ? GrPipeline::kHWAntialias_Flag : 0;
if (fAllowsSRGBInputs) {
@@ -238,7 +239,7 @@
args.fFlags |= GrPipeline::kDisableOutputConversionToSRGB_Flag;
}
args.fRenderTarget = state->drawOpArgs().fRenderTarget;
- args.fDstTexture = state->drawOpArgs().fDstTexture;
+ args.fDstProxy = state->drawOpArgs().fDstProxy;
pipeline.init(args);
if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*state->gpu()->caps())) {
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index ccb12bf..c33af39 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -48,7 +48,8 @@
args.fAppliedClip = state.drawOpArgs().fAppliedClip;
args.fRenderTarget = state.drawOpArgs().fRenderTarget;
args.fCaps = &state.caps();
- args.fDstTexture = state.drawOpArgs().fDstTexture;
+ args.fResourceProvider = state.resourceProvider();
+ args.fDstProxy = state.drawOpArgs().fDstProxy;
return pipeline->init(args);
}
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index 427543b..c230257 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -137,8 +137,9 @@
args.fProcessors = &this->processors();
args.fRenderTarget = target->renderTarget();
args.fAppliedClip = target->clip();
- args.fDstTexture = target->dstTexture();
+ args.fDstProxy = target->dstProxy();
args.fCaps = &target->caps();
+ args.fResourceProvider = target->resourceProvider();
return args;
}
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
index 124802d..b3aa7c0 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
@@ -533,7 +533,8 @@
while (const GrFragmentProcessor* fp = iter.next()) {
prepare_sampled_images(*fp, fGpu);
}
- if (GrVkTexture* dstTexture = static_cast<GrVkTexture*>(pipeline.dstTexture())) {
+ if (GrTextureProxy* dstTextureProxy = pipeline.dstTextureProxy()) {
+ GrVkTexture* dstTexture = static_cast<GrVkTexture*>(dstTextureProxy->priv().peekTexture());
set_texture_layout(dstTexture, fGpu);
}
diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp
index c4d723f..3948fa8 100644
--- a/src/gpu/vk/GrVkPipelineState.cpp
+++ b/src/gpu/vk/GrVkPipelineState.cpp
@@ -7,6 +7,7 @@
#include "GrVkPipelineState.h"
+#include "GrContext.h"
#include "GrPipeline.h"
#include "GrTexturePriv.h"
#include "GrVkBufferView.h"
@@ -258,12 +259,17 @@
SkASSERT(!fp && !glslFP);
SkIPoint offset;
- GrTexture* dstTexture = pipeline.dstTexture(&offset);
+ GrTextureProxy* dstTextureProxy = nullptr;
+ GrTexture* dstTexture = nullptr;
+ if (dstTextureProxy = pipeline.dstTextureProxy(&offset)) {
+ dstTexture = dstTextureProxy->priv().peekTexture();
+ }
+
fXferProcessor->setData(fDataManager, pipeline.getXferProcessor(), dstTexture, offset);
GrResourceIOProcessor::TextureSampler dstTextureSampler;
- if (dstTexture) {
+ if (dstTextureProxy) {
// MDB TODO: this is the last usage of a GrTexture-based TextureSampler reset method
- dstTextureSampler.reset(dstTexture);
+ dstTextureSampler.reset(gpu->getContext()->resourceProvider(), sk_ref_sp(dstTextureProxy));
textureBindings.push_back(&dstTextureSampler);
}
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index 780573d..e43347e 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -1044,11 +1044,12 @@
kRGBA_8888_GrPixelConfig,
backendTexHandle);
- GrXferProcessor::DstTexture fakeDstTexture;
- fakeDstTexture.setTexture(
- ctx->resourceProvider()->wrapBackendTexture(backendTex, kTopLeft_GrSurfaceOrigin,
- kNone_GrBackendTextureFlag, 0,
- kBorrow_GrWrapOwnership));
+ GrXferProcessor::DstProxy fakeDstProxy;
+ {
+ sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeWrappedBackend(ctx, backendTex,
+ kTopLeft_GrSurfaceOrigin);
+ fakeDstProxy.setProxy(std::move(proxy));
+ }
static const GrProcessorAnalysisColor colorInputs[] = {
GrProcessorAnalysisColor::Opaque::kNo, GrProcessorAnalysisColor::Opaque::kYes,