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

Merge branch 'master' into vulkan

This commit is contained in:
Triang3l 2021-06-19 14:07:09 +03:00
parent 0ebb3bd90e 3a2c7894d2
commit 2c3141fc87
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/gpu/d3d12/d3d12_render_target_cache.cc
View File

@ -2131,7 +2131,7 @@ RenderTargetCache::RenderTarget* D3D12RenderTargetCache::CreateRenderTarget(
descriptor_srv.GetHandle()); descriptor_srv.GetHandle());
return new D3D12RenderTarget( return new D3D12RenderTarget(
key, *this, resource.Get(), std::move(descriptor_draw), key, resource.Get(), std::move(descriptor_draw),
std::move(descriptor_draw_srgb), std::move(descriptor_load_separate), std::move(descriptor_draw_srgb), std::move(descriptor_load_separate),
std::move(descriptor_srv), std::move(descriptor_srv_stencil), std::move(descriptor_srv), std::move(descriptor_srv_stencil),
resource_state); resource_state);

5
src/xenia/gpu/d3d12/d3d12_render_target_cache.h
View File

@ -134,8 +134,7 @@ class D3D12RenderTargetCache final : public RenderTargetCache {
// floating-point formats, and to distinguish between two -1 representations // floating-point formats, and to distinguish between two -1 representations
// in snorm formats). // in snorm formats).
D3D12RenderTarget( D3D12RenderTarget(
RenderTargetKey key, D3D12RenderTargetCache& render_target_cache, RenderTargetKey key, ID3D12Resource* resource,
ID3D12Resource* resource,
ui::d3d12::D3D12CpuDescriptorPool::Descriptor&& descriptor_draw, ui::d3d12::D3D12CpuDescriptorPool::Descriptor&& descriptor_draw,
ui::d3d12::D3D12CpuDescriptorPool::Descriptor&& descriptor_draw_srgb, ui::d3d12::D3D12CpuDescriptorPool::Descriptor&& descriptor_draw_srgb,
ui::d3d12::D3D12CpuDescriptorPool::Descriptor&& ui::d3d12::D3D12CpuDescriptorPool::Descriptor&&
@ -144,7 +143,6 @@ class D3D12RenderTargetCache final : public RenderTargetCache {
ui::d3d12::D3D12CpuDescriptorPool::Descriptor&& descriptor_srv_stencil, ui::d3d12::D3D12CpuDescriptorPool::Descriptor&& descriptor_srv_stencil,
D3D12_RESOURCE_STATES resource_state) D3D12_RESOURCE_STATES resource_state)
: RenderTarget(key), : RenderTarget(key),
render_target_cache_(render_target_cache),
resource_(resource), resource_(resource),
descriptor_draw_(std::move(descriptor_draw)), descriptor_draw_(std::move(descriptor_draw)),
descriptor_draw_srgb_(std::move(descriptor_draw_srgb)), descriptor_draw_srgb_(std::move(descriptor_draw_srgb)),
@ -199,7 +197,6 @@ class D3D12RenderTargetCache final : public RenderTargetCache {
} }
private: private:
D3D12RenderTargetCache& render_target_cache_;
Microsoft::WRL::ComPtr<ID3D12Resource> resource_; Microsoft::WRL::ComPtr<ID3D12Resource> resource_;
ui::d3d12::D3D12CpuDescriptorPool::Descriptor descriptor_draw_; ui::d3d12::D3D12CpuDescriptorPool::Descriptor descriptor_draw_;
ui::d3d12::D3D12CpuDescriptorPool::Descriptor descriptor_draw_srgb_; ui::d3d12::D3D12CpuDescriptorPool::Descriptor descriptor_draw_srgb_;