AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Render batch bounds as stroke rects

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1745063002

Review URL: https://codereview.chromium.org/1745063002
This commit is contained in:
joshualitt 2016-02-29 11:15:06 -08:00 committed by Commit bot
parent 790d513262
commit 10d8fc29bc
7 changed files with 163 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/private/GrAuditTrail.h
View File

@ -125,6 +125,19 @@ public:
void setClientID(int clientID) { fClientID = clientID; }
// We could just return our internal bookkeeping struct if copying the data out becomes
// a performance issue, but until then its nice to decouple
struct BatchInfo {
SkRect fBounds;
struct Batch {
int fClientID;
SkRect fBounds;
};
SkTArray<Batch> fBatches;
};
void getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientID);
void fullReset() {
SkASSERT(fEnabled);
fBatchList.reset();

34
src/gpu/GrAuditTrail.cpp
View File

@ -40,6 +40,40 @@ void GrAuditTrail::batchingResultNew(GrBatch* batch) {
fBatchList.emplace_back(batchNode);
}
void GrAuditTrail::getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientID) {
Batches** batchesLookup = fClientIDLookup.find(clientID);
if (batchesLookup) {
// We track which batchlistID we're currently looking at. If it changes, then we
// need to push back a new batch info struct. We happen to know that batches are
// in sequential order in the batchlist, otherwise we'd have to do more bookkeeping
int currentBatchListID = kGrAuditTrailInvalidID;
for (int i = 0; i < (*batchesLookup)->count(); i++) {
const Batch* batch = (**batchesLookup)[i];
// Because we will copy out all of the batches associated with a given
// batch list id everytime the id changes, we only have to update our struct
// when the id changes.
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;
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;
}
}
}
}
}
template <typename T>
void GrAuditTrail::JsonifyTArray(SkString* json, const char* name, const T& array,
bool addComma) {

62
tools/debugger/SkDebugCanvas.cpp
View File

@ -13,6 +13,12 @@
#include "SkPaintFilterCanvas.h"
#include "SkOverdrawMode.h"
#if SK_SUPPORT_GPU
#include "GrAuditTrail.h"
#include "GrContext.h"
#include "GrRenderTarget.h"
#endif
#define SKDEBUGCANVAS_VERSION 1
#define SKDEBUGCANVAS_ATTRIBUTE_VERSION "version"
#define SKDEBUGCANVAS_ATTRIBUTE_COMMANDS "commands"
@ -68,7 +74,8 @@ SkDebugCanvas::SkDebugCanvas(int width, int height)
, fOverdrawViz(false)
, fOverrideFilterQuality(false)
, fFilterQuality(kNone_SkFilterQuality)
, fClipVizColor(SK_ColorTRANSPARENT) {
, fClipVizColor(SK_ColorTRANSPARENT)
, fDrawGpuBatchBounds(true) {
fUserMatrix.reset();
// SkPicturePlayback uses the base-class' quickReject calls to cull clipped
@ -209,16 +216,36 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
if (fPaintFilterCanvas) {
fPaintFilterCanvas->addCanvas(canvas);
canvas = fPaintFilterCanvas.get();
}
if (fMegaVizMode) {
this->markActiveCommands(index);
}
// If we have a GPU backend we can also visualize the batching information
#if SK_SUPPORT_GPU
GrAuditTrail* at = nullptr;
GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
if (rt && fDrawGpuBatchBounds) {
GrContext* ctx = rt->getContext();
if (ctx) {
at = ctx->getAuditTrail();
}
}
#endif
for (int i = 0; i <= index; i++) {
if (i == index && fFilter) {
canvas->clear(0xAAFFFFFF);
}
#if SK_SUPPORT_GPU
GrAuditTrail::AutoCollectBatches* acb = nullptr;
if (at) {
acb = new GrAuditTrail::AutoCollectBatches(at, i);
}
#endif
if (fCommandVector[i]->isVisible()) {
if (fMegaVizMode && fCommandVector[i]->active()) {
@ -232,6 +259,11 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
fCommandVector[i]->execute(canvas);
}
}
#if SK_SUPPORT_GPU
if (at && acb) {
delete acb;
}
#endif
}
if (SkColorGetA(fClipVizColor) != 0) {
@ -294,6 +326,34 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
if (fPaintFilterCanvas) {
fPaintFilterCanvas->removeAll();
}
#if SK_SUPPORT_GPU
// draw any batches if required and issue a full reset onto GrAuditTrail
if (at) {
GrAuditTrail::AutoEnable ae(at);
SkTArray<GrAuditTrail::BatchInfo> childrenBounds;
at->getBoundsByClientID(&childrenBounds, index);
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(1);
for (int i = 0; i < childrenBounds.count(); i++) {
paint.setColor(SK_ColorBLACK);
canvas->drawRect(childrenBounds[i].fBounds, paint);
for (int j = 0; j < childrenBounds[i].fBatches.count(); j++) {
const GrAuditTrail::BatchInfo::Batch& batch = childrenBounds[i].fBatches[j];
if (batch.fClientID != index) {
paint.setColor(SK_ColorBLUE);
} else {
paint.setColor(SK_ColorRED);
}
canvas->drawRect(batch.fBounds, paint);
}
}
at->fullReset();
}
#endif
}
void SkDebugCanvas::deleteDrawCommandAt(int index) {

5
tools/debugger/SkDebugCanvas.h
View File

@ -43,6 +43,10 @@ public:
void setClipVizColor(SkColor clipVizColor) { this->fClipVizColor = clipVizColor; }
SkColor getClipVizColor() const { return fClipVizColor; }
void setDrawGpuBatchBounds(bool drawGpuBatchBounds) {
fDrawGpuBatchBounds = drawGpuBatchBounds;
}
bool getAllowSimplifyClip() const { return fAllowSimplifyClip; }
void setPicture(SkPicture* picture) { fPicture = picture; }
@ -245,6 +249,7 @@ private:
bool fOverrideFilterQuality;
SkFilterQuality fFilterQuality;
SkColor fClipVizColor;
bool fDrawGpuBatchBounds;
SkAutoTUnref<SkNWayCanvas> fPaintFilterCanvas;

1
tools/skiaserve/skiaserve.cpp
View File

@ -39,6 +39,7 @@ public:
fHandlers.push_back(new DataHandler);
fHandlers.push_back(new BreakHandler);
fHandlers.push_back(new BatchesHandler);
fHandlers.push_back(new BatchBoundsHandler);
}
~UrlManager() {

38
tools/skiaserve/urlhandlers/BatchBoundsHandler.cpp Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright 2016 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "UrlHandler.h"
#include "microhttpd.h"
#include "../Request.h"
#include "../Response.h"
using namespace Response;
bool BatchBoundsHandler::canHandle(const char* method, const char* url) {
static const char* kBasePath = "/batchBounds/";
return 0 == strcmp(method, MHD_HTTP_METHOD_POST) &&
0 == strncmp(url, kBasePath, strlen(kBasePath));
}
int BatchBoundsHandler::handle(Request* request, MHD_Connection* connection,
const char* url, const char* method,
const char* upload_data, size_t* upload_data_size) {
SkTArray<SkString> commands;
SkStrSplit(url, "/", &commands);
if (!request->hasPicture() || commands.count() != 2) {
return MHD_NO;
}
int enabled;
sscanf(commands[1].c_str(), "%d", &enabled);
request->fDebugCanvas->setDrawGpuBatchBounds(enabled);
return SendOK(connection);
}

11
tools/skiaserve/urlhandlers/UrlHandler.h
View File

@ -112,6 +112,17 @@ public:
const char* upload_data, size_t* upload_data_size) override;
};
/*
* Enables drawing of batch bounds
*/
class BatchBoundsHandler : public UrlHandler {
public:
bool canHandle(const char* method, const char* url) override;
int handle(Request* request, MHD_Connection* connection,
const char* url, const char* method,
const char* upload_data, size_t* upload_data_size) override;
};
class RootHandler : public UrlHandler {
public:
bool canHandle(const char* method, const char* url) override;