From aa450b56f12163214655bdd29eebfc50dcafc442 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Tue, 26 Jan 2016 23:20:23 +0100 Subject: [PATCH] d3d12: Make some memory helper structure uncopyable/unmovable. --- rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h b/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h index 73d263ccdb..e8cb6c9dec 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.h @@ -47,6 +47,11 @@ class data_heap size_t m_put_pos; // Start of free space ComPtr m_heap; public: + data_heap() = default; + ~data_heap() = default; + data_heap(const data_heap&) = delete; + data_heap(data_heap&&) = delete; + size_t m_get_pos; // End of free space template @@ -164,6 +169,11 @@ private: std::unordered_map> > m_address_to_data; // Storage std::list > m_protected_ranges; // address, start of protected range, size of protected range public: + data_cache() = default; + ~data_cache() = default; + data_cache(const data_cache&) = delete; + data_cache(data_cache&&) = delete; + void store_and_protect_data(u64 key, u32 start, size_t size, u8 format, size_t w, size_t h, size_t d, size_t m, ComPtr data); /** @@ -195,6 +205,11 @@ public: */ struct resource_storage { + resource_storage() = default; + ~resource_storage() = default; + resource_storage(const resource_storage&) = delete; + resource_storage(resource_storage&&) = delete; + bool in_use; // False until command list has been populated at least once ComPtr frame_finished_fence; UINT64 fence_value;