feat: 实现 D3D12PipelineState 并替换到 tests/D3D12
- 添加 D3D12PipelineState.h/cpp - 全局变量 gPipelineState - 使用 D3D12PipelineState::Initialize 替代原生 CreateGraphicsPipelineState - 测试通过
This commit is contained in:
@@ -89,6 +89,7 @@ add_library(XCEngine STATIC
|
|||||||
include/XCEngine/RHI/D3D12/D3D12CommandAllocator.h
|
include/XCEngine/RHI/D3D12/D3D12CommandAllocator.h
|
||||||
include/XCEngine/RHI/D3D12/D3D12CommandList.h
|
include/XCEngine/RHI/D3D12/D3D12CommandList.h
|
||||||
include/XCEngine/RHI/D3D12/D3D12DescriptorHeap.h
|
include/XCEngine/RHI/D3D12/D3D12DescriptorHeap.h
|
||||||
|
include/XCEngine/RHI/D3D12/D3D12PipelineState.h
|
||||||
include/XCEngine/RHI/D3D12/D3D12RootSignature.h
|
include/XCEngine/RHI/D3D12/D3D12RootSignature.h
|
||||||
include/XCEngine/RHI/D3D12/D3D12SwapChain.h
|
include/XCEngine/RHI/D3D12/D3D12SwapChain.h
|
||||||
include/XCEngine/RHI/D3D12/D3D12Fence.h
|
include/XCEngine/RHI/D3D12/D3D12Fence.h
|
||||||
@@ -98,6 +99,7 @@ add_library(XCEngine STATIC
|
|||||||
src/RHI/D3D12CommandAllocator.cpp
|
src/RHI/D3D12CommandAllocator.cpp
|
||||||
src/RHI/D3D12CommandList.cpp
|
src/RHI/D3D12CommandList.cpp
|
||||||
src/RHI/D3D12DescriptorHeap.cpp
|
src/RHI/D3D12DescriptorHeap.cpp
|
||||||
|
src/RHI/D3D12PipelineState.cpp
|
||||||
src/RHI/D3D12RootSignature.cpp
|
src/RHI/D3D12RootSignature.cpp
|
||||||
src/RHI/D3D12SwapChain.cpp
|
src/RHI/D3D12SwapChain.cpp
|
||||||
src/RHI/D3D12Fence.cpp
|
src/RHI/D3D12Fence.cpp
|
||||||
|
|||||||
28
engine/include/XCEngine/RHI/D3D12/D3D12PipelineState.h
Normal file
28
engine/include/XCEngine/RHI/D3D12/D3D12PipelineState.h
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <d3d12.h>
|
||||||
|
#include <wrl/client.h>
|
||||||
|
|
||||||
|
#include "D3D12Enum.h"
|
||||||
|
|
||||||
|
using Microsoft::WRL::ComPtr;
|
||||||
|
|
||||||
|
namespace XCEngine {
|
||||||
|
namespace RHI {
|
||||||
|
|
||||||
|
class D3D12PipelineState {
|
||||||
|
public:
|
||||||
|
D3D12PipelineState();
|
||||||
|
~D3D12PipelineState();
|
||||||
|
|
||||||
|
bool Initialize(ID3D12Device* device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC& desc);
|
||||||
|
void Shutdown();
|
||||||
|
|
||||||
|
ID3D12PipelineState* GetPipelineState() const { return m_pipelineState.Get(); }
|
||||||
|
|
||||||
|
private:
|
||||||
|
ComPtr<ID3D12PipelineState> m_pipelineState;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace RHI
|
||||||
|
} // namespace XCEngine
|
||||||
26
engine/src/RHI/D3D12PipelineState.cpp
Normal file
26
engine/src/RHI/D3D12PipelineState.cpp
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
#include "XCEngine/RHI/D3D12/D3D12PipelineState.h"
|
||||||
|
|
||||||
|
namespace XCEngine {
|
||||||
|
namespace RHI {
|
||||||
|
|
||||||
|
D3D12PipelineState::D3D12PipelineState() {
|
||||||
|
}
|
||||||
|
|
||||||
|
D3D12PipelineState::~D3D12PipelineState() {
|
||||||
|
Shutdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool D3D12PipelineState::Initialize(ID3D12Device* device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC& desc) {
|
||||||
|
HRESULT hResult = device->CreateGraphicsPipelineState(&desc, IID_PPV_ARGS(&m_pipelineState));
|
||||||
|
if (FAILED(hResult)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void D3D12PipelineState::Shutdown() {
|
||||||
|
m_pipelineState.Reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace RHI
|
||||||
|
} // namespace XCEngine
|
||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "XCEngine/RHI/D3D12/D3D12Fence.h"
|
#include "XCEngine/RHI/D3D12/D3D12Fence.h"
|
||||||
#include "XCEngine/RHI/D3D12/D3D12SwapChain.h"
|
#include "XCEngine/RHI/D3D12/D3D12SwapChain.h"
|
||||||
#include "XCEngine/RHI/D3D12/D3D12RootSignature.h"
|
#include "XCEngine/RHI/D3D12/D3D12RootSignature.h"
|
||||||
|
#include "XCEngine/RHI/D3D12/D3D12PipelineState.h"
|
||||||
#include "XCEngine/RHI/D3D12/D3D12Screenshot.h"
|
#include "XCEngine/RHI/D3D12/D3D12Screenshot.h"
|
||||||
#include "XCEngine/Debug/Logger.h"
|
#include "XCEngine/Debug/Logger.h"
|
||||||
#include "XCEngine/Debug/ConsoleLogSink.h"
|
#include "XCEngine/Debug/ConsoleLogSink.h"
|
||||||
@@ -67,6 +68,7 @@ UINT gDSVDescriptorSize = 0;
|
|||||||
XCEngine::RHI::D3D12CommandAllocator gCommandAllocator;
|
XCEngine::RHI::D3D12CommandAllocator gCommandAllocator;
|
||||||
XCEngine::RHI::D3D12CommandList gCommandList;
|
XCEngine::RHI::D3D12CommandList gCommandList;
|
||||||
XCEngine::RHI::D3D12RootSignature gRootSignature;
|
XCEngine::RHI::D3D12RootSignature gRootSignature;
|
||||||
|
XCEngine::RHI::D3D12PipelineState gPipelineState;
|
||||||
|
|
||||||
// 同步对象
|
// 同步对象
|
||||||
XCEngine::RHI::D3D12Fence gFence;
|
XCEngine::RHI::D3D12Fence gFence;
|
||||||
@@ -556,11 +558,11 @@ ID3D12PipelineState* CreatePSO(ID3D12RootSignature* inID3D12RootSignature,
|
|||||||
psoDesc.NumRenderTargets = 1;
|
psoDesc.NumRenderTargets = 1;
|
||||||
ID3D12PipelineState* d3d12PSO = nullptr;
|
ID3D12PipelineState* d3d12PSO = nullptr;
|
||||||
|
|
||||||
HRESULT hResult = gDevice.GetDevice()->CreateGraphicsPipelineState(&psoDesc, IID_PPV_ARGS(&d3d12PSO));
|
gPipelineState.Initialize(gDevice.GetDevice(), psoDesc);
|
||||||
if (FAILED(hResult)) {
|
if (!gPipelineState.GetPipelineState()) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
return d3d12PSO;
|
return gPipelineState.GetPipelineState();
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
//=================================================================================
|
||||||
|
|||||||
Reference in New Issue
Block a user