rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-13 07:08:50 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Get rid of some old debug code for compute pipelines

Browse Source
This commit is contained in:
Philip Rebohle 2022-08-08 18:58:22 +02:00
parent c392308e6f
commit 0ad7a08c49
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/dxvk/dxvk_compute.cpp
View File

@ -1,4 +1,6 @@
#include <cstring>
#include <iomanip>
#include <sstream>
#include "../util/util_time.h"
@ -101,11 +103,6 @@ namespace dxvk {
const DxvkComputePipelineStateInfo& state) const {
auto vk = m_device->vkd();
if (Logger::logLevel() <= LogLevel::Debug) {
Logger::debug("Compiling compute pipeline...");
Logger::debug(str::format(" cs : ", m_shaders.cs->debugName()));
}
DxvkPipelineSpecConstantState scState(m_shaders.cs->getSpecConstantMask(), state.sc);
DxvkShaderStageInfo stageInfo(m_device);
@ -117,26 +114,16 @@ namespace dxvk {
info.stage = *stageInfo.getStageInfos();
info.layout = m_bindings->getPipelineLayout(false);
info.basePipelineIndex = -1;
// Time pipeline compilation for debugging purposes
dxvk::high_resolution_clock::time_point t0, t1;
if (Logger::logLevel() <= LogLevel::Debug)
t0 = dxvk::high_resolution_clock::now();
VkPipeline pipeline = VK_NULL_HANDLE;
if (vk->vkCreateComputePipelines(vk->device(),
VK_NULL_HANDLE, 1, &info, nullptr, &pipeline) != VK_SUCCESS) {
Logger::err("DxvkComputePipeline: Failed to compile pipeline");
Logger::err(str::format(" cs : ", m_shaders.cs->debugName()));
VkResult vr = vk->vkCreateComputePipelines(vk->device(),
VK_NULL_HANDLE, 1, &info, nullptr, &pipeline);
if (vr != VK_SUCCESS) {
Logger::err(str::format("DxvkComputePipeline: Failed to compile pipeline: ", vr));
this->logPipelineState(LogLevel::Error, state);
return VK_NULL_HANDLE;
}
if (Logger::logLevel() <= LogLevel::Debug) {
t1 = dxvk::high_resolution_clock::now();
auto td = std::chrono::duration_cast<std::chrono::milliseconds>(t1 - t0);
Logger::debug(str::format("DxvkComputePipeline: Finished in ", td.count(), " ms"));
}
return pipeline;
}
@ -159,4 +146,27 @@ namespace dxvk {
m_stateCache->addComputePipeline(key, state);
}
void DxvkComputePipeline::logPipelineState(
LogLevel level,
const DxvkComputePipelineStateInfo& state) const {
std::stringstream sstr;
sstr << " cs : " << m_shaders.cs->debugName() << std::endl;
bool hasSpecConstants = false;
for (uint32_t i = 0; i < MaxNumSpecConstants; i++) {
if (state.sc.specConstants[i]) {
if (!hasSpecConstants) {
sstr << "Specialization constants:" << std::endl;
hasSpecConstants = true;
}
sstr << " " << i << ": 0x" << std::hex << std::setw(8) << std::setfill('0') << state.sc.specConstants[i] << std::dec << std::endl;
}
}
Logger::log(level, sstr.str());
}
}

6
src/dxvk/dxvk_compute.h
View File

@ -151,7 +151,11 @@ namespace dxvk {
void writePipelineStateToCache(
const DxvkComputePipelineStateInfo& state) const;
void logPipelineState(
LogLevel level,
const DxvkComputePipelineStateInfo& state) const;
};
}