Fixed GPU tracing so the categories do not get mixed.

Because of how the chromium tracing macros work, it is not possible
to use the same line for multiple tracing categories. I have moved
the GPU categories to a separate trace arg "gl_categories" instead,
and changed the trace categories back to gpu.device and gpu.service.

GroupPushMarkerEXT calls can no longer be disabled by their category.
We currently use these to trace top level GPU traces which are
constructed before the tracing categories are initialized.

There were also some other issues related to having multiple channels
in the GPU Tracer. Now functions that query the current trace take
in a channel argument as well to differentiate the channels.

R=vmiura@chromium.org
BUG=None
TEST=trybots

Review URL: https://codereview.chromium.org/813573003

Cr-Commit-Position: refs/heads/master@{#310426}

0 files changed, 0 insertions, 0 deletions