[D3D12] Make tiled resource toggleable, disable debug layer by default
This commit is contained in:
parent
e0eede73b9
commit
2183a969af
|
@ -15,7 +15,7 @@
|
|||
#include "xenia/base/logging.h"
|
||||
#include "xenia/gpu/gpu_flags.h"
|
||||
|
||||
DEFINE_bool(d3d12_shader_disasm, true,
|
||||
DEFINE_bool(d3d12_shader_disasm, false,
|
||||
"Disassemble translated shaders after compilation.");
|
||||
|
||||
namespace xe {
|
||||
|
|
|
@ -46,7 +46,7 @@ bool SharedMemory::Initialize() {
|
|||
buffer_state_ = D3D12_RESOURCE_STATE_COPY_DEST;
|
||||
D3D12_RESOURCE_DESC buffer_desc;
|
||||
buffer_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
|
||||
buffer_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT;
|
||||
buffer_desc.Alignment = 0;
|
||||
buffer_desc.Width = kBufferSize;
|
||||
buffer_desc.Height = 1;
|
||||
buffer_desc.DepthOrArraySize = 1;
|
||||
|
@ -56,12 +56,24 @@ bool SharedMemory::Initialize() {
|
|||
buffer_desc.SampleDesc.Quality = 0;
|
||||
buffer_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
|
||||
buffer_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
|
||||
if (FAILED(device->CreateReservedResource(&buffer_desc, buffer_state_,
|
||||
nullptr, IID_PPV_ARGS(&buffer_)))) {
|
||||
if (FLAGS_d3d12_tiled_resources) {
|
||||
if (FAILED(device->CreateReservedResource(
|
||||
&buffer_desc, buffer_state_, nullptr, IID_PPV_ARGS(&buffer_)))) {
|
||||
XELOGE("Shared memory: Failed to create the 512 MB tiled buffer");
|
||||
Shutdown();
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
D3D12_HEAP_PROPERTIES heap_properties = {};
|
||||
heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT;
|
||||
if (FAILED(device->CreateCommittedResource(
|
||||
&heap_properties, D3D12_HEAP_FLAG_NONE, &buffer_desc, buffer_state_,
|
||||
nullptr, IID_PPV_ARGS(&buffer_)))) {
|
||||
XELOGE("Shared memory: Failed to create the 512 MB buffer");
|
||||
Shutdown();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
buffer_gpu_address_ = buffer_->GetGPUVirtualAddress();
|
||||
|
||||
std::memset(heaps_, 0, sizeof(heaps_));
|
||||
|
@ -95,12 +107,14 @@ void SharedMemory::Shutdown() {
|
|||
buffer_ = nullptr;
|
||||
}
|
||||
|
||||
if (FLAGS_d3d12_tiled_resources) {
|
||||
for (uint32_t i = 0; i < xe::countof(heaps_); ++i) {
|
||||
if (heaps_[i] != nullptr) {
|
||||
heaps_[i]->Release();
|
||||
heaps_[i] = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SharedMemory::BeginFrame() {
|
||||
|
@ -276,6 +290,7 @@ bool SharedMemory::UseRange(uint32_t start, uint32_t length) {
|
|||
// XELOGGPU("Shared memory: Range %.8X-%.8X is being used", start, last);
|
||||
|
||||
// Ensure all tile heaps are present.
|
||||
if (FLAGS_d3d12_tiled_resources) {
|
||||
uint32_t heap_first = start >> kHeapSizeLog2;
|
||||
uint32_t heap_last = last >> kHeapSizeLog2;
|
||||
for (uint32_t i = heap_first; i <= heap_last; ++i) {
|
||||
|
@ -296,7 +311,6 @@ bool SharedMemory::UseRange(uint32_t start, uint32_t length) {
|
|||
D3D12_HEAP_DESC heap_desc = {};
|
||||
heap_desc.SizeInBytes = kHeapSize;
|
||||
heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT;
|
||||
// Flags are required on resource heap tier 1!
|
||||
heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS;
|
||||
if (FAILED(device->CreateHeap(&heap_desc, IID_PPV_ARGS(&heaps_[i])))) {
|
||||
XELOGE("Shared memory: Failed to create a tile heap");
|
||||
|
@ -323,6 +337,7 @@ bool SharedMemory::UseRange(uint32_t start, uint32_t length) {
|
|||
&range_flags, &heap_range_start_offset, &range_tile_count,
|
||||
D3D12_TILE_MAPPING_FLAG_NONE);
|
||||
}
|
||||
}
|
||||
|
||||
// Mark the outdated tiles in this range as requiring upload, and also make
|
||||
// them up-to-date so textures aren't invalidated every use.
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
/**
|
||||
******************************************************************************
|
||||
* Xenia : Xbox 360 Emulator Research Project *
|
||||
******************************************************************************
|
||||
* Copyright 2018 Ben Vanik. All rights reserved. *
|
||||
* Released under the BSD license - see LICENSE in the root for more details. *
|
||||
******************************************************************************
|
||||
*/
|
||||
|
||||
#include "xenia/ui/d3d12/d3d12_api.h"
|
||||
|
||||
DEFINE_bool(d3d12_tiled_resources, true,
|
||||
"Enable tiled resources for shared memory emulation. Disabling "
|
||||
"them greatly increases video memory usage - a 512 MB buffer is "
|
||||
"created - but allows graphics debuggers that don't support tiled "
|
||||
"resources to work.");
|
|
@ -10,6 +10,8 @@
|
|||
#ifndef XENIA_UI_D3D12_D3D12_API_H_
|
||||
#define XENIA_UI_D3D12_D3D12_API_H_
|
||||
|
||||
#include <gflags/gflags.h>
|
||||
|
||||
// This must be included before D3D and DXGI for things like NOMINMAX.
|
||||
#include "xenia/base/platform_win.h"
|
||||
|
||||
|
@ -19,4 +21,6 @@
|
|||
|
||||
#define XELOGD3D XELOGI
|
||||
|
||||
DECLARE_bool(d3d12_tiled_resources);
|
||||
|
||||
#endif // XENIA_UI_D3D12_D3D12_API_H_
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "xenia/base/logging.h"
|
||||
#include "xenia/ui/d3d12/d3d12_context.h"
|
||||
|
||||
DEFINE_bool(d3d12_debug, true, "Enable Direct3D 12 and DXGI debug layer.");
|
||||
DEFINE_bool(d3d12_debug, false, "Enable Direct3D 12 and DXGI debug layer.");
|
||||
DEFINE_int32(d3d12_adapter_index, -1, "Index of the DXGI adapter to use. "
|
||||
"-1 for any physical adapter, -2 for WARP software rendering.");
|
||||
|
||||
|
@ -155,8 +155,15 @@ bool D3D12Provider::IsDeviceSupported(ID3D12Device* device) {
|
|||
sizeof(options)))) {
|
||||
return false;
|
||||
}
|
||||
// Tiled resources required for virtual memory.
|
||||
return options.TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_1;
|
||||
|
||||
// Tiled resources required for shared memory emulation without excessive
|
||||
// video memory usage.
|
||||
if (FLAGS_d3d12_tiled_resources &&
|
||||
options.TiledResourcesTier < D3D12_TILED_RESOURCES_TIER_1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::unique_ptr<GraphicsContext> D3D12Provider::CreateContext(
|
||||
|
|
Loading…
Reference in New Issue