diff options
| -rw-r--r-- | src/gpu/ops/GrOp.h | 6 | ||||
| -rw-r--r-- | src/gpu/ops/OpsTask.cpp | 11 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkAMDMemoryAllocator.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkPipeline.cpp | 2 |
4 files changed, 7 insertions, 14 deletions
diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ops/GrOp.h index 6b3a173adc..123731ddfc 100644 --- a/src/gpu/ops/GrOp.h +++ b/src/gpu/ops/GrOp.h @@ -173,7 +173,7 @@ public: void prePrepare(GrRecordingContext* context, const GrSurfaceProxyView& dstView, GrAppliedClip* clip, const GrDstProxyView& dstProxyView, GrXferBarrierFlags renderPassXferBarriers, GrLoadOp colorLoadOp) { - TRACE_EVENT0("skia.gpu", name()); + TRACE_EVENT0_ALWAYS("skia.gpu", name()); this->onPrePrepare(context, dstView, clip, dstProxyView, renderPassXferBarriers, colorLoadOp); } @@ -183,13 +183,13 @@ public: * necessary before execute() is called. */ void prepare(GrOpFlushState* state) { - TRACE_EVENT0("skia.gpu", name()); + TRACE_EVENT0_ALWAYS("skia.gpu", name()); this->onPrepare(state); } /** Issues the op's commands to GrGpu. */ void execute(GrOpFlushState* state, const SkRect& chainBounds) { - TRACE_EVENT0("skia.gpu", name()); + TRACE_EVENT0_ALWAYS("skia.gpu", name()); this->onExecute(state, chainBounds); } diff --git a/src/gpu/ops/OpsTask.cpp b/src/gpu/ops/OpsTask.cpp index c691ceff06..a596fba52c 100644 --- a/src/gpu/ops/OpsTask.cpp +++ b/src/gpu/ops/OpsTask.cpp @@ -501,16 +501,13 @@ void OpsTask::onPrepare(GrOpFlushState* flushState) { (fClippedContentBounds.isEmpty() && fColorLoadOp != GrLoadOp::kDiscard)) { return; } - TRACE_EVENT0("skia.gpu", TRACE_FUNC); + TRACE_EVENT0_ALWAYS("skia.gpu", TRACE_FUNC); flushState->setSampledProxyArray(&fSampledProxies); GrSurfaceProxyView dstView(sk_ref_sp(this->target(0)), fTargetOrigin, fTargetSwizzle); // Loop over the ops that haven't yet been prepared. for (const auto& chain : fOpChains) { if (chain.shouldExecute()) { -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - TRACE_EVENT0("skia.gpu", chain.head()->name()); -#endif GrOpFlushState::OpArgs opArgs(chain.head(), dstView, fUsesMSAASurface, @@ -546,8 +543,7 @@ bool OpsTask::onExecute(GrOpFlushState* flushState) { if (this->isColorNoOp() || fClippedContentBounds.isEmpty()) { return false; } - - TRACE_EVENT0("skia.gpu", TRACE_FUNC); + TRACE_EVENT0_ALWAYS("skia.gpu", TRACE_FUNC); // Make sure load ops are not kClear if the GPU needs to use draws for clears SkASSERT(fColorLoadOp != GrLoadOp::kClear || @@ -636,9 +632,6 @@ bool OpsTask::onExecute(GrOpFlushState* flushState) { if (!chain.shouldExecute()) { continue; } -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - TRACE_EVENT0("skia.gpu", chain.head()->name()); -#endif GrOpFlushState::OpArgs opArgs(chain.head(), dstView, diff --git a/src/gpu/vk/GrVkAMDMemoryAllocator.cpp b/src/gpu/vk/GrVkAMDMemoryAllocator.cpp index 0885aacc12..599c8406db 100644 --- a/src/gpu/vk/GrVkAMDMemoryAllocator.cpp +++ b/src/gpu/vk/GrVkAMDMemoryAllocator.cpp @@ -104,7 +104,7 @@ GrVkAMDMemoryAllocator::~GrVkAMDMemoryAllocator() { VkResult GrVkAMDMemoryAllocator::allocateImageMemory(VkImage image, AllocationPropertyFlags flags, GrVkBackendMemory* backendMemory) { - TRACE_EVENT0("skia.gpu", TRACE_FUNC); + TRACE_EVENT0_ALWAYS("skia.gpu", TRACE_FUNC); VmaAllocationCreateInfo info; info.flags = 0; info.usage = VMA_MEMORY_USAGE_UNKNOWN; diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/vk/GrVkPipeline.cpp index 8b61563d0a..d202d2cf84 100644 --- a/src/gpu/vk/GrVkPipeline.cpp +++ b/src/gpu/vk/GrVkPipeline.cpp @@ -546,7 +546,7 @@ sk_sp<GrVkPipeline> GrVkPipeline::Make(GrVkGpu* gpu, VkPipeline vkPipeline; VkResult err; { - TRACE_EVENT0("skia.shaders", "CreateGraphicsPipeline"); + TRACE_EVENT0_ALWAYS("skia.shaders", "CreateGraphicsPipeline"); #if defined(SK_ENABLE_SCOPED_LSAN_SUPPRESSIONS) // skia:8712 __lsan::ScopedDisabler lsanDisabler; |