Skip to content

Commit

Permalink
Revert "Allow enabling trace annotations"
Browse files Browse the repository at this point in the history
This reverts commit f094bac.

Reason for revert: Causes timeouts on Debug bots in the BufferDataTest.NULLData

Original change's description:
> Allow enabling trace annotations
> 
> Tracing was never allowed to happen because getStatus always returned
> false. Also want to allow tracing for release builds for perf analysis.
> 
> Bug: angleproject:3176
> Change-Id: I7aa94ed9fe3d7f67fe6dd10123c9badc7fb49d82
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1475248
> Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com>
> Reviewed-by: Jamie Madill <jmadill@google.com>

TBR=ynovikov@chromium.org,geofflang@chromium.org,jmadill@google.com,courtneygo@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: angleproject:3176
Change-Id: I91d28d15a092519551811a9a07c01987c9e028e7
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1505799
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
  • Loading branch information
Kangz authored and Commit Bot committed Mar 6, 2019
1 parent 2970d2b commit 105bc9d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ config("angle_disable_pool_alloc") {
}

config("debug_annotations_config") {
if (is_debug || angle_enable_trace) {
if (is_debug) {
defines = [ "ANGLE_ENABLE_DEBUG_ANNOTATIONS" ]
}
}
Expand Down
4 changes: 0 additions & 4 deletions src/libANGLE/LoggingAnnotator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ namespace angle

bool LoggingAnnotator::getStatus()
{
#if defined(ANGLE_TRACE_ENABLED)
return true;
#else
return false;
#endif
}

void LoggingAnnotator::beginEvent(const char *eventName, const char *eventMessage)
Expand Down

0 comments on commit 105bc9d

Please sign in to comment.