gfxstream: guest: nuke more AEMU base stuff

Things that missed the last round of deletions.

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>

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();
 }
 

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"

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);