Merge pull request #81 from Microsoft/develop

merge develop 1/15/16

Author: bobbrow

MiniEngine/Core/pch.h

@@ -17,15 +17,9 @@
 #pragma warning(disable:4328) // nonstandard extension used : class rvalue used as lvalue
 #pragma warning(disable:4324) // structure was padded due to __declspec(align())
 
-#include <winapifamily.h>		// for WINAPI_FAMILY
-#include <wrl.h>
-
 #ifndef WIN32_LEAN_AND_MEAN
 	#define WIN32_LEAN_AND_MEAN
 #endif
-#ifndef NOMINMAX
-	#define NOMINMAX
-#endif
 #include <windows.h>
 
 #include <d3d12.h>
@@ -51,6 +45,7 @@
 #include <exception>
 
 #include <ppltasks.h>
+#include <wrl.h>
 
 #include "Utility.h"
 #include "VectorMath.h"

Samples/D3D1211On12/src/D3D1211On12.cpp

@@ -89,6 +89,7 @@ void D3D1211on12::LoadPipeline()
 	queueDesc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
 
 	ThrowIfFailed(m_d3d12Device->CreateCommandQueue(&queueDesc, IID_PPV_ARGS(&m_commandQueue)));
+	NAME_D3D12_OBJECT(m_commandQueue);
 
 	// Describe the swap chain.
 	DXGI_SWAP_CHAIN_DESC swapChainDesc = {};
@@ -180,6 +181,12 @@ void D3D1211on12::LoadPipeline()
 			ThrowIfFailed(m_swapChain->GetBuffer(n, IID_PPV_ARGS(&m_renderTargets[n])));
 			m_d3d12Device->CreateRenderTargetView(m_renderTargets[n].Get(), nullptr, rtvHandle);
 
+			WCHAR name[25];
+			if (swprintf_s(name, L"m_renderTargets[%u]", n) > 0)
+			{
+				SetName(m_renderTargets[n].Get(), name);
+			}
+
 			// Create a wrapped 11On12 resource of this back buffer. Since we are 
 			// rendering all D3D12 content first and then all D2D content, we specify 
 			// the In resource state as RENDER_TARGET - because D3D12 will have last 
@@ -223,6 +230,7 @@ void D3D1211on12::LoadAssets()
 		ComPtr<ID3DBlob> error;
 		ThrowIfFailed(D3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &signature, &error));
 		ThrowIfFailed(m_d3d12Device->CreateRootSignature(0, signature->GetBufferPointer(), signature->GetBufferSize(), IID_PPV_ARGS(&m_rootSignature)));
+		NAME_D3D12_OBJECT(m_rootSignature);
 	}
 
 	// Create the pipeline state, which includes compiling and loading shaders.
@@ -264,9 +272,11 @@ void D3D1211on12::LoadAssets()
 		psoDesc.SampleDesc.Count = 1;
 
 		ThrowIfFailed(m_d3d12Device->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&m_pipelineState)));
+		NAME_D3D12_OBJECT(m_pipelineState);
 	}
 
 	ThrowIfFailed(m_d3d12Device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, m_commandAllocators[m_frameIndex].Get(), m_pipelineState.Get(), IID_PPV_ARGS(&m_commandList)));
+	NAME_D3D12_OBJECT(m_commandList);
 
 	// Create D2D/DWrite objects for rendering text.
 	{
@@ -319,6 +329,8 @@ void D3D1211on12::LoadAssets()
 			nullptr,
 			IID_PPV_ARGS(&vertexBufferUpload)));
 
+		NAME_D3D12_OBJECT(m_vertexBuffer);
+
 		// Copy data to the intermediate upload heap and then schedule a copy 
 		// from the upload heap to the vertex buffer.
 		D3D12_SUBRESOURCE_DATA vertexData = {};
@@ -368,53 +380,27 @@ void D3D1211on12::OnUpdate()
 // Render the scene.
 void D3D1211on12::OnRender()
 {
+	PIXBeginEvent(m_commandQueue.Get(), 0, L"Render 3D");
+
 	// Record all the commands we need to render the scene into the command list.
 	PopulateCommandList();
 
 	// Execute the command list.
 	ID3D12CommandList* ppCommandLists[] = { m_commandList.Get() };
 	m_commandQueue->ExecuteCommandLists(_countof(ppCommandLists), ppCommandLists);
 
+	PIXEndEvent(m_commandQueue.Get());
+
+	PIXBeginEvent(m_commandQueue.Get(), 0, L"Render UI");
 	RenderUI();
+	PIXEndEvent(m_commandQueue.Get());
 
 	// Present the frame.
 	ThrowIfFailed(m_swapChain->Present(1, 0));
 
 	MoveToNextFrame();
 }
 
-// Render text over D3D12 using D2D via the 11On12 device.
-void D3D1211on12::RenderUI()
-{
-	D2D1_SIZE_F rtSize = m_d2dRenderTargets[m_frameIndex]->GetSize();
-	D2D1_RECT_F textRect = D2D1::RectF(0, 0, rtSize.width, rtSize.height);
-	static const WCHAR text[] = L"11On12";
-
-	// Acquire our wrapped render target resource for the current back buffer.
-	m_d3d11On12Device->AcquireWrappedResources(m_wrappedBackBuffers[m_frameIndex].GetAddressOf(), 1);
-
-	// Render text directly to the back buffer.
-	m_d2dDeviceContext->SetTarget(m_d2dRenderTargets[m_frameIndex].Get());
-	m_d2dDeviceContext->BeginDraw();
-	m_d2dDeviceContext->SetTransform(D2D1::Matrix3x2F::Identity());
-	m_d2dDeviceContext->DrawTextW(
-		text,
-		_countof(text) - 1,
-		m_textFormat.Get(),
-		&textRect,
-		m_textBrush.Get()
-		);
-	ThrowIfFailed(m_d2dDeviceContext->EndDraw());
-
-	// Release our wrapped render target resource. Releasing 
-	// transitions the back buffer resource to the state specified
-	// as the OutState when the wrapped resource was created.
-	m_d3d11On12Device->ReleaseWrappedResources(m_wrappedBackBuffers[m_frameIndex].GetAddressOf(), 1);
-
-	// Flush to submit the 11 command list to the shared command queue.
-	m_d3d11DeviceContext->Flush();
-}
-
 void D3D1211on12::OnDestroy()
 {
 	// Ensure that the GPU is no longer referencing resources that are about to be
@@ -461,6 +447,38 @@ void D3D1211on12::PopulateCommandList()
 	ThrowIfFailed(m_commandList->Close());
 }
 
+// Render text over D3D12 using D2D via the 11On12 device.
+void D3D1211on12::RenderUI()
+{
+	D2D1_SIZE_F rtSize = m_d2dRenderTargets[m_frameIndex]->GetSize();
+	D2D1_RECT_F textRect = D2D1::RectF(0, 0, rtSize.width, rtSize.height);
+	static const WCHAR text[] = L"11On12";
+
+	// Acquire our wrapped render target resource for the current back buffer.
+	m_d3d11On12Device->AcquireWrappedResources(m_wrappedBackBuffers[m_frameIndex].GetAddressOf(), 1);
+
+	// Render text directly to the back buffer.
+	m_d2dDeviceContext->SetTarget(m_d2dRenderTargets[m_frameIndex].Get());
+	m_d2dDeviceContext->BeginDraw();
+	m_d2dDeviceContext->SetTransform(D2D1::Matrix3x2F::Identity());
+	m_d2dDeviceContext->DrawTextW(
+		text,
+		_countof(text) - 1,
+		m_textFormat.Get(),
+		&textRect,
+		m_textBrush.Get()
+		);
+	ThrowIfFailed(m_d2dDeviceContext->EndDraw());
+
+	// Release our wrapped render target resource. Releasing 
+	// transitions the back buffer resource to the state specified
+	// as the OutState when the wrapped resource was created.
+	m_d3d11On12Device->ReleaseWrappedResources(m_wrappedBackBuffers[m_frameIndex].GetAddressOf(), 1);
+
+	// Flush to submit the 11 command list to the shared command queue.
+	m_d3d11DeviceContext->Flush();
+}
+
 // Wait for pending GPU work to complete.
 void D3D1211on12::WaitForGpu()
 {

Samples/D3D1211On12/src/DXSampleHelper.h

@@ -27,7 +27,6 @@ inline void GetAssetsPath(_Out_writes_(pathSize) WCHAR* path, UINT pathSize)
 	}
 
 	DWORD size = GetModuleFileName(nullptr, path, pathSize);
-
 	if (size == 0 || size == pathSize)
 	{
 		// Method failed or path was truncated.
@@ -37,44 +36,30 @@ inline void GetAssetsPath(_Out_writes_(pathSize) WCHAR* path, UINT pathSize)
 	WCHAR* lastSlash = wcsrchr(path, L'\\');
 	if (lastSlash)
 	{
-		*(lastSlash+1) = NULL;
+		*(lastSlash + 1) = L'\0';
 	}
 }
 
 inline HRESULT ReadDataFromFile(LPCWSTR filename, byte** data, UINT* size)
 {
 	using namespace Microsoft::WRL;
 
-	CREATEFILE2_EXTENDED_PARAMETERS extendedParams = { 0 };
+	CREATEFILE2_EXTENDED_PARAMETERS extendedParams = {};
 	extendedParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
 	extendedParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
 	extendedParams.dwFileFlags = FILE_FLAG_SEQUENTIAL_SCAN;
 	extendedParams.dwSecurityQosFlags = SECURITY_ANONYMOUS;
 	extendedParams.lpSecurityAttributes = nullptr;
 	extendedParams.hTemplateFile = nullptr;
 
-	Wrappers::FileHandle file(
-		CreateFile2(
-			filename,
-			GENERIC_READ,
-			FILE_SHARE_READ,
-			OPEN_EXISTING,
-			&extendedParams
-			)
-		);
-
+	Wrappers::FileHandle file(CreateFile2(filename, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, &extendedParams));
 	if (file.Get() == INVALID_HANDLE_VALUE)
 	{
 		throw new std::exception();
 	}
 
-	FILE_STANDARD_INFO fileInfo = { 0 };
-	if (!GetFileInformationByHandleEx(
-		file.Get(),
-		FileStandardInfo,
-		&fileInfo,
-		sizeof(fileInfo)
-		))
+	FILE_STANDARD_INFO fileInfo = {};
+	if (!GetFileInformationByHandleEx(file.Get(), FileStandardInfo, &fileInfo, sizeof(fileInfo)))
 	{
 		throw new std::exception();
 	}
@@ -87,16 +72,26 @@ inline HRESULT ReadDataFromFile(LPCWSTR filename, byte** data, UINT* size)
 	*data = reinterpret_cast<byte*>(malloc(fileInfo.EndOfFile.LowPart));
 	*size = fileInfo.EndOfFile.LowPart;
 
-	if (!ReadFile(
-		file.Get(),
-		*data,
-		fileInfo.EndOfFile.LowPart,
-		nullptr,
-		nullptr
-		))
+	if (!ReadFile(file.Get(), *data, fileInfo.EndOfFile.LowPart, nullptr, nullptr))
 	{
 		throw new std::exception();
 	}
 
 	return S_OK;
 }
+
+// Assign a name to the object to aid with debugging.
+#if defined(_DEBUG)
+inline void SetName(ID3D12Object* pObject, LPCWSTR name)
+{
+	pObject->SetName(name);
+}
+#else
+inline void SetName(ID3D12Object*, LPCWSTR)
+{
+}
+#endif
+
+// Naming helper for ComPtr<T>.
+// Assigns the name of the variable as the name of the object.
+#define NAME_D3D12_OBJECT(x) SetName(x.Get(), L#x)

Samples/D3D1211On12/src/stdafx.h

@@ -29,6 +29,7 @@
 #include <D3Dcompiler.h>
 #include <DirectXMath.h>
 #include "d3dx12.h"
+#include <pix.h>
 
 #include <string>
 #include <wrl.h>

Samples/D3D12Bundles/src/D3D12Bundles.cpp

@@ -86,6 +86,7 @@ void D3D12Bundles::LoadPipeline()
 	queueDesc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT;
 
 	ThrowIfFailed(m_device->CreateCommandQueue(&queueDesc, IID_PPV_ARGS(&m_commandQueue)));
+	NAME_D3D12_OBJECT(m_commandQueue);
 
 	// Describe and create the swap chain.
 	DXGI_SWAP_CHAIN_DESC swapChainDesc = {};
@@ -138,6 +139,7 @@ void D3D12Bundles::LoadPipeline()
 		cbvSrvHeapDesc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
 		cbvSrvHeapDesc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
 		ThrowIfFailed(m_device->CreateDescriptorHeap(&cbvSrvHeapDesc, IID_PPV_ARGS(&m_cbvSrvHeap)));
+		NAME_D3D12_OBJECT(m_cbvSrvHeap);
 
 		// Describe and create a sampler descriptor heap.
 		D3D12_DESCRIPTOR_HEAP_DESC samplerHeapDesc = {};
@@ -183,6 +185,7 @@ void D3D12Bundles::LoadAssets()
 		ComPtr<ID3DBlob> error;
 		ThrowIfFailed(D3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &signature, &error));
 		ThrowIfFailed(m_device->CreateRootSignature(0, signature->GetBufferPointer(), signature->GetBufferSize(), IID_PPV_ARGS(&m_rootSignature)));
+		NAME_D3D12_OBJECT(m_rootSignature);
 	}
 
 	// Create the pipeline state, which includes loading shaders.
@@ -219,18 +222,22 @@ void D3D12Bundles::LoadAssets()
 		psoDesc.SampleDesc.Count = 1;
 
 		ThrowIfFailed(m_device->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&m_pipelineState1)));
+		NAME_D3D12_OBJECT(m_pipelineState1);
 
 		// Modify the description to use an alternate pixel shader and create
 		// a second PSO.
 		psoDesc.PS = CD3DX12_SHADER_BYTECODE(pPixelShaderData2, pixelShaderDataLength2);
+
 		ThrowIfFailed(m_device->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&m_pipelineState2)));
+		NAME_D3D12_OBJECT(m_pipelineState2);
 
 		delete pVertexShaderData;
 		delete pPixelShaderData1;
 		delete pPixelShaderData2;
 	}
 
 	ThrowIfFailed(m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, m_commandAllocator.Get(), nullptr, IID_PPV_ARGS(&m_commandList)));
+	NAME_D3D12_OBJECT(m_commandList);
 
 	// Create render target views (RTVs).
 	CD3DX12_CPU_DESCRIPTOR_HANDLE rtvHandle(m_rtvHeap->GetCPUDescriptorHandleForHeapStart());
@@ -239,6 +246,12 @@ void D3D12Bundles::LoadAssets()
 		ThrowIfFailed(m_swapChain->GetBuffer(i, IID_PPV_ARGS(&m_renderTargets[i])));
 		m_device->CreateRenderTargetView(m_renderTargets[i].Get(), nullptr, rtvHandle);
 		rtvHandle.Offset(1, m_rtvDescriptorSize);
+
+		WCHAR name[25];
+		if (swprintf_s(name, L"m_renderTargets[%u]", i) > 0)
+		{
+			SetName(m_renderTargets[i].Get(), name);
+		}
 	}
 
 	// Read in mesh data for vertex/index buffers.
@@ -264,6 +277,8 @@ void D3D12Bundles::LoadAssets()
 			nullptr,
 			IID_PPV_ARGS(&vertexBufferUploadHeap)));
 
+		NAME_D3D12_OBJECT(m_vertexBuffer);
+
 		// Copy data to the intermediate upload heap and then schedule a copy 
 		// from the upload heap to the vertex buffer.
 		D3D12_SUBRESOURCE_DATA vertexData = {};
@@ -298,6 +313,8 @@ void D3D12Bundles::LoadAssets()
 			nullptr,
 			IID_PPV_ARGS(&indexBufferUploadHeap)));
 
+		NAME_D3D12_OBJECT(m_indexBuffer);
+
 		// Copy data to the intermediate upload heap and then schedule a copy 
 		// from the upload heap to the index buffer.
 		D3D12_SUBRESOURCE_DATA indexData = {};
@@ -338,6 +355,8 @@ void D3D12Bundles::LoadAssets()
 			nullptr,
 			IID_PPV_ARGS(&m_texture)));
 
+		NAME_D3D12_OBJECT(m_texture);
+
 		const UINT subresourceCount = textureDesc.DepthOrArraySize * textureDesc.MipLevels;
 		const UINT64 uploadBufferSize = GetRequiredIntermediateSize(m_texture.Get(), 0, subresourceCount);
 
@@ -404,6 +423,8 @@ void D3D12Bundles::LoadAssets()
 			IID_PPV_ARGS(&m_depthStencil)
 			));
 
+		NAME_D3D12_OBJECT(m_depthStencil);
+
 		m_device->CreateDepthStencilView(m_depthStencil.Get(), &depthStencilDesc, m_dsvHeap->GetCPUDescriptorHandleForHeapStart());
 	}
 
@@ -480,13 +501,17 @@ void D3D12Bundles::OnUpdate()
 // Render the scene.
 void D3D12Bundles::OnRender()
 {
+	PIXBeginEvent(m_commandQueue.Get(), 0, L"Render");
+
 	// Record all the commands we need to render the scene into the command list.
 	PopulateCommandList(m_pCurrentFrameResource);
 
 	// Execute the command list.
 	ID3D12CommandList* ppCommandLists[] = { m_commandList.Get() };
 	m_commandQueue->ExecuteCommandLists(_countof(ppCommandLists), ppCommandLists);
 
+	PIXEndEvent(m_commandQueue.Get());
+
 	// Present and update the frame index for the next frame.
 	ThrowIfFailed(m_swapChain->Present(1, 0));
 	m_frameIndex = m_swapChain->GetCurrentBackBufferIndex();