Skip to content

rendervulkan: do not detach, and stop the pipeline compilation thread at exit #2234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oSoMoN wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rendervulkan: do not detach, and stop the pipeline compilation thread at exit #2234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/rendervulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <algorithm>
#include <array>
#include <bitset>
#include <thread>
#include <dlfcn.h>
#include "vulkan_include.h"
#include "Utils/Algorithm.h"
Expand Down Expand Up @@ -317,8 +316,7 @@ bool CVulkanDevice::BInit(VkInstance instance, VkSurfaceKHR surface)

m_bInitialized = true;

std::thread piplelineThread([this](){compileAllPipelines();});
piplelineThread.detach();
m_pipelineThread = std::jthread([this](std::stop_token st){compileAllPipelines(st);});

g_reshadeManager.init(this);

Expand Down Expand Up @@ -1183,7 +1181,7 @@ VkPipeline CVulkanDevice::compilePipeline(uint32_t layerCount, uint32_t ycbcrMas
return result;
}

void CVulkanDevice::compileAllPipelines()
void CVulkanDevice::compileAllPipelines(std::stop_token st)
{
pthread_setname_np( pthread_self(), "gamescope-shdr" );

Expand Down Expand Up @@ -1212,6 +1210,7 @@ void CVulkanDevice::compileAllPipelines()
{
std::lock_guard<std::mutex> lock(m_pipelineMutex);
PipelineInfo_t key = {info.shaderType, layerCount, ycbcrMask, blur_layers, info.compositeDebug};
if (st.stop_requested()) return;
auto result = m_pipelineMap.emplace(std::make_pair(key, newPipeline));
if (!result.second)
vk.DestroyPipeline(device(), newPipeline, nullptr);
Expand Down
4 changes: 3 additions & 1 deletion src/rendervulkan.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <bitset>
#include <mutex>
#include <optional>
#include <thread>

#include "main.hpp"

Expand Down Expand Up @@ -846,7 +847,7 @@ class CVulkanDevice
bool createShaders();
bool createScratchResources();
VkPipeline compilePipeline(uint32_t layerCount, uint32_t ycbcrMask, ShaderType type, uint32_t blur_layer_count, uint32_t composite_debug, uint32_t colorspace_mask, uint32_t output_eotf, bool itm_enable);
void compileAllPipelines();
void compileAllPipelines(std::stop_token st);

VkDevice m_device = nullptr;
VkPhysicalDevice m_physDev = nullptr;
Expand Down Expand Up @@ -900,6 +901,7 @@ class CVulkanDevice

private:
std::vector<VkExtensionProperties> m_supportedExts;
std::jthread m_pipelineThread;
};

struct TextureState
Expand Down