From 8e153f84ba0322f38671b2a1a0613290337b9d70 Mon Sep 17 00:00:00 2001 From: Mary Koliadenko Date: Tue, 5 May 2026 15:43:32 +0000 Subject: [PATCH 1/3] Add KeepAlive to screenshot layer, name screenshot thread. Fixes b/482245681, b/507837577, and b/509917163. --- layersvt/CMakeLists.txt | 1 + layersvt/screenshot.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt index a58e007907..da2c37250e 100644 --- a/layersvt/CMakeLists.txt +++ b/layersvt/CMakeLists.txt @@ -116,6 +116,7 @@ if(BUILD_SCREENSHOT) vk_layer_table.cpp vk_layer_table.h screenshot_layer.md + layer_keep_alive.cpp json/VkLayer_screenshot.json.in ) endif() diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp index 6b70f1b1b4..06fc54e96c 100644 --- a/layersvt/screenshot.cpp +++ b/layersvt/screenshot.cpp @@ -47,6 +47,11 @@ #include #endif +#if defined(__ANDROID__) || defined(__linux__) +#include +#include +#endif + #ifdef ANDROID #include #include @@ -1660,6 +1665,12 @@ VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainImagesKHR(VkDevice device, VkSwapchai } void screenshotWriterThreadFunc() { +#if defined(__ANDROID__) || defined(__linux__) + char buf[16] = {}; + strncpy(buf, "vk_creenshots", 15); + pthread_setname_np(pthread_self(), buf); +#endif + if (!std::atomic_load(&pauseCapture)) { screenshotWriter->setInProgress(); } From cbb4d243aa9f797ade36bc3723ce2fe81493decb Mon Sep 17 00:00:00 2001 From: Mary Koliadenko Date: Tue, 5 May 2026 20:41:57 +0000 Subject: [PATCH 2/3] Fix thread naming. --- layersvt/screenshot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp index 06fc54e96c..fa4c9e86b2 100644 --- a/layersvt/screenshot.cpp +++ b/layersvt/screenshot.cpp @@ -1667,7 +1667,7 @@ VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainImagesKHR(VkDevice device, VkSwapchai void screenshotWriterThreadFunc() { #if defined(__ANDROID__) || defined(__linux__) char buf[16] = {}; - strncpy(buf, "vk_creenshots", 15); + strncpy(buf, "Vulkan screenshots", 18); pthread_setname_np(pthread_self(), buf); #endif From 44cedea651d5dae3ed815416dea8fad173d6c514 Mon Sep 17 00:00:00 2001 From: Mary Koliadenko Date: Tue, 5 May 2026 20:59:59 +0000 Subject: [PATCH 3/3] Fix buffer mismatch CI failure. --- layersvt/screenshot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp index fa4c9e86b2..0182681253 100644 --- a/layersvt/screenshot.cpp +++ b/layersvt/screenshot.cpp @@ -1667,7 +1667,7 @@ VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainImagesKHR(VkDevice device, VkSwapchai void screenshotWriterThreadFunc() { #if defined(__ANDROID__) || defined(__linux__) char buf[16] = {}; - strncpy(buf, "Vulkan screenshots", 18); + snprintf(buf, sizeof(buf), "VkScreenshot"); pthread_setname_np(pthread_self(), buf); #endif