aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/gpu/GrSurface.h34
-rw-r--r--include/private/GrSurfaceProxy.h1
-rw-r--r--src/gpu/GrOpList.cpp7
-rw-r--r--src/gpu/GrOpList.h5
-rw-r--r--src/gpu/GrPipeline.cpp22
-rw-r--r--src/gpu/GrPipeline.h2
-rw-r--r--src/gpu/GrRenderTarget.cpp4
-rw-r--r--src/gpu/GrRenderTargetOpList.h2
-rw-r--r--src/gpu/GrSurface.cpp17
-rw-r--r--src/gpu/GrTextureOpList.cpp5
-rw-r--r--src/gpu/GrTextureOpList.h2
11 files changed, 42 insertions, 59 deletions
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index 81bc215c01..65f1e0f690 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -14,7 +14,6 @@
#include "SkImageInfo.h"
#include "SkRect.h"
-class GrOpList;
class GrRenderTarget;
class GrSurfacePriv;
class GrTexture;
@@ -37,7 +36,8 @@ public:
SkRect getBoundsRect() const { return SkRect::MakeIWH(this->width(), this->height()); }
GrSurfaceOrigin origin() const {
- SkASSERT(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin || kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin);
+ SkASSERT(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin ||
+ kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin);
return fDesc.fOrigin;
}
@@ -55,16 +55,16 @@ public:
const GrSurfaceDesc& desc() const { return fDesc; }
/**
- * @return the texture associated with the surface, may be NULL.
+ * @return the texture associated with the surface, may be null.
*/
- virtual GrTexture* asTexture() { return NULL; }
- virtual const GrTexture* asTexture() const { return NULL; }
+ virtual GrTexture* asTexture() { return nullptr; }
+ virtual const GrTexture* asTexture() const { return nullptr; }
/**
- * @return the render target underlying this surface, may be NULL.
+ * @return the render target underlying this surface, may be null.
*/
- virtual GrRenderTarget* asRenderTarget() { return NULL; }
- virtual const GrRenderTarget* asRenderTarget() const { return NULL; }
+ virtual GrRenderTarget* asRenderTarget() { return nullptr; }
+ virtual const GrRenderTarget* asRenderTarget() const { return nullptr; }
/** Access methods that are only to be used within Skia code. */
inline GrSurfacePriv surfacePriv();
@@ -78,9 +78,6 @@ public:
fReleaseCtx = ctx;
}
- void setLastOpList(GrOpList* opList);
- GrOpList* getLastOpList() { return fLastOpList; }
-
static size_t WorstCaseSize(const GrSurfaceDesc& desc, bool useNextPow2 = false);
static size_t ComputeSize(const GrSurfaceDesc& desc, int colorSamplesPerPixel,
bool hasMIPMaps, bool useNextPow2 = false);
@@ -97,9 +94,8 @@ protected:
GrSurface(GrGpu* gpu, const GrSurfaceDesc& desc)
: INHERITED(gpu)
, fDesc(desc)
- , fReleaseProc(NULL)
- , fReleaseCtx(NULL)
- , fLastOpList(nullptr) {
+ , fReleaseProc(nullptr)
+ , fReleaseCtx(nullptr) {
}
~GrSurface() override;
@@ -112,21 +108,13 @@ private:
void invokeReleaseProc() {
if (fReleaseProc) {
fReleaseProc(fReleaseCtx);
- fReleaseProc = NULL;
+ fReleaseProc = nullptr;
}
}
ReleaseProc fReleaseProc;
ReleaseCtx fReleaseCtx;
- // The last opList that wrote to or is currently going to write to this surface
- // The opList can be closed (e.g., no render target or texture context is currently bound
- // to this renderTarget or texture).
- // This back-pointer is required so that we can add a dependancy between
- // the opList used to create the current contents of this surface
- // and the opList of a destination surface to which this one is being drawn or copied.
- GrOpList* fLastOpList;
-
typedef GrGpuResource INHERITED;
};
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h
index 8d5a0caf10..e438e66cad 100644
--- a/include/private/GrSurfaceProxy.h
+++ b/include/private/GrSurfaceProxy.h
@@ -14,6 +14,7 @@
#include "SkRect.h"
class GrCaps;
+class GrOpList;
class GrRenderTargetOpList;
class GrRenderTargetProxy;
class GrResourceProvider;
diff --git a/src/gpu/GrOpList.cpp b/src/gpu/GrOpList.cpp
index 28b972df99..91c8c7942c 100644
--- a/src/gpu/GrOpList.cpp
+++ b/src/gpu/GrOpList.cpp
@@ -6,11 +6,10 @@
*/
#include "GrOpList.h"
-
-#include "GrRenderTargetOpList.h"
-#include "GrSurface.h"
#include "GrSurfaceProxy.h"
+#include "SkAtomics.h"
+
uint32_t GrOpList::CreateUniqueID() {
static int32_t gUniqueID = SK_InvalidUniqueID;
uint32_t id;
@@ -49,7 +48,7 @@ void GrOpList::addDependency(GrOpList* dependedOn) {
}
// Convert from a GrSurface-based dependency to a GrOpList one
-void GrOpList::addDependency(GrSurface* dependedOn) {
+void GrOpList::addDependency(GrSurfaceProxy* dependedOn) {
if (dependedOn->getLastOpList()) {
// If it is still receiving dependencies, this GrOpList shouldn't be closed
SkASSERT(!this->isClosed());
diff --git a/src/gpu/GrOpList.h b/src/gpu/GrOpList.h
index 0139b6b4d3..b7dd7fa62f 100644
--- a/src/gpu/GrOpList.h
+++ b/src/gpu/GrOpList.h
@@ -16,7 +16,6 @@
class GrAuditTrail;
class GrOpFlushState;
class GrRenderTargetOpList;
-class GrSurface;
class GrSurfaceProxy;
class GrTextureOpList;
@@ -54,7 +53,7 @@ public:
/*
* Notify this GrOpList that it relies on the contents of 'dependedOn'
*/
- void addDependency(GrSurface* dependedOn);
+ void addDependency(GrSurfaceProxy* dependedOn);
/*
* Does this opList depend on 'dependedOn'?
@@ -80,6 +79,8 @@ public:
*/
SkDEBUGCODE(virtual void dump() const;)
+ SkDEBUGCODE(virtual void validateTargetsSingleRenderTarget() const = 0;)
+
protected:
GrSurfaceProxy* fTarget;
GrAuditTrail* fAuditTrail;
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 193c32020f..9e04b86e2e 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -83,22 +83,30 @@ void GrPipeline::init(const InitArgs& args) {
}
}
-static void add_dependencies_for_processor(const GrFragmentProcessor* proc, GrRenderTarget* rt) {
+// MDB TODO: re-enable when TextureSamplers store texture proxies
+#if 0
+static void add_dependencies_for_processor(const GrFragmentProcessor* proc,
+ GrRenderTargetProxy* rtp) {
GrFragmentProcessor::TextureAccessIter iter(proc);
while (const GrResourceIOProcessor::TextureSampler* sampler = iter.next()) {
- SkASSERT(rt->getLastOpList());
- rt->getLastOpList()->addDependency(sampler->texture());
+ SkASSERT(rtp->getLastOpList());
+ rtp->getLastOpList()->addDependency(sampler->texture());
}
}
+#endif
-void GrPipeline::addDependenciesTo(GrRenderTarget* rt) const {
+void GrPipeline::addDependenciesTo(GrRenderTargetProxy* rtp) const {
+ // MDB TODO: re-enable when TextureSamplers store texture proxies
+#if 0
for (int i = 0; i < fFragmentProcessors.count(); ++i) {
- add_dependencies_for_processor(fFragmentProcessors[i].get(), rt);
+ add_dependencies_for_processor(fFragmentProcessors[i].get(), rtp);
}
+#endif
if (fDstTexture) {
- SkASSERT(rt->getLastOpList());
- rt->getLastOpList()->addDependency(fDstTexture.get());
+ 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 b08b4baa1f..76e9f2e7d1 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -122,7 +122,7 @@ public:
// Make the renderTarget's GrOpList (if it exists) be dependent on any
// GrOpLists in this pipeline
- void addDependenciesTo(GrRenderTarget* rt) const;
+ void addDependenciesTo(GrRenderTargetProxy*) const;
int numColorFragmentProcessors() const { return fNumColorProcessors; }
int numCoverageFragmentProcessors() const {
diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp
index 9ea8596050..61a6f92f22 100644
--- a/src/gpu/GrRenderTarget.cpp
+++ b/src/gpu/GrRenderTarget.cpp
@@ -61,10 +61,6 @@ void GrRenderTarget::onRelease() {
void GrRenderTarget::onAbandon() {
SkSafeSetNull(fStencilAttachment);
- // The contents of this renderTarget are gone/invalid. It isn't useful to point back
- // the creating opList.
- this->setLastOpList(nullptr);
-
INHERITED::onAbandon();
}
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index 1b6f0865b0..5762e0aab5 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -110,7 +110,7 @@ public:
SkDEBUGCODE(void dump() const override;)
- SkDEBUGCODE(void validateTargetsSingleRenderTarget() const;)
+ SkDEBUGCODE(void validateTargetsSingleRenderTarget() const override;)
private:
friend class GrRenderTargetContextPriv; // for stencil clip state. TODO: this is invasive
diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 4c9e3b4c1e..1762d00689 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -15,11 +15,6 @@
#include "SkMathPriv.h"
GrSurface::~GrSurface() {
- if (fLastOpList) {
- fLastOpList->clearTarget();
- }
- SkSafeUnref(fLastOpList);
-
// check that invokeReleaseProc has been called (if needed)
SkASSERT(NULL == fReleaseProc);
}
@@ -184,15 +179,3 @@ void GrSurface::onAbandon() {
this->invokeReleaseProc();
this->INHERITED::onAbandon();
}
-
-void GrSurface::setLastOpList(GrOpList* opList) {
- if (fLastOpList) {
- // The non-MDB world never closes so we can't check this condition
-#ifdef ENABLE_MDB
- SkASSERT(fLastOpList->isClosed());
-#endif
- fLastOpList->clearTarget();
- }
-
- SkRefCnt_SafeAssign(fLastOpList, opList);
-}
diff --git a/src/gpu/GrTextureOpList.cpp b/src/gpu/GrTextureOpList.cpp
index d4becad579..175f178d5e 100644
--- a/src/gpu/GrTextureOpList.cpp
+++ b/src/gpu/GrTextureOpList.cpp
@@ -42,6 +42,11 @@ void GrTextureOpList::dump() const {
clippedBounds.fBottom);
}
}
+
+void GrTextureOpList::validateTargetsSingleRenderTarget() const {
+ SkASSERT(1 == fRecordedOps.count() || 0 == fRecordedOps.count());
+}
+
#endif
void GrTextureOpList::prepareOps(GrOpFlushState* flushState) {
diff --git a/src/gpu/GrTextureOpList.h b/src/gpu/GrTextureOpList.h
index ca5bda44f6..d42818d140 100644
--- a/src/gpu/GrTextureOpList.h
+++ b/src/gpu/GrTextureOpList.h
@@ -62,6 +62,8 @@ public:
SkDEBUGCODE(void dump() const override;)
+ SkDEBUGCODE(virtual void validateTargetsSingleRenderTarget() const override;)
+
private:
// MDB TODO: The unique IDs are only needed for the audit trail. There should only be one
// on the opList itself.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 04:16:25 +0000