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

fix up batch_spew

Browse Source 
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1292113002
This commit is contained in:
joshualitt 2015-08-13 10:19:32 -07:00 committed by Commit bot
parent 9c80b5ff59
commit e516e4fa2b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/GrInOrderCommandBuilder.cpp
View File

@ -33,7 +33,7 @@ GrTargetCommands::Cmd* GrInOrderCommandBuilder::recordDrawBatch(GrBatch* batch,
DrawBatch* previous = static_cast<DrawBatch*>(&this->cmdBuffer()->back());
if (previous->batch()->combineIfPossible(batch, caps)) {
GrBATCH_INFO("\tBatching with (%s, %u)\n",
previous->fBatch->name(), previous->fBatch->uniqueID());
previous->batch()->name(), previous->batch()->uniqueID());
return NULL;
}
}

6
src/gpu/GrReorderCommandBuilder.cpp
View File

@ -55,19 +55,19 @@ GrTargetCommands::Cmd* GrReorderCommandBuilder::recordDrawBatch(GrBatch* batch,
if (previous->batch()->pipeline()->getRenderTarget() != rt) {
GrBATCH_INFO("\t\tBreaking because of (%s, B%u) Rendertarget\n",
previous->fBatch->name(), previous->fBatch->uniqueID());
previous->batch()->name(), previous->batch()->uniqueID());
break;
}
// We cannot continue to search backwards if the render target changes
if (previous->batch()->combineIfPossible(batch, caps)) {
GrBATCH_INFO("\t\tCombining with (%s, B%u)\n",
previous->fBatch->name(), previous->fBatch->uniqueID());
previous->batch()->name(), previous->batch()->uniqueID());
return NULL;
}
if (intersect(previous->batch()->bounds(), batch->bounds())) {
GrBATCH_INFO("\t\tIntersects with (%s, B%u)\n",
previous->fBatch->name(), previous->fBatch->uniqueID());
previous->batch()->name(), previous->batch()->uniqueID());
break;
}
} else if (Cmd::kClear_CmdType == reverseIter->type()) {

1
src/gpu/GrTargetCommands.h
View File

@ -241,6 +241,7 @@ private:
GrBatch* batch() { return fBatch; }
void execute(GrGpu*) override;
private:
SkAutoTUnref<GrBatch> fBatch;
GrBatchTarget* fBatchTarget;