aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrDrawingManager.cpp8
-rw-r--r--src/gpu/GrOpList.cpp9
-rw-r--r--src/gpu/GrOpList.h20
-rw-r--r--src/gpu/GrRenderTargetOpList.cpp4
-rw-r--r--src/gpu/GrRenderTargetOpList.h4
-rw-r--r--src/gpu/GrTextureOpList.cpp4
-rw-r--r--src/gpu/GrTextureOpList.h4
7 files changed, 39 insertions, 14 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 9e7372cdae..22594e7876 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -152,8 +152,8 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*,
continue; // Odd - but not a big deal
}
opList->makeClosed(*fContext->caps());
- opList->prepareOps(&fFlushState);
- if (!opList->executeOps(&fFlushState)) {
+ opList->prepare(&fFlushState);
+ if (!opList->execute(&fFlushState)) {
continue; // This is bad
}
}
@@ -174,7 +174,7 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*,
continue;
}
- fOpLists[i]->prepareOps(&fFlushState);
+ fOpLists[i]->prepare(&fFlushState);
}
// Upload all data to the GPU
@@ -185,7 +185,7 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*,
continue;
}
- if (fOpLists[i]->executeOps(&fFlushState)) {
+ if (fOpLists[i]->execute(&fFlushState)) {
flushed = true;
}
fOpLists[i]->reset();
diff --git a/src/gpu/GrOpList.cpp b/src/gpu/GrOpList.cpp
index 5a9a1bdad8..c87d520aec 100644
--- a/src/gpu/GrOpList.cpp
+++ b/src/gpu/GrOpList.cpp
@@ -54,9 +54,18 @@ void GrOpList::reset() {
}
fTarget.reset();
+ fPrepareCallbacks.reset();
fAuditTrail = nullptr;
}
+void GrOpList::prepare(GrOpFlushState* flushState) {
+ for (int i = 0; i < fPrepareCallbacks.count(); ++i) {
+ (*fPrepareCallbacks[i])(flushState);
+ }
+
+ this->onPrepare(flushState);
+}
+
// Add a GrOpList-based dependency
void GrOpList::addDependency(GrOpList* dependedOn) {
SkASSERT(!dependedOn->dependsOn(this)); // loops are bad
diff --git a/src/gpu/GrOpList.h b/src/gpu/GrOpList.h
index 00dc344a07..a9fa7bdc49 100644
--- a/src/gpu/GrOpList.h
+++ b/src/gpu/GrOpList.h
@@ -26,6 +26,12 @@ class GrTextureOpList;
struct SkIPoint;
struct SkIRect;
+class GrPrepareCallback : SkNoncopyable {
+public:
+ virtual ~GrPrepareCallback() {}
+ virtual void operator()(GrOpFlushState*) = 0;
+};
+
class GrOpList : public SkRefCnt {
public:
GrOpList(GrResourceProvider*, GrSurfaceProxy*, GrAuditTrail*);
@@ -33,8 +39,8 @@ public:
// These three methods are invoked at flush time
bool instantiate(GrResourceProvider* resourceProvider);
- virtual void prepareOps(GrOpFlushState* flushState) = 0;
- virtual bool executeOps(GrOpFlushState* flushState) = 0;
+ void prepare(GrOpFlushState* flushState);
+ bool execute(GrOpFlushState* flushState) { return this->onExecute(flushState); }
virtual bool copySurface(const GrCaps& caps,
GrSurfaceProxy* dst,
@@ -51,6 +57,10 @@ public:
virtual void reset();
+ void addPrepareCallback(std::unique_ptr<GrPrepareCallback> callback) {
+ fPrepareCallbacks.push_back(std::move(callback));
+ }
+
// TODO: in an MDB world, where the OpLists don't allocate GPU resources, it seems like
// these could go away
virtual void abandonGpuResources() = 0;
@@ -147,6 +157,9 @@ private:
}
};
+ virtual void onPrepare(GrOpFlushState* flushState) = 0;
+ virtual bool onExecute(GrOpFlushState* flushState) = 0;
+
void addDependency(GrOpList* dependedOn);
uint32_t fUniqueID;
@@ -155,6 +168,9 @@ private:
// 'this' GrOpList relies on the output of the GrOpLists in 'fDependencies'
SkTDArray<GrOpList*> fDependencies;
+ // These are used rarely, most clients never produce any
+ SkTArray<std::unique_ptr<GrPrepareCallback>> fPrepareCallbacks;
+
typedef SkRefCnt INHERITED;
};
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index 74534e42ef..ca449d30d3 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -61,7 +61,7 @@ void GrRenderTargetOpList::dump() const {
}
#endif
-void GrRenderTargetOpList::prepareOps(GrOpFlushState* flushState) {
+void GrRenderTargetOpList::onPrepare(GrOpFlushState* flushState) {
SkASSERT(fTarget.get()->priv().peekRenderTarget());
SkASSERT(this->isClosed());
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
@@ -130,7 +130,7 @@ static inline void finish_command_buffer(GrGpuCommandBuffer* buffer) {
// TODO: this is where GrOp::renderTarget is used (which is fine since it
// is at flush time). However, we need to store the RenderTargetProxy in the
// Ops and instantiate them here.
-bool GrRenderTargetOpList::executeOps(GrOpFlushState* flushState) {
+bool GrRenderTargetOpList::onExecute(GrOpFlushState* flushState) {
if (0 == fRecordedOps.count()) {
return false;
}
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index f162fcc5b0..b62cee5531 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -65,8 +65,8 @@ public:
* Together these two functions flush all queued up draws to GrCommandBuffer. The return value
* of executeOps() indicates whether any commands were actually issued to the GPU.
*/
- void prepareOps(GrOpFlushState* flushState) override;
- bool executeOps(GrOpFlushState* flushState) override;
+ void onPrepare(GrOpFlushState* flushState) override;
+ bool onExecute(GrOpFlushState* flushState) override;
uint32_t addOp(std::unique_ptr<GrOp> op, const GrCaps& caps) {
this->recordOp(std::move(op), caps, nullptr, nullptr);
diff --git a/src/gpu/GrTextureOpList.cpp b/src/gpu/GrTextureOpList.cpp
index eb2380f7be..f36cc350bb 100644
--- a/src/gpu/GrTextureOpList.cpp
+++ b/src/gpu/GrTextureOpList.cpp
@@ -45,7 +45,7 @@ void GrTextureOpList::dump() const {
#endif
-void GrTextureOpList::prepareOps(GrOpFlushState* flushState) {
+void GrTextureOpList::onPrepare(GrOpFlushState* flushState) {
SkASSERT(this->isClosed());
// Loop over the ops that haven't yet generated their geometry
@@ -57,7 +57,7 @@ void GrTextureOpList::prepareOps(GrOpFlushState* flushState) {
}
}
-bool GrTextureOpList::executeOps(GrOpFlushState* flushState) {
+bool GrTextureOpList::onExecute(GrOpFlushState* flushState) {
if (0 == fRecordedOps.count()) {
return false;
}
diff --git a/src/gpu/GrTextureOpList.h b/src/gpu/GrTextureOpList.h
index 3b57ba782f..5f1e331051 100644
--- a/src/gpu/GrTextureOpList.h
+++ b/src/gpu/GrTextureOpList.h
@@ -38,8 +38,8 @@ public:
* Together these two functions flush all queued ops to GrGpuCommandBuffer. The return value
* of executeOps() indicates whether any commands were actually issued to the GPU.
*/
- void prepareOps(GrOpFlushState* flushState) override;
- bool executeOps(GrOpFlushState* flushState) override;
+ void onPrepare(GrOpFlushState* flushState) override;
+ bool onExecute(GrOpFlushState* flushState) override;
/**
* Copies a pixel rectangle from one surface to another. This call may finalize
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 09:00:04 +0000