From fe902cbb1320e1c56a83969d2c037188c797e5ba Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn.ovi@gmail.com>
Date: Fri, 16 Oct 2015 18:57:40 +0200
Subject: [PATCH] d3d12: Use provided constants to set alignments

---
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp |  2 +-
 rpcs3/Emu/RSX/D3D12/D3D12GSRender.h   | 10 +++++-----
 rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
index 0c77ddabda..50edd4756d 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
@@ -244,7 +244,7 @@ D3D12GSRender::D3D12GSRender()
 	m_rtts.Init(m_device.Get());
 
 	m_constantsData.Init(m_device.Get(), 1024 * 1024 * 64, D3D12_HEAP_TYPE_UPLOAD, D3D12_HEAP_FLAG_NONE);
-	m_vertexIndexData.Init(m_device.Get(), 1024 * 1024 * 256, D3D12_HEAP_TYPE_UPLOAD, D3D12_HEAP_FLAG_NONE);
+	m_vertexIndexData.Init(m_device.Get(), 1024 * 1024 * 384, D3D12_HEAP_TYPE_UPLOAD, D3D12_HEAP_FLAG_NONE);
 	m_textureUploadData.Init(m_device.Get(), 1024 * 1024 * 512, D3D12_HEAP_TYPE_UPLOAD, D3D12_HEAP_FLAG_NONE);
 
 	if (rpcs3::config.rsx.d3d12.overlay.value())
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
index 7827534c08..b2e216798f 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
@@ -405,13 +405,13 @@ private:
 	ResourceStorage &getNonCurrentResourceStorage();
 
 	// Constants storage
-	DataHeap<ID3D12Resource, 256> m_constantsData;
+	DataHeap<ID3D12Resource, D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT> m_constantsData;
 	// Vertex storage
-	DataHeap<ID3D12Resource, 256> m_vertexIndexData;
+	DataHeap<ID3D12Resource, D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT> m_vertexIndexData;
 	// Texture storage
-	DataHeap<ID3D12Resource, 65536> m_textureUploadData;
-	DataHeap<ID3D12Heap, 65536> m_UAVHeap;
-	DataHeap<ID3D12Heap, 65536> m_readbackResources;
+	DataHeap<ID3D12Resource, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT> m_textureUploadData;
+	DataHeap<ID3D12Heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT> m_UAVHeap;
+	DataHeap<ID3D12Heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT> m_readbackResources;
 
 	struct
 	{
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp
index 15a7936588..78b6df4c7b 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp
@@ -130,7 +130,7 @@ ComPtr<ID3D12Resource> uploadSingleTexture(
 	const rsx::texture &texture,
 	ID3D12Device *device,
 	ID3D12GraphicsCommandList *commandList,
-	DataHeap<ID3D12Resource, 65536> &textureBuffersHeap)
+	DataHeap<ID3D12Resource, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT> &textureBuffersHeap)
 {
 	ComPtr<ID3D12Resource> vramTexture;
 	size_t w = texture.width(), h = texture.height();
@@ -181,7 +181,7 @@ static
 void updateExistingTexture(
 	const rsx::texture &texture,
 	ID3D12GraphicsCommandList *commandList,
-	DataHeap<ID3D12Resource, 65536> &textureBuffersHeap,
+	DataHeap<ID3D12Resource, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT> &textureBuffersHeap,
 	ID3D12Resource *existingTexture)
 {
 	size_t w = texture.width(), h = texture.height();