24a8e9e170
This reverts commitf35dfabe40
. Reason for revert: Relanding - usage of the flag has been removed from the bots in: https://skia-review.googlesource.com/c/skia/+/275688 (Remove bot to record DDL creation time) Original change's description: > Revert "Update skpbench's DDL timing" > > This reverts commit6f0124ad68
. > > Reason for revert: need to remove flag on bots first > > Original change's description: > > Update skpbench's DDL timing > > > > Chrome is seeing some extra overhead when using DDLs for rasterization. This CL updates skpbench to try to replicate their usage of DDLs (or, at least, better illustrate the overhead of using DDLs). > > > > Bug: skia:9455 > > Change-Id: I2abc7cf2d597c97d1d7a47425064c621a7ef0eb3 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275496 > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > Commit-Queue: Robert Phillips <robertphillips@google.com> > > TBR=egdaniel@google.com,robertphillips@google.com > > Change-Id: I87b8c78355b81f5f6c90b74f59f176f3cdbdfdaa > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:9455 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275681 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,robertphillips@google.com Change-Id: I18446e385edb7827fae89541a03545194fe84f6a No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:9455 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275691 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
260 lines
9.0 KiB
C++
260 lines
9.0 KiB
C++
/*
|
|
* Copyright 2018 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "tools/DDLTileHelper.h"
|
|
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkDeferredDisplayListRecorder.h"
|
|
#include "include/core/SkPicture.h"
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/core/SkSurfaceCharacterization.h"
|
|
#include "src/core/SkDeferredDisplayListPriv.h"
|
|
#include "src/core/SkTaskGroup.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/image/SkImage_Gpu.h"
|
|
#include "tools/DDLPromiseImageHelper.h"
|
|
|
|
void DDLTileHelper::TileData::init(int id,
|
|
sk_sp<SkSurface> dstSurface,
|
|
const SkSurfaceCharacterization& dstSurfaceCharacterization,
|
|
const SkIRect& clip) {
|
|
fID = id;
|
|
fDstSurface = dstSurface;
|
|
fClip = clip;
|
|
|
|
fCharacterization = dstSurfaceCharacterization.createResized(clip.width(), clip.height());
|
|
SkASSERT(fCharacterization.isValid());
|
|
}
|
|
|
|
DDLTileHelper::TileData::~TileData() {}
|
|
|
|
void DDLTileHelper::TileData::createTileSpecificSKP(SkData* compressedPictureData,
|
|
const DDLPromiseImageHelper& helper) {
|
|
SkASSERT(!fReconstitutedPicture);
|
|
|
|
// This is bending the DDLRecorder contract! The promise images in the SKP should be
|
|
// created by the same recorder used to create the matching DDL.
|
|
SkDeferredDisplayListRecorder recorder(fCharacterization);
|
|
|
|
fReconstitutedPicture = helper.reinflateSKP(&recorder, compressedPictureData, &fPromiseImages);
|
|
|
|
std::unique_ptr<SkDeferredDisplayList> ddl = recorder.detach();
|
|
if (ddl->priv().numRenderTasks()) {
|
|
// TODO: remove this once skbug.com/8424 is fixed. If the DDL resulting from the
|
|
// reinflation of the SKPs contains opsTasks that means some image subset operation
|
|
// created a draw.
|
|
fReconstitutedPicture.reset();
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::TileData::createDDL() {
|
|
SkASSERT(!fDisplayList && fReconstitutedPicture);
|
|
|
|
SkDeferredDisplayListRecorder recorder(fCharacterization);
|
|
|
|
// DDL TODO: the DDLRecorder's GrContext isn't initialized until getCanvas is called.
|
|
// Maybe set it up in the ctor?
|
|
SkCanvas* recordingCanvas = recorder.getCanvas();
|
|
|
|
// Because we cheated in createTileSpecificSKP and used the wrong DDLRecorder, the GrContext's
|
|
// stored in fReconstitutedPicture's promise images are incorrect. Patch them with the correct
|
|
// one now.
|
|
for (int i = 0; i < fPromiseImages.count(); ++i) {
|
|
GrContext* newContext = recordingCanvas->getGrContext();
|
|
|
|
if (fPromiseImages[i]->isTextureBacked()) {
|
|
SkImage_GpuBase* gpuImage = (SkImage_GpuBase*) fPromiseImages[i].get();
|
|
gpuImage->resetContext(sk_ref_sp(newContext));
|
|
}
|
|
}
|
|
|
|
recordingCanvas->clipRect(SkRect::MakeWH(fClip.width(), fClip.height()));
|
|
recordingCanvas->translate(-fClip.fLeft, -fClip.fTop);
|
|
|
|
// Note: in this use case we only render a picture to the deferred canvas
|
|
// but, more generally, clients will use arbitrary draw calls.
|
|
recordingCanvas->drawPicture(fReconstitutedPicture);
|
|
|
|
fDisplayList = recorder.detach();
|
|
}
|
|
|
|
void DDLTileHelper::TileData::precompile(GrContext* context) {
|
|
SkASSERT(fDisplayList);
|
|
|
|
SkDeferredDisplayList::ProgramIterator iter(context, fDisplayList.get());
|
|
for (; !iter.done(); iter.next()) {
|
|
iter.compile();
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::TileData::drawSKPDirectly(GrContext* context) {
|
|
SkASSERT(!fDisplayList && !fImage && fReconstitutedPicture);
|
|
|
|
sk_sp<SkSurface> tileSurface = SkSurface::MakeRenderTarget(context, fCharacterization,
|
|
SkBudgeted::kYes);
|
|
if (tileSurface) {
|
|
SkCanvas* tileCanvas = tileSurface->getCanvas();
|
|
|
|
tileCanvas->clipRect(SkRect::MakeWH(fClip.width(), fClip.height()));
|
|
tileCanvas->translate(-fClip.fLeft, -fClip.fTop);
|
|
|
|
tileCanvas->drawPicture(fReconstitutedPicture);
|
|
|
|
fImage = tileSurface->makeImageSnapshot();
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::TileData::draw(GrContext* context) {
|
|
SkASSERT(fDisplayList && !fImage);
|
|
|
|
sk_sp<SkSurface> tileSurface = SkSurface::MakeRenderTarget(context, fCharacterization,
|
|
SkBudgeted::kYes);
|
|
if (tileSurface) {
|
|
tileSurface->draw(fDisplayList.get());
|
|
|
|
fImage = tileSurface->makeImageSnapshot();
|
|
}
|
|
}
|
|
|
|
// TODO: We should create a single DDL for the composition step and just add replaying it
|
|
// as the last GPU task
|
|
void DDLTileHelper::TileData::compose() {
|
|
SkASSERT(fDstSurface && fImage);
|
|
|
|
SkCanvas* canvas = fDstSurface->getCanvas();
|
|
canvas->save();
|
|
canvas->clipRect(SkRect::Make(fClip));
|
|
canvas->drawImage(fImage, fClip.fLeft, fClip.fTop);
|
|
canvas->restore();
|
|
}
|
|
|
|
void DDLTileHelper::TileData::reset() {
|
|
// TODO: when DDLs are re-renderable we don't need to do this
|
|
fDisplayList = nullptr;
|
|
fImage = nullptr;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
DDLTileHelper::DDLTileHelper(sk_sp<SkSurface> dstSurface,
|
|
const SkSurfaceCharacterization& dstChar,
|
|
const SkIRect& viewport,
|
|
int numDivisions)
|
|
: fNumDivisions(numDivisions) {
|
|
SkASSERT(fNumDivisions > 0);
|
|
fTiles = new TileData[this->numTiles()];
|
|
|
|
int xTileSize = viewport.width()/fNumDivisions;
|
|
int yTileSize = viewport.height()/fNumDivisions;
|
|
|
|
// Create the destination tiles
|
|
for (int y = 0, yOff = 0; y < fNumDivisions; ++y, yOff += yTileSize) {
|
|
int ySize = (y < fNumDivisions-1) ? yTileSize : viewport.height()-yOff;
|
|
|
|
for (int x = 0, xOff = 0; x < fNumDivisions; ++x, xOff += xTileSize) {
|
|
int xSize = (x < fNumDivisions-1) ? xTileSize : viewport.width()-xOff;
|
|
|
|
SkIRect clip = SkIRect::MakeXYWH(xOff, yOff, xSize, ySize);
|
|
|
|
SkASSERT(viewport.contains(clip));
|
|
|
|
fTiles[y*fNumDivisions+x].init(y*fNumDivisions+x, dstSurface, dstChar, clip);
|
|
}
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::createSKPPerTile(SkData* compressedPictureData,
|
|
const DDLPromiseImageHelper& helper) {
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
fTiles[i].createTileSpecificSKP(compressedPictureData, helper);
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::createDDLsInParallel() {
|
|
#if 1
|
|
SkTaskGroup().batch(this->numTiles(), [&](int i) { fTiles[i].createDDL(); });
|
|
SkTaskGroup().wait();
|
|
#else
|
|
// Use this code path to debug w/o threads
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
fTiles[i].createDDL();
|
|
}
|
|
#endif
|
|
}
|
|
|
|
// On the gpu thread:
|
|
// precompile any programs
|
|
// replay the DDL into a surface to make the tile image
|
|
// compose the tile image into the main canvas
|
|
static void do_gpu_stuff(GrContext* context, DDLTileHelper::TileData* tile) {
|
|
|
|
// TODO: schedule program compilation as their own tasks
|
|
tile->precompile(context);
|
|
|
|
tile->draw(context);
|
|
|
|
// TODO: we should actually have a separate DDL that does
|
|
// the final composition draw
|
|
tile->compose();
|
|
}
|
|
|
|
// We expect to have more than one recording thread but just one gpu thread
|
|
void DDLTileHelper::kickOffThreadedWork(SkTaskGroup* recordingTaskGroup,
|
|
SkTaskGroup* gpuTaskGroup,
|
|
GrContext* gpuThreadContext) {
|
|
SkASSERT(recordingTaskGroup && gpuTaskGroup && gpuThreadContext);
|
|
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
TileData* tile = &fTiles[i];
|
|
|
|
// On a recording thread:
|
|
// generate the tile's DDL
|
|
// schedule gpu-thread processing of the DDL
|
|
// Note: a finer grained approach would be add a scheduling task which would evaluate
|
|
// which DDLs were ready to be rendered based on their prerequisites
|
|
recordingTaskGroup->add([tile, gpuTaskGroup, gpuThreadContext]() {
|
|
tile->createDDL();
|
|
|
|
gpuTaskGroup->add([gpuThreadContext, tile]() {
|
|
do_gpu_stuff(gpuThreadContext, tile);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::precompileAndDrawAllTiles(GrContext* context) {
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
fTiles[i].precompile(context);
|
|
fTiles[i].draw(context);
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::interleaveDDLCreationAndDraw(GrContext* context) {
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
fTiles[i].createDDL();
|
|
fTiles[i].draw(context);
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::drawAllTilesDirectly(GrContext* context) {
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
fTiles[i].drawSKPDirectly(context);
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::composeAllTiles() {
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
fTiles[i].compose();
|
|
}
|
|
}
|
|
|
|
void DDLTileHelper::resetAllTiles() {
|
|
for (int i = 0; i < this->numTiles(); ++i) {
|
|
fTiles[i].reset();
|
|
}
|
|
}
|