Fix trace event categories in src/gpu ("skia"->"skia.gpu")
Change-Id: I74b041d3f820d423601bd06805edec001a0d980e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225256
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 30f86da..4bcc4fb 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -509,7 +509,7 @@
auto uploader = skstd::make_unique<GrTDeferredProxyUploader<ClipMaskData>>(reducedClip);
GrTDeferredProxyUploader<ClipMaskData>* uploaderRaw = uploader.get();
auto drawAndUploadMask = [uploaderRaw, maskSpaceIBounds] {
- TRACE_EVENT0("skia", "Threaded SW Clip Mask Render");
+ TRACE_EVENT0("skia.gpu", "Threaded SW Clip Mask Render");
GrSWMaskHelper helper(uploaderRaw->getPixels());
if (helper.init(maskSpaceIBounds)) {
draw_clip_elements_to_mask_helper(helper, uploaderRaw->data().elements(),
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index 84eb13b..f45cd18 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -405,14 +405,14 @@
SkASSERT(fTarget->peekRenderTarget());
SkASSERT(this->isClosed());
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
#endif
// Loop over the ops that haven't yet been prepared.
for (const auto& chain : fOpChains) {
if (chain.head()) {
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- TRACE_EVENT0("skia", chain.head()->name());
+ TRACE_EVENT0("skia.gpu", chain.head()->name());
#endif
GrOpFlushState::OpArgs opArgs = {
chain.head(),
@@ -470,7 +470,7 @@
}
SkASSERT(fTarget->peekRenderTarget());
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
// TODO: at the very least, we want the stencil store op to always be discard (at this
// level). In Vulkan, sub-command buffers would still need to load & store the stencil buffer.
@@ -497,7 +497,7 @@
continue;
}
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
- TRACE_EVENT0("skia", chain.head()->name());
+ TRACE_EVENT0("skia.gpu", chain.head()->name());
#endif
GrOpFlushState::OpArgs opArgs {
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index b8ae251..578fd7c 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -347,7 +347,7 @@
GrTDeferredProxyUploader<SoftwarePathData>* uploaderRaw = uploader.get();
auto drawAndUploadMask = [uploaderRaw] {
- TRACE_EVENT0("skia", "Threaded SW Mask Render");
+ TRACE_EVENT0("skia.gpu", "Threaded SW Mask Render");
GrSWMaskHelper helper(uploaderRaw->getPixels());
if (helper.init(uploaderRaw->data().getMaskBounds())) {
helper.drawShape(uploaderRaw->data().getShape(),
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 571933d..1288036 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -3254,7 +3254,7 @@
}
bool GrGLGpu::createCopyProgram(GrTexture* srcTex) {
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
int progIdx = TextureToCopyProgramIdx(srcTex);
const GrShaderCaps* shaderCaps = this->caps()->shaderCaps();
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
index c7e8811..60b4b80 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -185,7 +185,7 @@
}
GrGLProgram* GrGLProgramBuilder::finalize() {
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
// verify we can get a program id
GrGLuint programID;
diff --git a/src/gpu/ops/GrFillRectOp.cpp b/src/gpu/ops/GrFillRectOp.cpp
index fe3cc65..2c17153 100644
--- a/src/gpu/ops/GrFillRectOp.cpp
+++ b/src/gpu/ops/GrFillRectOp.cpp
@@ -187,7 +187,7 @@
const GrUserStencilSettings*);
void onPrepareDraws(Target* target) override {
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
using Domain = GrQuadPerEdgeAA::Domain;
static constexpr SkRect kEmptyDomain = SkRect::MakeEmpty();
@@ -241,7 +241,7 @@
}
CombineResult onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
const auto* that = t->cast<FillRectOp>();
if ((fHelper.aaType() == GrAAType::kCoverage ||
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h
index 92a35a2..f94e041 100644
--- a/src/gpu/ops/GrOp.h
+++ b/src/gpu/ops/GrOp.h
@@ -162,7 +162,7 @@
/** Issues the op's commands to GrGpu. */
void execute(GrOpFlushState* state, const SkRect& chainBounds) {
- TRACE_EVENT0("skia", name());
+ TRACE_EVENT0("skia.gpu", name());
this->onExecute(state, chainBounds);
}
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index f46ff25..0544fc1 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -376,7 +376,7 @@
void tess(void* v, const VertexSpec& spec, const GrTextureProxy* proxy,
GrQuadBuffer<ColorDomainAndAA>::Iter* iter, int cnt) const {
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
auto origin = proxy->origin();
const auto* texture = proxy->peekTexture();
float iw, ih, h;
@@ -408,7 +408,7 @@
}
void onPrepareDraws(Target* target) override {
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
GrQuad::Type quadType = GrQuad::Type::kAxisAligned;
GrQuad::Type srcQuadType = GrQuad::Type::kAxisAligned;
Domain domain = Domain::kNo;
@@ -537,7 +537,7 @@
}
CombineResult onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
- TRACE_EVENT0("skia", TRACE_FUNC);
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
const auto* that = t->cast<TextureOp>();
if (fDomain != that->fDomain) {
// It is technically possible to combine operations across domain modes, but performance