Added support test for bbox and some naming corrections

1 files changed, 21 insertions, 18 deletions

diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.cpp b/Source/Core/VideoBackends/D3D/BoundingBox.cpp
index 727d5a9fac..0bb55acab9 100644
--- a/Source/Core/VideoBackends/D3D/BoundingBox.cpp
+++ b/Source/Core/VideoBackends/D3D/BoundingBox.cpp
@@ -10,7 +10,7 @@ namespace DX11
 {
 
 static ID3D11Buffer* s_bbox_buffer;
-static ID3D11Buffer* s_bbox_Readbuffer;
+static ID3D11Buffer* s_bbox_staging_buffer;
 static ID3D11UnorderedAccessView*  s_bbox_uav;
 
 ID3D11UnorderedAccessView* &BBox::GetUAV()
@@ -22,7 +22,8 @@ void BBox::Init()
 {
 	if (g_ActiveConfig.backend_info.bSupportsBBox)
 	{
-		// create the pool texture here
+		// Create 2 buffers here.
+		// First ror unordered access on Default pool.
 		auto desc = CD3D11_BUFFER_DESC(4 * sizeof(s32), D3D11_BIND_UNORDERED_ACCESS, D3D11_USAGE_DEFAULT, 0, 0, 4);
 		int initial_values[4] = { 0, 0, 0, 0 };
 		D3D11_SUBRESOURCE_DATA data;
@@ -31,25 +32,27 @@ void BBox::Init()
 		data.SysMemSlicePitch = 0;
 		HRESULT hr;
 		hr = D3D::device->CreateBuffer(&desc, &data, &s_bbox_buffer);
-		CHECK(SUCCEEDED(hr), "create bbox buffer");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_buffer, "boundingbox buffer");
+		CHECK(SUCCEEDED(hr), "Create BoundingBox Buffer.");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_buffer, "BoundingBox Buffer");
+
+		// Second to use as a staging buffer.
 		desc.Usage = D3D11_USAGE_STAGING;
 		desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
 		desc.BindFlags = 0;
-		hr = D3D::device->CreateBuffer(&desc, nullptr, &s_bbox_Readbuffer);
-		CHECK(SUCCEEDED(hr), "create bbox staging buffer");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_Readbuffer, "boundingbox staging buffer");
-
-		D3D11_UNORDERED_ACCESS_VIEW_DESC UAVdesc;
-		memset(&UAVdesc, 0, sizeof(UAVdesc));
+		hr = D3D::device->CreateBuffer(&desc, nullptr, &s_bbox_staging_buffer);
+		CHECK(SUCCEEDED(hr), "Create BoundingBox Staging Buffer.");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_staging_buffer, "BoundingBox Staging Buffer");
+		
+		// UAV is required to allow concurrent access.
+		D3D11_UNORDERED_ACCESS_VIEW_DESC UAVdesc = {};
 		UAVdesc.Format = DXGI_FORMAT_R32_SINT;
 		UAVdesc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER;
 		UAVdesc.Buffer.FirstElement = 0;
 		UAVdesc.Buffer.Flags = 0;
 		UAVdesc.Buffer.NumElements = 4;
 		hr = D3D::device->CreateUnorderedAccessView(s_bbox_buffer, &UAVdesc, &s_bbox_uav);
-		CHECK(SUCCEEDED(hr), "create bbox UAV");
-		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_uav, "boundingbox UAV");
+		CHECK(SUCCEEDED(hr), "Create BoundingBox UAV.");
+		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_bbox_uav, "BoundingBox UAV");
 	}
 }
 
@@ -60,10 +63,10 @@ void BBox::Shutdown()
 		s_bbox_buffer->Release();
 		s_bbox_buffer = nullptr;
 	}
-	if (s_bbox_Readbuffer != nullptr)
+	if (s_bbox_staging_buffer != nullptr)
 	{
-		s_bbox_Readbuffer->Release();
-		s_bbox_Readbuffer = nullptr;
+		s_bbox_staging_buffer->Release();
+		s_bbox_staging_buffer = nullptr;
 	}
 	if (s_bbox_uav != nullptr)
 	{
@@ -81,14 +84,14 @@ void BBox::Set(int index, int value)
 int BBox::Get(int index)
 {
 	int data = 0;
-	D3D::context->CopyResource(s_bbox_Readbuffer, s_bbox_buffer);
+	D3D::context->CopyResource(s_bbox_staging_buffer, s_bbox_buffer);
 	D3D11_MAPPED_SUBRESOURCE map;
-	HRESULT hr = D3D::context->Map(s_bbox_Readbuffer, 0, D3D11_MAP_READ, 0, &map);
+	HRESULT hr = D3D::context->Map(s_bbox_staging_buffer, 0, D3D11_MAP_READ, 0, &map);
 	if (SUCCEEDED(hr))
 	{
 		data = ((s32*)map.pData)[index];
 	}
-	D3D::context->Unmap(s_bbox_Readbuffer, 0);
+	D3D::context->Unmap(s_bbox_staging_buffer, 0);
 	return data;
 }