From 8cf6255d5d5df23a1c2dca12cc752472c2e54af4 Mon Sep 17 00:00:00 2001
From: vlj <vljn.ovi@gmail.com>
Date: Fri, 26 Jun 2015 21:08:35 +0200
Subject: [PATCH] d3d12: Fix unneeeded vectors

---
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp | 27 ---------------------------
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.h   |  7 -------
 2 files changed, 34 deletions(-)

diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
index 37fa295a65..b40fd1bd5b 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
@@ -79,28 +79,12 @@ void D3D12GSRender::ResourceStorage::Reset()
 	m_frameFinishedFence = nullptr;
 	m_frameFinishedHandle = 0;
 
-	for (auto &tmp : m_inUseConstantsBuffers)
-		SAFE_RELEASE(std::get<2>(tmp));
-	for (auto &tmp : m_inUseVertexIndexBuffers)
-		SAFE_RELEASE(std::get<2>(tmp));
-	for (auto &tmp : m_inUseTextureUploadBuffers)
-		SAFE_RELEASE(std::get<2>(tmp));
-	for (auto &tmp : m_inUseTexture2D)
-		SAFE_RELEASE(std::get<2>(tmp));
-	m_inUseConstantsBuffers.clear();
-	m_inUseVertexIndexBuffers.clear();
-	m_inUseTextureUploadBuffers.clear();
-	m_inUseTexture2D.clear();
-
 	m_commandAllocator->Reset();
 	m_textureUploadCommandAllocator->Reset();
 	m_downloadCommandAllocator->Reset();
 	for (ID3D12GraphicsCommandList *gfxCommandList : m_inflightCommandList)
 		gfxCommandList->Release();
 	m_inflightCommandList.clear();
-	for (ID3D12Resource *vertexBuffer : m_inflightResources)
-		vertexBuffer->Release();
-	m_inflightResources.clear();
 }
 
 void D3D12GSRender::ResourceStorage::Init(ID3D12Device *device)
@@ -138,19 +122,8 @@ void D3D12GSRender::ResourceStorage::Init(ID3D12Device *device)
 void D3D12GSRender::ResourceStorage::Release()
 {
 	// NOTE: Should be released only if no command are in flight !
-	for (auto &tmp : m_inUseConstantsBuffers)
-		SAFE_RELEASE(std::get<2>(tmp));
-	for (auto &tmp : m_inUseVertexIndexBuffers)
-		SAFE_RELEASE(std::get<2>(tmp));
-	for (auto &tmp : m_inUseTextureUploadBuffers)
-		SAFE_RELEASE(std::get<2>(tmp));
-	for (auto &tmp : m_inUseTexture2D)
-		SAFE_RELEASE(std::get<2>(tmp));
-
 	m_constantsBufferDescriptorsHeap->Release();
 	m_scaleOffsetDescriptorHeap->Release();
-	for (auto &tmp : m_inflightResources)
-		tmp->Release();
 	m_textureDescriptorsHeap->Release();
 	m_samplerDescriptorHeap->Release();
 	for (auto &tmp : m_inflightCommandList)
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
index ef62bd1ade..7080399a00 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
@@ -299,13 +299,6 @@ private:
 		ID3D12CommandAllocator *m_downloadCommandAllocator;
 		std::list<ID3D12GraphicsCommandList *> m_inflightCommandList;
 
-		std::vector<ID3D12Resource *> m_inflightResources;
-
-		std::vector<std::tuple<size_t, size_t, ID3D12Resource *> > m_inUseConstantsBuffers;
-		std::vector<std::tuple<size_t, size_t, ID3D12Resource *> > m_inUseVertexIndexBuffers;
-		std::vector<std::tuple<size_t, size_t, ID3D12Resource *> > m_inUseTextureUploadBuffers;
-		std::vector<std::tuple<size_t, size_t, ID3D12Resource *> > m_inUseTexture2D;
-
 		// Constants storage
 		ID3D12DescriptorHeap *m_constantsBufferDescriptorsHeap;
 		size_t m_constantsBufferIndex;