From d7069ee098218a91f69ce4a9d3719151b235d535 Mon Sep 17 00:00:00 2001 From: Axel Date: Tue, 30 Mar 2021 10:53:03 +0200 Subject: [PATCH] Changed profiling macro fot static strings. --- LibCarla/source/carla/rpc/Server.h | 2 +- .../Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LibCarla/source/carla/rpc/Server.h b/LibCarla/source/carla/rpc/Server.h index 3cef25f79..13a849e07 100644 --- a/LibCarla/source/carla/rpc/Server.h +++ b/LibCarla/source/carla/rpc/Server.h @@ -52,7 +52,7 @@ namespace rpc { void SyncRunFor(time_duration duration) { #ifdef LIBCARLA_INCLUDED_FROM_UE4 - TRACE_CPUPROFILER_EVENT_SCOPE_TEXT(__FUNCTION__); + TRACE_CPUPROFILER_EVENT_SCOPE_STR(__FUNCTION__); #endif // LIBCARLA_INCLUDED_FROM_UE4 _sync_io_context.reset(); _sync_io_context.run_for(duration.to_chrono()); diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp index b3264a7bf..9e0e8e06b 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.cpp @@ -60,7 +60,7 @@ static void WritePixelsToBuffer_Vulkan( // NS: Extra copy here, don't know how to avoid it. { - TRACE_CPUPROFILER_EVENT_SCOPE_TEXT("Read Surface"); + TRACE_CPUPROFILER_EVENT_SCOPE_STR("Read Surface"); InRHICmdList.ReadSurfaceData( Texture, FIntRect(0, 0, Rect.X, Rect.Y), @@ -68,7 +68,7 @@ static void WritePixelsToBuffer_Vulkan( FReadSurfaceDataFlags(RCM_UNorm, CubeFace_MAX)); } { - TRACE_CPUPROFILER_EVENT_SCOPE_TEXT("Buffer Copy"); + TRACE_CPUPROFILER_EVENT_SCOPE_STR("Buffer Copy"); Buffer.copy_from(Offset, gPixels); } }