aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrTargetCommands.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2015-03-05 08:55:28 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-05 08:55:28 -0800
commitd14101e835846ae596ae46ffe4d5a6bbe6c55eff (patch)
tree42732426fca0afb1b8a4c23c8571bee54ec72ae0 /src/gpu/GrTargetCommands.cpp
parent4089ef7c982592fadeec441438c551ffb4c746be (diff)
Fix GPU trace marker bug
Without this patch the GPU trace markers can be potentially unbalanced when batching occurs. Review URL: https://codereview.chromium.org/981973002
Diffstat (limited to 'src/gpu/GrTargetCommands.cpp')
-rw-r--r--src/gpu/GrTargetCommands.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gpu/GrTargetCommands.cpp b/src/gpu/GrTargetCommands.cpp
index d326226d1f..30920f884d 100644
--- a/src/gpu/GrTargetCommands.cpp
+++ b/src/gpu/GrTargetCommands.cpp
@@ -319,6 +319,10 @@ void GrTargetCommands::flush(GrInOrderDrawBuffer* iodb) {
if (Cmd::kDrawBatch_Cmd == iter->type()) {
DrawBatch* db = reinterpret_cast<DrawBatch*>(iter.get());
fBatchTarget.flushNext(db->fBatch->numberOfDraws());
+
+ if (iter->isTraced()) {
+ gpu->removeGpuTraceMarker(&newMarker);
+ }
continue;
}