aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/private/GrAuditTrail.h3
-rw-r--r--src/gpu/GrAuditTrail.cpp28
-rw-r--r--tools/debugger/SkDebugCanvas.cpp11
-rw-r--r--tools/debugger/SkDebugCanvas.h3
-rw-r--r--tools/skiaserve/Request.cpp8
-rw-r--r--tools/skiaserve/Request.h5
-rw-r--r--tools/skiaserve/urlhandlers/ImgHandler.cpp9
7 files changed, 44 insertions, 23 deletions
diff --git a/include/private/GrAuditTrail.h b/include/private/GrAuditTrail.h
index f9b0091e15..4d2d99aa9a 100644
--- a/include/private/GrAuditTrail.h
+++ b/include/private/GrAuditTrail.h
@@ -119,6 +119,7 @@ public:
};
void getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientID);
+ void getBoundsByBatchListID(BatchInfo* outInfo, int batchListID);
void fullReset();
@@ -147,6 +148,8 @@ private:
};
typedef SkTArray<SkAutoTDelete<BatchNode>, true> BatchList;
+ void copyOutFromBatchList(BatchInfo* outBatchInfo, int batchListID);
+
template <typename T>
static void JsonifyTArray(SkString* json, const char* name, const T& array,
bool addComma);
diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp
index cf5c510536..752074de9c 100644
--- a/src/gpu/GrAuditTrail.cpp
+++ b/src/gpu/GrAuditTrail.cpp
@@ -71,6 +71,19 @@ void GrAuditTrail::batchingResultNew(GrBatch* batch) {
fBatchList.emplace_back(batchNode);
}
+void GrAuditTrail::copyOutFromBatchList(BatchInfo* outBatchInfo, int batchListID) {
+ SkASSERT(batchListID < fBatchList.count());
+ const BatchNode* bn = fBatchList[batchListID];
+ outBatchInfo->fBounds = bn->fBounds;
+ outBatchInfo->fRenderTargetUniqueID = bn->fRenderTargetUniqueID;
+ for (int j = 0; j < bn->fChildren.count(); j++) {
+ BatchInfo::Batch& outBatch = outBatchInfo->fBatches.push_back();
+ const Batch* currentBatch = bn->fChildren[j];
+ outBatch.fBounds = currentBatch->fBounds;
+ outBatch.fClientID = currentBatch->fClientID;
+ }
+}
+
void GrAuditTrail::getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientID) {
Batches** batchesLookup = fClientIDLookup.find(clientID);
if (batchesLookup) {
@@ -87,24 +100,19 @@ void GrAuditTrail::getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientI
if (kGrAuditTrailInvalidID == currentBatchListID ||
batch->fBatchListID != currentBatchListID) {
BatchInfo& outBatchInfo = outInfo->push_back();
- currentBatchListID = batch->fBatchListID;
// copy out all of the batches so the client can display them even if
// they have a different clientID
- const BatchNode* bn = fBatchList[currentBatchListID];
- outBatchInfo.fBounds = bn->fBounds;
- outBatchInfo.fRenderTargetUniqueID = bn->fRenderTargetUniqueID;
- for (int j = 0; j < bn->fChildren.count(); j++) {
- BatchInfo::Batch& outBatch = outBatchInfo.fBatches.push_back();
- const Batch* currentBatch = bn->fChildren[j];
- outBatch.fBounds = currentBatch->fBounds;
- outBatch.fClientID = currentBatch->fClientID;
- }
+ this->copyOutFromBatchList(&outBatchInfo, batch->fBatchListID);
}
}
}
}
+void GrAuditTrail::getBoundsByBatchListID(BatchInfo* outInfo, int batchListID) {
+ this->copyOutFromBatchList(outInfo, batchListID);
+}
+
void GrAuditTrail::fullReset() {
SkASSERT(fEnabled);
fBatchList.reset();
diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp
index dc529a4d89..a58db14d7d 100644
--- a/tools/debugger/SkDebugCanvas.cpp
+++ b/tools/debugger/SkDebugCanvas.cpp
@@ -196,7 +196,7 @@ void SkDebugCanvas::markActiveCommands(int index) {
}
-void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
+void SkDebugCanvas::drawTo(SkCanvas* canvas, int index, int m) {
SkASSERT(!fCommandVector.isEmpty());
SkASSERT(index < fCommandVector.count());
@@ -228,7 +228,7 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
#if SK_SUPPORT_GPU
GrAuditTrail* at = nullptr;
GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
- if (rt && fDrawGpuBatchBounds) {
+ if (rt && (fDrawGpuBatchBounds || m != -1)) {
GrContext* ctx = rt->getContext();
if (ctx) {
at = ctx->getAuditTrail();
@@ -344,7 +344,12 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
// get the bounding boxes to draw
GrAuditTrail::AutoEnable ae(at);
SkTArray<GrAuditTrail::BatchInfo> childrenBounds;
- at->getBoundsByClientID(&childrenBounds, index);
+ if (m == -1) {
+ at->getBoundsByClientID(&childrenBounds, index);
+ } else {
+ // the client wants us to draw the mth batch
+ at->getBoundsByBatchListID(&childrenBounds.push_back(), m);
+ }
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(1);
diff --git a/tools/debugger/SkDebugCanvas.h b/tools/debugger/SkDebugCanvas.h
index d81d471970..7379698f20 100644
--- a/tools/debugger/SkDebugCanvas.h
+++ b/tools/debugger/SkDebugCanvas.h
@@ -68,8 +68,9 @@ public:
Executes the draw calls up to the specified index.
@param canvas The canvas being drawn to
@param index The index of the final command being executed
+ @param m an optional Mth gpu batch to highlight, or -1
*/
- void drawTo(SkCanvas* canvas, int index);
+ void drawTo(SkCanvas* canvas, int index, int m = -1);
/**
Returns the most recently calculated transformation matrix
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 92e18fda51..8ffcc36f77 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -93,13 +93,13 @@ SkCanvas* Request::getCanvas() {
return target;
}
-void Request::drawToCanvas(int n) {
+void Request::drawToCanvas(int n, int m) {
SkCanvas* target = this->getCanvas();
- fDebugCanvas->drawTo(target, n);
+ fDebugCanvas->drawTo(target, n, m);
}
-SkData* Request::drawToPng(int n) {
- this->drawToCanvas(n);
+SkData* Request::drawToPng(int n, int m) {
+ this->drawToCanvas(n, m);
return writeCanvasToPng(this->getCanvas());
}
diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h
index 60a59a7b1c..0b974e7423 100644
--- a/tools/skiaserve/Request.h
+++ b/tools/skiaserve/Request.h
@@ -29,7 +29,8 @@ struct UploadContext {
struct Request {
Request(SkString rootUrl);
- SkData* drawToPng(int n);
+ // draws to skia draw op N, highlighting the Mth batch(-1 means no highlight)
+ SkData* drawToPng(int n, int m = -1);
SkCanvas* getCanvas();
SkBitmap* getBitmapFromCanvas(SkCanvas* canvas);
bool enableGPU(bool enable);
@@ -57,7 +58,7 @@ struct Request {
private:
SkData* writeCanvasToPng(SkCanvas* canvas);
- void drawToCanvas(int n);
+ void drawToCanvas(int n, int m = -1);
SkSurface* createCPUSurface();
SkSurface* createGPUSurface();
GrAuditTrail* getAuditTrail(SkCanvas*);
diff --git a/tools/skiaserve/urlhandlers/ImgHandler.cpp b/tools/skiaserve/urlhandlers/ImgHandler.cpp
index 3e390fe832..a0e58bcc4d 100644
--- a/tools/skiaserve/urlhandlers/ImgHandler.cpp
+++ b/tools/skiaserve/urlhandlers/ImgHandler.cpp
@@ -25,19 +25,22 @@ int ImgHandler::handle(Request* request, MHD_Connection* connection,
SkTArray<SkString> commands;
SkStrSplit(url, "/", &commands);
- if (!request->hasPicture() || commands.count() > 2) {
+ if (!request->hasPicture() || commands.count() > 3) {
return MHD_NO;
}
- int n;
+ int n, m = -1;
// /img or /img/N
if (commands.count() == 1) {
n = request->fDebugCanvas->getSize() - 1;
+ } else if (commands.count() == 2) {
+ sscanf(commands[1].c_str(), "%d", &n);
} else {
sscanf(commands[1].c_str(), "%d", &n);
+ sscanf(commands[2].c_str(), "%d", &m);
}
- SkAutoTUnref<SkData> data(request->drawToPng(n));
+ SkAutoTUnref<SkData> data(request->drawToPng(n, m));
return SendData(connection, data, "image/png");
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 04:21:52 +0000