ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[D3D12] Reword shader storage error messages

This commit is contained in:
Triang3l 2020-04-14 13:46:18 +03:00
parent aa1c69d7b6
commit 630a538af3
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/xenia/gpu/d3d12/pipeline_cache.cc
View File

@ -204,8 +204,10 @@ void PipelineCache::InitializeShaderStorage(
auto shader_storage_shareable_root = shader_storage_root / "shareable"; auto shader_storage_shareable_root = shader_storage_root / "shareable";
if (!std::filesystem::exists(shader_storage_shareable_root)) { if (!std::filesystem::exists(shader_storage_shareable_root)) {
if (!std::filesystem::create_directories(shader_storage_shareable_root)) { if (!std::filesystem::create_directories(shader_storage_shareable_root)) {
XELOGE("Failed to create shareable shader storage directory: {}", XELOGE(
xe::path_to_utf8(shader_storage_shareable_root)); "Failed to create the shareable shader storage directory, persistent "
"shader storage will be disabled: {}",
xe::path_to_utf8(shader_storage_shareable_root));
return; return;
} }
} }
@ -219,12 +221,15 @@ void PipelineCache::InitializeShaderStorage(
// Initialize the Xenos shader storage stream. // Initialize the Xenos shader storage stream.
uint64_t shader_storage_initialization_start = uint64_t shader_storage_initialization_start =
xe::Clock::QueryHostTickCount(); xe::Clock::QueryHostTickCount();
auto shader_storage_path = auto shader_storage_file_path =
shader_storage_shareable_root / fmt::format("{:08X}.xsh", title_id); shader_storage_shareable_root / fmt::format("{:08X}.xsh", title_id);
shader_storage_file_ = xe::filesystem::OpenFile(shader_storage_path, "a+b"); shader_storage_file_ =
xe::filesystem::OpenFile(shader_storage_file_path, "a+b");
if (!shader_storage_file_) { if (!shader_storage_file_) {
XELOGE("Failed to create shareable shader: {}", XELOGE(
xe::path_to_utf8(shader_storage_path)); "Failed to open the guest shader storage file for writing, persistent "
"shader storage will be disabled: {}",
xe::path_to_utf8(shader_storage_file_path));
return; return;
} }
shader_storage_file_flush_needed_ = false; shader_storage_file_flush_needed_ = false;
@ -393,12 +398,17 @@ void PipelineCache::InitializeShaderStorage(
// Initialize the pipeline state storage stream. // Initialize the pipeline state storage stream.
uint64_t pipeline_state_storage_initialization_start_ = uint64_t pipeline_state_storage_initialization_start_ =
xe::Clock::QueryHostTickCount(); xe::Clock::QueryHostTickCount();
auto pipeline_state_storage_file_path =
shader_storage_shareable_root /
fmt::format("{:08X}.{}.d3d12.xpso", title_id,
edram_rov_used_ ? "rov" : "rtv");
pipeline_state_storage_file_ = pipeline_state_storage_file_ =
xe::filesystem::OpenFile(shader_storage_shareable_root / xe::filesystem::OpenFile(pipeline_state_storage_file_path, "a+b");
fmt::format("{:08X}.{}.d3d12.xpso", title_id,
edram_rov_used_ ? "rov" : "rtv"),
"a+b");
if (!pipeline_state_storage_file_) { if (!pipeline_state_storage_file_) {
XELOGE(
"Failed to open the Direct3D 12 pipeline state description storage "
"file for writing, persistent shader storage will be disabled: {}",
xe::path_to_utf8(pipeline_state_storage_file_path));
fclose(shader_storage_file_); fclose(shader_storage_file_);
shader_storage_file_ = nullptr; shader_storage_file_ = nullptr;
return; return;