From 6133590903dbde02b59716c59b491ad28e89655c Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn.ovi@gmail.com>
Date: Wed, 28 Oct 2015 22:40:35 +0100
Subject: [PATCH] d3d12: Rename d3d12.h to avoid conflicts

---
 rpcs3/D3D12GSRender.vcxproj                   | 2 +-
 rpcs3/D3D12GSRender.vcxproj.filters           | 6 +++---
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.h           | 2 +-
 rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h      | 2 +-
 rpcs3/Emu/RSX/D3D12/{D3D12.h => D3D12Utils.h} | 4 ----
 5 files changed, 6 insertions(+), 10 deletions(-)
 rename rpcs3/Emu/RSX/D3D12/{D3D12.h => D3D12Utils.h} (98%)

diff --git a/rpcs3/D3D12GSRender.vcxproj b/rpcs3/D3D12GSRender.vcxproj
index 689b7500d3..33e6f48c37 100644
--- a/rpcs3/D3D12GSRender.vcxproj
+++ b/rpcs3/D3D12GSRender.vcxproj
@@ -78,7 +78,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="Emu\RSX\D3D12\D3D12.h" />
+    <ClInclude Include="Emu\RSX\D3D12\D3D12Utils.h" />
     <ClInclude Include="Emu\RSX\D3D12\D3D12Buffer.h" />
     <ClInclude Include="Emu\RSX\D3D12\D3D12CommonDecompiler.h" />
     <ClInclude Include="Emu\RSX\D3D12\D3D12FragmentProgramDecompiler.h" />
diff --git a/rpcs3/D3D12GSRender.vcxproj.filters b/rpcs3/D3D12GSRender.vcxproj.filters
index 1e3c1260be..80a9451c8e 100644
--- a/rpcs3/D3D12GSRender.vcxproj.filters
+++ b/rpcs3/D3D12GSRender.vcxproj.filters
@@ -8,9 +8,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Emu\RSX\D3D12\D3D12.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\RSX\D3D12\D3D12Buffer.h">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -41,6 +38,9 @@
     <ClInclude Include="stdafx_d3d12.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\D3D12\D3D12Utils.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Emu\RSX\D3D12\D3D12Buffer.cpp">
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
index e8dd4f6d14..800986f32a 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "D3D12.h"
+#include "D3D12Utils.h"
 #include "Utilities/rPlatform.h" // only for rImage
 #include "Utilities/File.h"
 #include "Utilities/Log.h"
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
index 721f33d9d7..26d4267fdb 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "D3D12.h"
+#include "D3D12Utils.h"
 #include "../Common/ProgramStateCache.h"
 #include "D3D12VertexProgramDecompiler.h"
 #include "D3D12FragmentProgramDecompiler.h"
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12.h b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h
similarity index 98%
rename from rpcs3/Emu/RSX/D3D12/D3D12.h
rename to rpcs3/Emu/RSX/D3D12/D3D12Utils.h
index 833f3648a0..b1c7bcc701 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h
@@ -9,8 +9,6 @@
 
 using namespace Microsoft::WRL;
 
-#define SAFE_RELEASE(x) if (x) x->Release();
-
 // From DX12 D3D11On12 Sample (MIT Licensed)
 inline void ThrowIfFailed(HRESULT hr)
 {
@@ -27,7 +25,6 @@ inline void ThrowIfFailed(HRESULT hr)
 inline
 void streamToBuffer(void* dst, void* src, size_t sizeInBytes)
 {
-#pragma omp parallel for
 	for (int i = 0; i < sizeInBytes / 16; i++)
 	{
 		const __m128i &srcPtr = _mm_loadu_si128((__m128i*) ((char*)src + i * 16));
@@ -45,7 +42,6 @@ void streamBuffer(void* dst, void* src, size_t sizeInBytes)
 	// Assume 64 bytes cache line
 	int offset = 0;
 	bool isAligned = !((size_t)src & 15);
-	#pragma omp parallel for
 	for (offset = 0; offset < sizeInBytes - 64; offset += 64)
 	{
 		char *line = (char*)src + offset;