rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-12 03:02:33 +02:00
Code Issues Projects Releases Wiki Activity

[dxvk] Properly log pipeline state on error

Browse Source
This commit is contained in:
Philip Rebohle 2022-07-09 13:53:20 +02:00
parent c6168179bd
commit 2832083fe5
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/dxvk/dxvk_graphics.cpp
View File

@ -591,6 +591,10 @@ namespace dxvk {
VkPipeline pipeline = this->createOptimizedPipeline(state, 0); VkPipeline pipeline = this->createOptimizedPipeline(state, 0);
instance->fastHandle.store(pipeline, std::memory_order_release); instance->fastHandle.store(pipeline, std::memory_order_release);
// Log pipeline state on error
if (!pipeline)
this->logPipelineState(LogLevel::Error, state);
} }
@ -625,6 +629,10 @@ namespace dxvk {
fastHandle = this->createOptimizedPipeline(state, 0); fastHandle = this->createOptimizedPipeline(state, 0);
} }
// Log pipeline state if requested, or on failure
if (!fastHandle && !baseHandle)
this->logPipelineState(LogLevel::Error, state);
m_stats->numGraphicsPipelines += 1; m_stats->numGraphicsPipelines += 1;
return &(*m_pipelines.emplace(state, baseHandle, fastHandle)); return &(*m_pipelines.emplace(state, baseHandle, fastHandle));
} }
@ -729,9 +737,10 @@ namespace dxvk {
info.basePipelineIndex = -1; info.basePipelineIndex = -1;
VkPipeline pipeline = VK_NULL_HANDLE; VkPipeline pipeline = VK_NULL_HANDLE;
VkResult vr = vk->vkCreateGraphicsPipelines(vk->device(), VK_NULL_HANDLE, 1, &info, nullptr, &pipeline);
if ((vk->vkCreateGraphicsPipelines(vk->device(), VK_NULL_HANDLE, 1, &info, nullptr, &pipeline))) if (vr != VK_SUCCESS)
Logger::err("DxvkGraphicsPipeline: Failed to create base pipeline"); Logger::err(str::format("DxvkGraphicsPipeline: Failed to create base pipeline: ", vr));
return pipeline; return pipeline;
} }
@ -742,11 +751,6 @@ namespace dxvk {
VkPipelineCreateFlags flags) const { VkPipelineCreateFlags flags) const {
auto vk = m_device->vkd(); auto vk = m_device->vkd();
if (Logger::logLevel() <= LogLevel::Debug) {
Logger::debug("Compiling graphics pipeline...");
this->logPipelineState(LogLevel::Debug, state);
}
// Set up dynamic states as needed // Set up dynamic states as needed
std::array<VkDynamicState, 6> dynamicStates; std::array<VkDynamicState, 6> dynamicStates;
uint32_t dynamicStateCount = 0; uint32_t dynamicStateCount = 0;
@ -837,10 +841,8 @@ namespace dxvk {
if (vr != VK_SUCCESS) { if (vr != VK_SUCCESS) {
// Ignore any error if we're trying to create a cached pipeline. If linking or // Ignore any error if we're trying to create a cached pipeline. If linking or
// compiling an optimized pipeline fail later, we'll still be printing errors. // compiling an optimized pipeline fail later, we'll still be printing errors.
if (!(flags & VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT)) { if (!(flags & VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT))
Logger::err(str::format("DxvkGraphicsPipeline: Failed to compile pipeline: ", vr)); Logger::err(str::format("DxvkGraphicsPipeline: Failed to compile pipeline: ", vr));
this->logPipelineState(LogLevel::Error, state);
}
return VK_NULL_HANDLE; return VK_NULL_HANDLE;
} }