From b54adebfc7d92c61b968af55b4d631bcdabfe5ca Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn.ovi@gmail.com>
Date: Sat, 15 Aug 2015 22:44:26 +0200
Subject: [PATCH] d3d12: Do not recreate fence/event each frame.

---
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp | 33 +++++++++++++++------------
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.h   |  5 +++-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
index 244852862b..aebcfa4545 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
@@ -99,8 +99,6 @@ void D3D12GSRender::ResourceStorage::Reset()
 	m_constantsBufferIndex = 0;
 	m_currentScaleOffsetBufferIndex = 0;
 	m_currentTextureIndex = 0;
-	m_frameFinishedFence = nullptr;
-	m_frameFinishedHandle = 0;
 	m_currentSamplerIndex = 0;
 	m_samplerDescriptorHeapIndex = 0;
 
@@ -115,7 +113,6 @@ void D3D12GSRender::ResourceStorage::Reset()
 void D3D12GSRender::ResourceStorage::Init(ID3D12Device *device)
 {
 	m_RAMFramebuffer = nullptr;
-	m_frameFinishedHandle = 0;
 	// Create a global command allocator
 	device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_commandAllocator));
 	device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_textureUploadCommandAllocator));
@@ -144,6 +141,11 @@ void D3D12GSRender::ResourceStorage::Init(ID3D12Device *device)
 	textureDescriptorDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER;
 	ThrowIfFailed(device->CreateDescriptorHeap(&textureDescriptorDesc, IID_PPV_ARGS(&m_samplerDescriptorHeap[0])));
 	ThrowIfFailed(device->CreateDescriptorHeap(&textureDescriptorDesc, IID_PPV_ARGS(&m_samplerDescriptorHeap[1])));
+
+	m_frameFinishedHandle = CreateEventEx(nullptr, FALSE, FALSE, EVENT_ALL_ACCESS);
+	m_fenceValue = 0;
+	ThrowIfFailed(device->CreateFence(m_fenceValue++, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(m_frameFinishedFence.GetAddressOf())));
+	m_isUseable = true;
 }
 
 void D3D12GSRender::ResourceStorage::Release()
@@ -159,10 +161,7 @@ void D3D12GSRender::ResourceStorage::Release()
 	m_commandAllocator->Release();
 	m_textureUploadCommandAllocator->Release();
 	m_downloadCommandAllocator->Release();
-	if (m_frameFinishedHandle)
-		CloseHandle(m_frameFinishedHandle);
-	if (m_frameFinishedFence)
-		m_frameFinishedFence->Release();
+	CloseHandle(m_frameFinishedHandle);
 }
 
 
@@ -374,6 +373,10 @@ D3D12GSRender::D3D12GSRender()
 
 D3D12GSRender::~D3D12GSRender()
 {
+	while (!getCurrentResourceStorage().m_isUseable.load(std::memory_order_acquire) &&
+		!getNonCurrentResourceStorage().m_isUseable.load(std::memory_order_acquire))
+		std::this_thread::yield();
+
 	gfxHandler = [this](u32) { return false; };
 	m_constantsData.Release();
 	m_vertexIndexData.Release();
@@ -901,10 +904,9 @@ void D3D12GSRender::Flip()
 
 	ResourceStorage &storage = getNonCurrentResourceStorage();
 
-	m_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&storage.m_frameFinishedFence));
-	storage.m_frameFinishedHandle = CreateEvent(0, 0, 0, 0);
-	storage.m_frameFinishedFence->SetEventOnCompletion(1, storage.m_frameFinishedHandle);
-	m_commandQueueGraphic->Signal(storage.m_frameFinishedFence, 1);
+	storage.m_frameFinishedFence->SetEventOnCompletion(storage.m_fenceValue, storage.m_frameFinishedHandle);
+	m_commandQueueGraphic->Signal(storage.m_frameFinishedFence.Get(), storage.m_fenceValue);
+	storage.m_fenceValue++;
 
 	// Flush
 	m_texturesRTTs.clear();
@@ -922,11 +924,11 @@ void D3D12GSRender::Flip()
 	std::vector<ID3D12Resource *> textoclean = m_texToClean;
 	m_texToClean.clear();
 
+	storage.m_isUseable.store(false);
+
 	m_GC.pushWork([&, cleaningFunction, textoclean]()
 	{
-		WaitForSingleObject(storage.m_frameFinishedHandle, INFINITE);
-		CloseHandle(storage.m_frameFinishedHandle);
-		storage.m_frameFinishedFence->Release();
+		WaitForSingleObjectEx(storage.m_frameFinishedHandle, INFINITE, FALSE);
 
 		for (auto &cleanFunc : cleaningFunction)
 			cleanFunc();
@@ -937,9 +939,10 @@ void D3D12GSRender::Flip()
 
 		SAFE_RELEASE(storage.m_RAMFramebuffer);
 		storage.m_RAMFramebuffer = nullptr;
+		storage.m_isUseable.store(true, std::memory_order_release);
 	});
 
-	while (getCurrentResourceStorage().m_frameFinishedHandle)
+	while (!getCurrentResourceStorage().m_isUseable.load(std::memory_order_acquire))
 		std::this_thread::yield();
 	m_frame->Flip(nullptr);
 
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
index b81df5eac2..c5f6a58005 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
@@ -314,8 +314,11 @@ private:
 	 */
 	struct ResourceStorage
 	{
-		ID3D12Fence* m_frameFinishedFence;
+		std::atomic<int> m_isUseable;
+		ComPtr<ID3D12Fence> m_frameFinishedFence;
+		UINT64 m_fenceValue;
 		HANDLE m_frameFinishedHandle;
+
 		ID3D12CommandAllocator *m_commandAllocator;
 		ID3D12CommandAllocator *m_downloadCommandAllocator;
 		std::list<ID3D12GraphicsCommandList *> m_inflightCommandList;