From c27e611dd95efa255e3fff2bf9f8ea8099680b80 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Wed, 17 Jul 2024 08:55:23 -0700 Subject: [PATCH] gfxstream: guest: nuke more AEMU base stuff Things that missed the last round of deletions. Reviewed-by: Aaron Ruby Acked-by: Yonggang Luo Acked-by: Adam Jackson Part-of: --- src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp | 3 ++- src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h | 1 - .../vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp index 1a88d55feda..422d54f93cc 100644 --- a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp +++ b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp @@ -14,6 +14,7 @@ #include "VulkanStreamGuest.h" #include "util/log.h" +#include "util/perf/cpu_trace.h" namespace gfxstream { namespace vk { @@ -128,7 +129,7 @@ void VulkanStreamGuest::unsetHandleMapping() { mCurrentHandleMapping = &mDefault VulkanHandleMapping* VulkanStreamGuest::handleMapping() const { return mCurrentHandleMapping; } void VulkanStreamGuest::flush() { - AEMU_SCOPED_TRACE("VulkanStreamGuest device write"); + MESA_TRACE_SCOPE("VulkanStreamGuest device write"); mStream->flush(); } diff --git a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h index 37436bc47a6..3190a2a2d0b 100644 --- a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h +++ b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h @@ -21,7 +21,6 @@ #include "ResourceTracker.h" #include "VulkanHandleMapping.h" #include "aemu/base/BumpPool.h" -#include "aemu/base/Tracing.h" #include "aemu/base/files/Stream.h" #include "aemu/base/files/StreamSerializing.h" #include "gfxstream/guest/IOStream.h" diff --git a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl index 3b4cf324d99..8e27e9c06a6 100644 --- a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl +++ b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl @@ -55,7 +55,7 @@ if (watchdog) { memcpy(&healthMonitorAnnotation_packetContents[0], packetBeginPtr, watchdogBufSize); } -AEMU_SCOPED_TRACE("vkQueueFlush large xfer"); +MESA_TRACE_SCOPE("vkQueueFlush large xfer"); stream->flush(); stream->writeLarge(local_pData, dataSize);