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

[D3D12] Don't create RT store pipelines with ROV

This commit is contained in:
Triang3l 2019-04-11 12:05:13 +03:00
parent 88c594ca3b
commit 45cee3f871
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xenia/gpu/d3d12/render_target_cache.cc
View File

@ -232,15 +232,18 @@ bool RenderTargetCache::Initialize(const TextureCache* texture_cache) {
} }
// Create the pipelines. // Create the pipelines.
bool rov_used = command_processor_->IsROVUsedForEDRAM();
// Load and store. // Load and store.
for (uint32_t i = 0; i < uint32_t(EDRAMLoadStoreMode::kCount); ++i) { for (uint32_t i = 0; i < uint32_t(EDRAMLoadStoreMode::kCount); ++i) {
const EDRAMLoadStoreModeInfo& mode_info = edram_load_store_mode_info_[i]; const EDRAMLoadStoreModeInfo& mode_info = edram_load_store_mode_info_[i];
edram_load_pipelines_[i] = ui::d3d12::util::CreateComputePipeline( edram_load_pipelines_[i] = ui::d3d12::util::CreateComputePipeline(
device, mode_info.load_shader, mode_info.load_shader_size, device, mode_info.load_shader, mode_info.load_shader_size,
edram_load_store_root_signature_); edram_load_store_root_signature_);
edram_store_pipelines_[i] = ui::d3d12::util::CreateComputePipeline( if (!rov_used) {
device, mode_info.store_shader, mode_info.store_shader_size, edram_store_pipelines_[i] = ui::d3d12::util::CreateComputePipeline(
edram_load_store_root_signature_); device, mode_info.store_shader, mode_info.store_shader_size,
edram_load_store_root_signature_);
}
// Load shader for resolution-scaled resolves (host pixels within samples to // Load shader for resolution-scaled resolves (host pixels within samples to
// samples within host pixels) doesn't always exist for each mode - depth is // samples within host pixels) doesn't always exist for each mode - depth is
// not resolved using drawing, for example. // not resolved using drawing, for example.
@ -254,7 +257,7 @@ bool RenderTargetCache::Initialize(const TextureCache* texture_cache) {
edram_load_store_root_signature_); edram_load_store_root_signature_);
} }
if (edram_load_pipelines_[i] == nullptr || if (edram_load_pipelines_[i] == nullptr ||
edram_store_pipelines_[i] == nullptr || (!rov_used && edram_store_pipelines_[i] == nullptr) ||
(load_2x_resolve_pipeline_used && (load_2x_resolve_pipeline_used &&
edram_load_2x_resolve_pipelines_[i] == nullptr)) { edram_load_2x_resolve_pipelines_[i] == nullptr)) {
XELOGE("Failed to create the EDRAM load/store pipelines for mode %u", i); XELOGE("Failed to create the EDRAM load/store pipelines for mode %u", i);
@ -262,7 +265,9 @@ bool RenderTargetCache::Initialize(const TextureCache* texture_cache) {
return false; return false;
} }
edram_load_pipelines_[i]->SetName(mode_info.load_pipeline_name); edram_load_pipelines_[i]->SetName(mode_info.load_pipeline_name);
edram_store_pipelines_[i]->SetName(mode_info.store_pipeline_name); if (edram_store_pipelines_[i] != nullptr) {
edram_store_pipelines_[i]->SetName(mode_info.store_pipeline_name);
}
if (edram_load_2x_resolve_pipelines_[i] != nullptr) { if (edram_load_2x_resolve_pipelines_[i] != nullptr) {
edram_load_pipelines_[i]->SetName( edram_load_pipelines_[i]->SetName(
mode_info.load_2x_resolve_pipeline_name); mode_info.load_2x_resolve_pipeline_name);
@ -2429,6 +2434,10 @@ RenderTargetCache::EDRAMLoadStoreMode RenderTargetCache::GetLoadStoreMode(
} }
void RenderTargetCache::StoreRenderTargetsToEDRAM() { void RenderTargetCache::StoreRenderTargetsToEDRAM() {
if (command_processor_->IsROVUsedForEDRAM()) {
return;
}
auto command_list = command_processor_->GetDeferredCommandList(); auto command_list = command_processor_->GetDeferredCommandList();
// Extract only the render targets that need to be stored, transition them to // Extract only the render targets that need to be stored, transition them to

1
src/xenia/gpu/d3d12/render_target_cache.h
View File

@ -586,6 +586,7 @@ class RenderTargetCache {
edram_load_store_mode_info_[size_t(EDRAMLoadStoreMode::kCount)]; edram_load_store_mode_info_[size_t(EDRAMLoadStoreMode::kCount)];
ID3D12PipelineState* ID3D12PipelineState*
edram_load_pipelines_[size_t(EDRAMLoadStoreMode::kCount)] = {}; edram_load_pipelines_[size_t(EDRAMLoadStoreMode::kCount)] = {};
// Store pipelines are not created with ROV.
ID3D12PipelineState* ID3D12PipelineState*
edram_store_pipelines_[size_t(EDRAMLoadStoreMode::kCount)] = {}; edram_store_pipelines_[size_t(EDRAMLoadStoreMode::kCount)] = {};
ID3D12PipelineState* ID3D12PipelineState*