Make process name available to VkDecoderContext w/o HealthMonitor
... so that the process name can still be used for VK debug
annotations.
Bug: b/165022040
Test: cvd start --gpu_mode=gfxstream_guest_angle
--gpu_capture_binary=ngfx
Change-Id: I10323d3b23799f74d1fddf104f389cd1e2c756c7
diff --git a/stream-servers/RenderThread.cpp b/stream-servers/RenderThread.cpp
index c90a382..03aac46 100644
--- a/stream-servers/RenderThread.cpp
+++ b/stream-servers/RenderThread.cpp
@@ -423,13 +423,17 @@
do {
std::unique_ptr<EventHangMetadata::HangAnnotations> renderThreadData =
std::make_unique<EventHangMetadata::HangAnnotations>();
+
const char* processName = nullptr;
+ if (tInfo.m_processName) {
+ processName = tInfo.m_processName.value().c_str();
+ }
+
auto* healthMonitor = FrameBuffer::getFB()->getHealthMonitor();
if (healthMonitor) {
- if (tInfo.m_processName) {
+ if (processName) {
renderThreadData->insert(
- {{"renderthread_guest_process", tInfo.m_processName.value()}});
- processName = tInfo.m_processName.value().c_str();
+ {{"renderthread_guest_process", processName}});
}
if (readBuf.validData() >= 4) {
renderThreadData->insert(
