Merge pull request #8 from Microsoft/develop

merge develop branch for new release

Author: bobbrow

.gitattributes

@@ -0,0 +1,13 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Explicitly declare code/VS files as CRLF
+*.cpp eol=crlf
+*.h eol=crlf
+*.hlsl eol=crlf
+*.vcxproj eol=crlf
+*.filters eol=crlf
+*.sln eol=crlf
+
+# Explicitly declare resource files as binary
+*.bin binary

Samples/D3D12Bundles/src/FrameResource.cpp

@@ -76,7 +76,7 @@ void FrameResource::SetCityPositions(FLOAT intervalX, FLOAT intervalZ)
 
 			// The y position is based off of the city's row and column 
 			// position to prevent z-fighting.
-			m_modelMatrices[i * m_cityColumnCount + j] = XMMatrixTranslation(cityOffsetX, 0.02f * (i * m_cityColumnCount + j), cityOffsetZ);
+			XMStoreFloat4x4(&m_modelMatrices[i * m_cityColumnCount + j], XMMatrixTranslation(cityOffsetX, 0.02f * (i * m_cityColumnCount + j), cityOffsetZ));
 		}
 	}
 }
@@ -123,17 +123,17 @@ void FrameResource::PopulateCommandList(ID3D12GraphicsCommandList* pCommandList,
 
 void XM_CALLCONV FrameResource::UpdateConstantBuffers(FXMMATRIX view, CXMMATRIX projection)
 {
-	XMMATRIX* pModel;
+	XMMATRIX model;
 	XMFLOAT4X4 mvp;
 
 	for (UINT i = 0; i < m_cityRowCount; i++)
 	{
 		for (UINT j = 0; j < m_cityColumnCount; j++)
 		{
-			pModel = &m_modelMatrices[i * m_cityColumnCount + j];
+			model = XMLoadFloat4x4(&m_modelMatrices[i * m_cityColumnCount + j]);
 
 			// Compute the model-view-projection matrix.
-			XMStoreFloat4x4(&mvp, XMMatrixTranspose(*pModel * view * projection));
+			XMStoreFloat4x4(&mvp, XMMatrixTranspose(model * view * projection));
 
 			// Copy this matrix into the appropriate location in the upload heap subresource.
 			memcpy(&m_pConstantBuffers[i * m_cityColumnCount + j], &mvp, sizeof(mvp));

Samples/D3D12Bundles/src/FrameResource.h

@@ -36,7 +36,7 @@ class FrameResource
 	ConstantBuffer* m_pConstantBuffers;
 	UINT64 m_fenceValue;
 
-	vector<XMMATRIX> m_modelMatrices;
+	vector<XMFLOAT4X4> m_modelMatrices;
 	UINT m_cityRowCount;
 	UINT m_cityColumnCount;
 

Samples/D3D12DynamicIndexing/src/FrameResource.cpp

@@ -77,7 +77,7 @@ void FrameResource::SetCityPositions(FLOAT intervalX, FLOAT intervalZ)
 
 			// The y position is based off of the city's row and column 
 			// position to prevent z-fighting.
-			m_modelMatrices[i * m_cityColumnCount + j] = XMMatrixTranslation(cityOffsetX, 0.02f * (i * m_cityColumnCount + j), cityOffsetZ);
+			XMStoreFloat4x4(&m_modelMatrices[i * m_cityColumnCount + j], XMMatrixTranslation(cityOffsetX, 0.02f * (i * m_cityColumnCount + j), cityOffsetZ));
 		}
 	}
 }
@@ -123,17 +123,17 @@ void FrameResource::PopulateCommandList(ID3D12GraphicsCommandList* pCommandList,
 
 void XM_CALLCONV FrameResource::UpdateConstantBuffers(FXMMATRIX view, CXMMATRIX projection)
 {
-	XMMATRIX* pModel;
+	XMMATRIX model;
 	XMFLOAT4X4 mvp;
 
 	for (UINT i = 0; i < m_cityRowCount; i++)
 	{
 		for (UINT j = 0; j < m_cityColumnCount; j++)
 		{
-			pModel = &m_modelMatrices[i * m_cityColumnCount + j];
+			model = XMLoadFloat4x4(&m_modelMatrices[i * m_cityColumnCount + j]);
 
 			// Compute the model-view-projection matrix.
-			XMStoreFloat4x4(&mvp, XMMatrixTranspose(*pModel * view * projection));
+			XMStoreFloat4x4(&mvp, XMMatrixTranspose(model * view * projection));
 
 			// Copy this matrix into the appropriate location in the upload heap subresource.
 			memcpy(&m_pConstantBuffers[i * m_cityColumnCount + j], &mvp, sizeof(mvp));

Samples/D3D12DynamicIndexing/src/FrameResource.h

@@ -36,7 +36,7 @@ class FrameResource
 	ConstantBuffer* m_pConstantBuffers;
 	UINT64 m_fenceValue;
 
-	vector<XMMATRIX> m_modelMatrices;
+	vector<XMFLOAT4X4> m_modelMatrices;
 	UINT m_cityRowCount;
 	UINT m_cityColumnCount;
 	UINT m_cityMaterialCount;

Samples/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.cpp

@@ -12,6 +12,7 @@
 #include "stdafx.h"
 #include "D3D12ExecuteIndirect.h"
 
+const UINT D3D12ExecuteIndirect::CommandBufferSizePerFrame = TriangleCount * sizeof(IndirectCommand);
 const float D3D12ExecuteIndirect::TriangleHalfWidth = 0.05f;
 const float D3D12ExecuteIndirect::TriangleDepth = 1.0f;
 const float D3D12ExecuteIndirect::CullingCutoff = 0.5f;
@@ -354,7 +355,7 @@ void D3D12ExecuteIndirect::LoadAssets()
 			m_constantBufferData[n].velocity = XMFLOAT4(GetRandomFloat(0.01f, 0.02f), 0.0f, 0.0f, 0.0f);
 			m_constantBufferData[n].offset = XMFLOAT4(GetRandomFloat(-5.0f, -1.5f), GetRandomFloat(-1.0f, 1.0f), GetRandomFloat(0.0f, 2.0f), 0.0f);
 			m_constantBufferData[n].color = XMFLOAT4(GetRandomFloat(0.5f, 1.0f), GetRandomFloat(0.5f, 1.0f), GetRandomFloat(0.5f, 1.0f), 1.0f);
-			m_constantBufferData[n].projection = XMMatrixTranspose(XMMatrixPerspectiveFovLH(XM_PIDIV4, m_aspectRatio, 0.01f, 20.0f));
+			XMStoreFloat4x4(&m_constantBufferData[n].projection, XMMatrixTranspose(XMMatrixPerspectiveFovLH(XM_PIDIV4, m_aspectRatio, 0.01f, 20.0f)));
 
 			for (int frame = 0; frame < FrameCount; frame++)
 			{
@@ -410,7 +411,7 @@ void D3D12ExecuteIndirect::LoadAssets()
 	{
 		std::vector<IndirectCommand> commands;
 		commands.resize(TriangleResourceCount);
-		const UINT commandBufferSize = TriangleResourceCount * sizeof(IndirectCommand);
+		const UINT commandBufferSize = CommandBufferSizePerFrame * FrameCount;
 
 		ThrowIfFailed(m_device->CreateCommittedResource(
 			&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT),
@@ -477,46 +478,48 @@ void D3D12ExecuteIndirect::LoadAssets()
 		CD3DX12_CPU_DESCRIPTOR_HANDLE processedCommandsHandle(m_cbvSrvUavHeap->GetCPUDescriptorHandleForHeapStart(), ProcessedCommandsOffset, m_cbvSrvUavDescriptorSize);
 		for (UINT frame = 0; frame < FrameCount; frame++)
 		{
-			// Allocate a buffer large enough to hold all of the indirect commands.
+			// Allocate a buffer large enough to hold all of the indirect commands
+			// for a single frame as well as a UAV counter.
 			ThrowIfFailed(m_device->CreateCommittedResource(
 				&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_DEFAULT),
 				D3D12_HEAP_FLAG_NONE,
-				&CD3DX12_RESOURCE_DESC::Buffer(commandBufferSize / FrameCount, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS),
-				D3D12_RESOURCE_STATE_UNORDERED_ACCESS,
+				&CD3DX12_RESOURCE_DESC::Buffer(CommandBufferSizePerFrame + sizeof(UINT), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS),
+				D3D12_RESOURCE_STATE_COPY_DEST,
 				nullptr,
 				IID_PPV_ARGS(&m_processedCommandBuffers[frame])));
 
-			// Allocate a counter for the UAV.
-			ThrowIfFailed(m_device->CreateCommittedResource(                
-				&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD),
-				D3D12_HEAP_FLAG_NONE,
-				&CD3DX12_RESOURCE_DESC::Buffer(sizeof(UINT)),
-				D3D12_RESOURCE_STATE_GENERIC_READ,
-				nullptr,
-				IID_PPV_ARGS(&m_processedCommandBufferCounters[frame])));
-
 			D3D12_UNORDERED_ACCESS_VIEW_DESC uavDesc = {};
 			uavDesc.Format = DXGI_FORMAT_UNKNOWN;
 			uavDesc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER;
 			uavDesc.Buffer.FirstElement = 0;
 			uavDesc.Buffer.NumElements = TriangleCount;
 			uavDesc.Buffer.StructureByteStride = sizeof(IndirectCommand);
-			uavDesc.Buffer.CounterOffsetInBytes = 0;
+			uavDesc.Buffer.CounterOffsetInBytes = CommandBufferSizePerFrame;
 			uavDesc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
 
 			m_device->CreateUnorderedAccessView(
 				m_processedCommandBuffers[frame].Get(),
-				m_processedCommandBufferCounters[frame].Get(),
+				m_processedCommandBuffers[frame].Get(),
 				&uavDesc,
 				processedCommandsHandle);
 
-			// Map the UAV counters. We don't unmap these until the app closes.
-			// Keeping things mapped for the lifetime of the resource is okay.
-			ThrowIfFailed(m_processedCommandBufferCounters[frame]->Map(0, nullptr, reinterpret_cast<void**>(&m_pMappedUavCounters[frame])));
-			ZeroMemory(m_pMappedUavCounters[frame], sizeof(UINT));
-
 			processedCommandsHandle.Offset(CbvSrvUavDescriptorCountPerFrame, m_cbvSrvUavDescriptorSize);
 		}
+
+		// Allocate a buffer that can be used to reset the UAV counters and initialize
+		// it to 0.
+		ThrowIfFailed(m_device->CreateCommittedResource(
+			&CD3DX12_HEAP_PROPERTIES(D3D12_HEAP_TYPE_UPLOAD),
+			D3D12_HEAP_FLAG_NONE,
+			&CD3DX12_RESOURCE_DESC::Buffer(sizeof(UINT)),
+			D3D12_RESOURCE_STATE_GENERIC_READ,
+			nullptr,
+			IID_PPV_ARGS(&m_processedCommandBufferCounterReset)));
+
+		UINT8* pMappedCounterReset = nullptr;
+		ThrowIfFailed(m_processedCommandBufferCounterReset->Map(0, nullptr, reinterpret_cast<void**>(&pMappedCounterReset)));
+		ZeroMemory(pMappedCounterReset, sizeof(UINT));
+		m_processedCommandBufferCounterReset->Unmap(0, nullptr);
 	}
 
 	// Close the command list and execute it to begin the vertex buffer copy into
@@ -571,8 +574,6 @@ void D3D12ExecuteIndirect::OnUpdate()
 
 	UINT8* destination = m_pCbvDataBegin + (TriangleCount * m_frameIndex * sizeof(ConstantBufferData));
 	memcpy(destination, &m_constantBufferData[0], TriangleCount * sizeof(ConstantBufferData));
-
-	ZeroMemory(m_pMappedUavCounters[m_frameIndex], sizeof(UINT));
 }
 
 // Render the scene.
@@ -655,6 +656,12 @@ void D3D12ExecuteIndirect::PopulateCommandLists()
 
 		m_computeCommandList->SetComputeRoot32BitConstants(RootConstants, 4, reinterpret_cast<void*>(&m_csRootConstants), 0);
 
+		// Reset the UAV counter for this frame.
+		m_computeCommandList->CopyBufferRegion(m_processedCommandBuffers[m_frameIndex].Get(), CommandBufferSizePerFrame, m_processedCommandBufferCounterReset.Get(), 0, sizeof(UINT));
+
+		D3D12_RESOURCE_BARRIER barrier = CD3DX12_RESOURCE_BARRIER::Transition(m_processedCommandBuffers[m_frameIndex].Get(), D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS);
+		m_computeCommandList->ResourceBarrier(1, &barrier);
+
 		m_computeCommandList->Dispatch(static_cast<UINT>(ceil(TriangleCount / float(ComputeThreadBlockSize))), 1, 1);
 	}
 
@@ -698,19 +705,33 @@ void D3D12ExecuteIndirect::PopulateCommandLists()
 		m_commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
 		m_commandList->IASetVertexBuffers(0, 1, &m_vertexBufferView);
 
-		// Draw the triangles that have not been culled.
-		m_commandList->ExecuteIndirect(
-			m_commandSignature.Get(),
-			TriangleCount,
-			m_enableCulling ? m_processedCommandBuffers[m_frameIndex].Get() : m_commandBuffer.Get(),
-			m_enableCulling ? 0 : TriangleCount * m_frameIndex * sizeof(IndirectCommand),
-			m_enableCulling ? m_processedCommandBufferCounters[m_frameIndex].Get() : nullptr,
-			0);
+		if (m_enableCulling)
+		{
+			// Draw the triangles that have not been culled.
+			m_commandList->ExecuteIndirect(
+				m_commandSignature.Get(),
+				TriangleCount,
+				m_processedCommandBuffers[m_frameIndex].Get(),
+				0,
+				m_processedCommandBuffers[m_frameIndex].Get(),
+				CommandBufferSizePerFrame);
+		}
+		else
+		{
+			// Draw all of the triangles.
+			m_commandList->ExecuteIndirect(
+				m_commandSignature.Get(),
+				TriangleCount,
+				m_commandBuffer.Get(),
+				CommandBufferSizePerFrame * m_frameIndex,
+				nullptr,
+				0);
+		}
 
 		// Indicate that the command buffer may be used by the compute shader
 		// and that the back buffer will now be used to present.
 		barriers[0].Transition.StateBefore = D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT;
-		barriers[0].Transition.StateAfter = m_enableCulling ? D3D12_RESOURCE_STATE_UNORDERED_ACCESS : D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
+		barriers[0].Transition.StateAfter = m_enableCulling ? D3D12_RESOURCE_STATE_COPY_DEST : D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE;
 		barriers[1].Transition.StateBefore = D3D12_RESOURCE_STATE_RENDER_TARGET;
 		barriers[1].Transition.StateAfter = D3D12_RESOURCE_STATE_PRESENT;
 

Samples/D3D12ExecuteIndirect/src/D3D12ExecuteIndirect.h

@@ -32,6 +32,7 @@ class D3D12ExecuteIndirect : public DXSample
 	static const UINT FrameCount = 3;
 	static const UINT TriangleCount = 1024;
 	static const UINT TriangleResourceCount = TriangleCount * FrameCount;
+	static const UINT CommandBufferSizePerFrame;
 	static const UINT ComputeThreadBlockSize = 128;		// Should match the value in compute.hlsl.
 	static const float TriangleHalfWidth;				// The x and y offsets used by the triangle vertices.
 	static const float TriangleDepth;					// The z offset used by the triangle vertices.
@@ -49,7 +50,7 @@ class D3D12ExecuteIndirect : public DXSample
 		XMFLOAT4 velocity;
 		XMFLOAT4 offset;
 		XMFLOAT4 color;
-		XMMATRIX projection;
+		XMFLOAT4X4 projection;
 
 		// Constant buffers are 256-byte aligned. Add padding in the struct to allow multiple buffers
 		// to be array-indexed.
@@ -141,8 +142,7 @@ class D3D12ExecuteIndirect : public DXSample
 	ComPtr<ID3D12Resource> m_depthStencil;
 	ComPtr<ID3D12Resource> m_commandBuffer;
 	ComPtr<ID3D12Resource> m_processedCommandBuffers[FrameCount];
-	ComPtr<ID3D12Resource> m_processedCommandBufferCounters[FrameCount];
-	UINT8* m_pMappedUavCounters[FrameCount];
+	ComPtr<ID3D12Resource> m_processedCommandBufferCounterReset;
 	D3D12_VERTEX_BUFFER_VIEW m_vertexBufferView;
 
 	void LoadPipeline();

Samples/D3D12HelloWorld/readme.md

@@ -4,6 +4,8 @@ This collection of samples act as an introduction to Direct3D 12. Each sample bu
 This sample shows you how to create a window, Direct3D device (with debug layers enabled), and present to the window. These are the basic elements that every sample uses.
 ## Hello Triangle Sample
 This sample shows you how to draw a static triangle using a vertex buffer.
+## Hello Texture Sample
+This sample shows you how to apply a Texture2D to triangle.
 ## Hello Bundles Sample
 This sample shows you how to use Bundles to draw a static triangle more efficiently.
 ## Hello Constant Buffers Sample

Samples/D3D12HelloWorld/src/D3D12HelloWorld.sln

@@ -11,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12HelloWindow", "HelloWi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12HelloConstBuffers", "HelloConstBuffers\D3D12HelloConstBuffers.vcxproj", "{6F49D366-B5F1-432B-A3E8-5D1CA57865F9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12HelloTexture", "HelloTexture\D3D12HelloTexture.vcxproj", "{16B13BB4-D82D-4AC1-8B40-C6BCCC99954B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -33,6 +35,10 @@ Global
 		{6F49D366-B5F1-432B-A3E8-5D1CA57865F9}.Debug|x64.Build.0 = Debug|x64
 		{6F49D366-B5F1-432B-A3E8-5D1CA57865F9}.Release|x64.ActiveCfg = Release|x64
 		{6F49D366-B5F1-432B-A3E8-5D1CA57865F9}.Release|x64.Build.0 = Release|x64
+		{16B13BB4-D82D-4AC1-8B40-C6BCCC99954B}.Debug|x64.ActiveCfg = Debug|x64
+		{16B13BB4-D82D-4AC1-8B40-C6BCCC99954B}.Debug|x64.Build.0 = Debug|x64
+		{16B13BB4-D82D-4AC1-8B40-C6BCCC99954B}.Release|x64.ActiveCfg = Release|x64
+		{16B13BB4-D82D-4AC1-8B40-C6BCCC99954B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Samples/D3D12HelloWorld/src/HelloConstBuffers/D3D12HelloConstBuffers.cpp

@@ -136,13 +136,12 @@ void D3D12HelloConstBuffers::LoadPipeline()
 	}
 
 	ThrowIfFailed(m_device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(&m_commandAllocator)));
-	ThrowIfFailed(m_device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_BUNDLE, IID_PPV_ARGS(&m_bundleAllocator)));
 }
 
 // Load the sample assets.
 void D3D12HelloConstBuffers::LoadAssets()
 {
-	// Create a root signature consisting of a single CBV parameter.
+	// Create a root signature consisting of a descriptor table with a single CBV.
 	{
 		CD3DX12_DESCRIPTOR_RANGE ranges[1];
 		CD3DX12_ROOT_PARAMETER rootParameters[1];
@@ -274,18 +273,6 @@ void D3D12HelloConstBuffers::LoadAssets()
 		memcpy(m_pCbvDataBegin, &m_constantBufferData, sizeof(m_constantBufferData));
 	}
 
-	// Create and record the bundle.
-	{
-		ThrowIfFailed(m_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_BUNDLE, m_bundleAllocator.Get(), m_pipelineState.Get(), IID_PPV_ARGS(&m_bundle)));
-		m_bundle->SetDescriptorHeaps(1, m_cbvHeap.GetAddressOf());
-		m_bundle->SetGraphicsRootSignature(m_rootSignature.Get());
-		m_bundle->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
-		m_bundle->IASetVertexBuffers(0, 1, &m_vertexBufferView);
-		m_bundle->SetGraphicsRootDescriptorTable(0, m_cbvHeap->GetGPUDescriptorHandleForHeapStart());
-		m_bundle->DrawInstanced(3, 1, 0, 0);
-		ThrowIfFailed(m_bundle->Close());
-	}
-
 	// Create synchronization objects and wait until assets have been uploaded to the GPU.
 	{
 		ThrowIfFailed(m_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&m_fence)));
@@ -367,6 +354,7 @@ void D3D12HelloConstBuffers::PopulateCommandList()
 	ID3D12DescriptorHeap* ppHeaps[] = { m_cbvHeap.Get() };
 	m_commandList->SetDescriptorHeaps(_countof(ppHeaps), ppHeaps);
 
+	m_commandList->SetGraphicsRootDescriptorTable(0, m_cbvHeap->GetGPUDescriptorHandleForHeapStart());
 	m_commandList->RSSetViewports(1, &m_viewport);
 	m_commandList->RSSetScissorRects(1, &m_scissorRect);
 
@@ -379,9 +367,9 @@ void D3D12HelloConstBuffers::PopulateCommandList()
 	// Record commands.
 	const float clearColor[] = { 0.0f, 0.2f, 0.4f, 1.0f };
 	m_commandList->ClearRenderTargetView(rtvHandle, clearColor, 0, nullptr);
-
-	// Execute the commands stored in the bundle.
-	m_commandList->ExecuteBundle(m_bundle.Get());
+	m_commandList->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+	m_commandList->IASetVertexBuffers(0, 1, &m_vertexBufferView);
+	m_commandList->DrawInstanced(3, 1, 0, 0);
 
 	// Indicate that the back buffer will now be used to present.
 	m_commandList->ResourceBarrier(1, &CD3DX12_RESOURCE_BARRIER::Transition(m_renderTargets[m_frameIndex].Get(), D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT));