Started with a PBR Pipeline

Author: PR3C14D0

src/private/Core/Renderer/D3D12.cpp

@@ -97,42 +97,48 @@ void D3D12::Init(HWND hwnd) {
 	this->CreateTexture(this->m_nWidth, this->m_nHeight, 8, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, this->m_albedoBuff);
 	this->CreateTexture(this->m_nWidth, this->m_nHeight, 8, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, this->m_uvBuff);
 	this->CreateTexture(this->m_nWidth, this->m_nHeight, 8, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, this->m_positionBuff);
+	this->CreateTexture(this->m_nWidth, this->m_nHeight, 8, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, this->m_materialBuff);
 
 	this->m_albedoBuff->SetName(L"Albedo");
 	this->m_uvBuff->SetName(L"Normal");
 	this->m_positionBuff->SetName(L"Position");
+	this->m_materialBuff->SetName(L"Material Properties");
 
 	this->m_nAlbedoIndex = this->m_rtvHeap->GetDescriptorCount();
 	this->m_nUVIndex = this->m_nAlbedoIndex + 1;
 	this->m_nPositionIndex = this->m_nUVIndex + 1;
+	this->m_nMaterialBuffIndex = this->m_nPositionIndex + 1;
 
 	D3D12_RENDER_TARGET_VIEW_DESC GBufferDesc = { };
 	GBufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
 	GBufferDesc.Texture2D.MipSlice = 1;
 	GBufferDesc.Texture2D.PlaneSlice = 1;
 	GBufferDesc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMS;
 
-	this->m_rtvHeap->Allocate(3);
+	this->m_rtvHeap->Allocate(4);
 
 	Descriptor albedoDesc = this->m_rtvHeap->GetDescriptor(this->m_nAlbedoIndex);
 	Descriptor UVDesc = this->m_rtvHeap->GetDescriptor(this->m_nUVIndex);
 	Descriptor positionDesc =  this->m_rtvHeap->GetDescriptor(this->m_nPositionIndex);
+	Descriptor materialDesc = this->m_rtvHeap->GetDescriptor(this->m_nMaterialBuffIndex);
 
 	this->m_dev->CreateRenderTargetView(this->m_albedoBuff.Get(), &GBufferDesc, albedoDesc.cpuHandle);
 	this->m_dev->CreateRenderTargetView(this->m_uvBuff.Get(), &GBufferDesc, UVDesc.cpuHandle);
 	this->m_dev->CreateRenderTargetView(this->m_positionBuff.Get(), &GBufferDesc, positionDesc.cpuHandle);
+	this->m_dev->CreateRenderTargetView(this->m_materialBuff.Get(), &GBufferDesc, materialDesc.cpuHandle);
 
 	this->ResourceBarrier(this->m_albedoBuff.Get(), D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_RENDER_TARGET);
 	this->ResourceBarrier(this->m_uvBuff.Get(), D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_RENDER_TARGET);
 	this->ResourceBarrier(this->m_positionBuff.Get(), D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_RENDER_TARGET);
+	this->ResourceBarrier(this->m_materialBuff.Get(), D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_RESOURCE_STATE_RENDER_TARGET);
 
 	/* Track states */
 	m_resourceStates[this->m_albedoBuff.Get()] = D3D12_RESOURCE_STATE_RENDER_TARGET;
 	m_resourceStates[this->m_uvBuff.Get()] = D3D12_RESOURCE_STATE_RENDER_TARGET;
 	m_resourceStates[this->m_positionBuff.Get()] = D3D12_RESOURCE_STATE_RENDER_TARGET;
 
-	// We'll allocate 3 for our ScreenQuad.
-	this->m_cbvSrvHeap = new DescriptorHeap(3, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, true);
+	// We'll allocate the initial value for our ScreenQuad.
+	this->m_cbvSrvHeap = new DescriptorHeap(4, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, true);
 
 	this->m_screenQuad = new ScreenQuad();
 	this->m_screenQuad->Init();

src/private/Core/Renderer/ScreenQuad.cpp

@@ -80,22 +80,27 @@ void ScreenQuad::D3D12Init(D3D12* renderer) {
 	CD3DX12_DESCRIPTOR_RANGE albedoRange;
 	CD3DX12_DESCRIPTOR_RANGE normalRange;
 	CD3DX12_DESCRIPTOR_RANGE positionRange;
+	CD3DX12_DESCRIPTOR_RANGE materialRange;
 
 	albedoRange.Init(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 0);
 	normalRange.Init(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 1);
 	positionRange.Init(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 2);
+	materialRange.Init(D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 3);
 
 	CD3DX12_ROOT_PARAMETER albedoParam;
 	CD3DX12_ROOT_PARAMETER normalParam;
 	CD3DX12_ROOT_PARAMETER positionParam;
+	CD3DX12_ROOT_PARAMETER materialParam;
 	albedoParam.InitAsDescriptorTable(1, &albedoRange, D3D12_SHADER_VISIBILITY_PIXEL);
 	normalParam.InitAsDescriptorTable(1, &normalRange, D3D12_SHADER_VISIBILITY_PIXEL);
 	positionParam.InitAsDescriptorTable(1, &positionRange, D3D12_SHADER_VISIBILITY_PIXEL);
+	materialParam.InitAsDescriptorTable(1, &materialRange, D3D12_SHADER_VISIBILITY_PIXEL);
 
 	D3D12_ROOT_PARAMETER rootParams[] = {
 		albedoParam,
 		normalParam,
-		positionParam
+		positionParam,
+		materialParam
 	};
 
 	D3D12_ROOT_SIGNATURE_DESC rootDesc = { };
@@ -162,6 +167,7 @@ void ScreenQuad::D3D12Render(D3D12* renderer) {
 	Descriptor albedoDesc = renderer->m_cbvSrvHeap->GetDescriptor(0);
 	Descriptor normalDesc = renderer->m_cbvSrvHeap->GetDescriptor(1);
 	Descriptor positionDesc = renderer->m_cbvSrvHeap->GetDescriptor(2);
+	Descriptor materialDesc = renderer->m_cbvSrvHeap->GetDescriptor(3);
 	this->m_list->OMSetRenderTargets(1, &this->m_rtvDescriptor.cpuHandle, FALSE, nullptr);
 	this->m_list->SetPipelineState(this->m_plState.Get());
 	this->m_list->ClearRenderTargetView(this->m_rtvDescriptor.cpuHandle, RGBA{ 0.f, 0.f, 0.f, 1.f }, 0, nullptr);
@@ -174,6 +180,7 @@ void ScreenQuad::D3D12Render(D3D12* renderer) {
 	this->m_list->SetGraphicsRootDescriptorTable(0, albedoDesc.gpuHandle);
 	this->m_list->SetGraphicsRootDescriptorTable(1, normalDesc.gpuHandle);
 	this->m_list->SetGraphicsRootDescriptorTable(2, positionDesc.gpuHandle);
+	this->m_list->SetGraphicsRootDescriptorTable(3, materialDesc.gpuHandle);
 
 	this->m_list->DrawIndexedInstanced(this->m_indices.size(), 1, 0, 0, 0);
 }

src/public/Core/Renderer/D3D12.h

@@ -65,10 +65,12 @@ class D3D12 : public Renderer {
 	ComPtr<ID3D12Resource> m_albedoBuff;
 	ComPtr<ID3D12Resource> m_uvBuff;
 	ComPtr<ID3D12Resource> m_positionBuff;
+	ComPtr<ID3D12Resource> m_materialBuff;
 
 	UINT m_nAlbedoIndex;
 	UINT m_nUVIndex;
 	UINT m_nPositionIndex;
+	UINT m_nMaterialBuffIndex;
 
 	UINT m_nBackBuffers;