xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(rhi): let pipeline layouts own set metadata

Browse Source
This commit is contained in:
ssdfasd
2026-03-26 12:40:49 +08:00
parent 36d2f479cd
commit 476a56724f
6 changed files with 270 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
tests/RHI/unit/test_pipeline_layout.cpp
View File

@@ -1,5 +1,6 @@
#include "fixtures/RHITestFixture.h"
#include "XCEngine/RHI/D3D12/D3D12PipelineLayout.h"
#include "XCEngine/RHI/OpenGL/OpenGLPipelineLayout.h"
#include "XCEngine/RHI/RHIPipelineLayout.h"
#include "XCEngine/RHI/RHIDescriptorSet.h"
@@ -146,6 +147,62 @@ TEST_P(RHITestFixture, PipelineLayout_DescriptorSetAllocation) {
delete layout;
}
TEST_P(RHITestFixture, PipelineLayout_DeepCopiesSetLayoutsAndInfersCounts) {
DescriptorSetLayoutBinding set0Bindings[1] = {};
set0Bindings[0].binding = 0;
set0Bindings[0].type = static_cast<uint32_t>(DescriptorType::CBV);
set0Bindings[0].count = 1;
DescriptorSetLayoutBinding set1Bindings[2] = {};
set1Bindings[0].binding = 1;
set1Bindings[0].type = static_cast<uint32_t>(DescriptorType::SRV);
set1Bindings[0].count = 2;
set1Bindings[1].binding = 3;
set1Bindings[1].type = static_cast<uint32_t>(DescriptorType::Sampler);
set1Bindings[1].count = 1;
DescriptorSetLayoutDesc setLayouts[2] = {};
setLayouts[0].bindings = set0Bindings;
setLayouts[0].bindingCount = 1;
setLayouts[1].bindings = set1Bindings;
setLayouts[1].bindingCount = 2;
RHIPipelineLayoutDesc desc = {};
desc.setLayouts = setLayouts;
desc.setLayoutCount = 2;
RHIPipelineLayout* layout = GetDevice()->CreatePipelineLayout(desc);
ASSERT_NE(layout, nullptr);
set0Bindings[0].binding = 99;
set1Bindings[0].count = 7;
setLayouts[1].bindingCount = 0;
const RHIPipelineLayoutDesc* storedDesc = nullptr;
if (GetBackendType() == RHIType::D3D12) {
storedDesc = &static_cast<D3D12PipelineLayout*>(layout)->GetDesc();
} else {
storedDesc = &static_cast<OpenGLPipelineLayout*>(layout)->GetDesc();
}
ASSERT_NE(storedDesc, nullptr);
ASSERT_EQ(storedDesc->setLayoutCount, 2u);
ASSERT_NE(storedDesc->setLayouts, nullptr);
ASSERT_EQ(storedDesc->setLayouts[0].bindingCount, 1u);
ASSERT_EQ(storedDesc->setLayouts[1].bindingCount, 2u);
ASSERT_NE(storedDesc->setLayouts[0].bindings, nullptr);
ASSERT_NE(storedDesc->setLayouts[1].bindings, nullptr);
EXPECT_EQ(storedDesc->setLayouts[0].bindings[0].binding, 0u);
EXPECT_EQ(storedDesc->setLayouts[1].bindings[0].count, 2u);
EXPECT_EQ(storedDesc->constantBufferCount, 1u);
EXPECT_EQ(storedDesc->textureCount, 2u);
EXPECT_EQ(storedDesc->samplerCount, 1u);
EXPECT_EQ(storedDesc->uavCount, 0u);
layout->Shutdown();
delete layout;
}
TEST_P(RHITestFixture, PipelineLayout_D3D12TracksDistinctBindingClasses) {
if (GetBackendType() != RHIType::D3D12) {
GTEST_SKIP() << "D3D12-specific root parameter verification";
@@ -182,3 +239,59 @@ TEST_P(RHITestFixture, PipelineLayout_D3D12TracksDistinctBindingClasses) {
layout->Shutdown();
delete layout;
}
TEST_P(RHITestFixture, PipelineLayout_D3D12InfersBindingClassesFromSetLayouts) {
if (GetBackendType() != RHIType::D3D12) {
GTEST_SKIP() << "D3D12-specific root parameter verification";
}
DescriptorSetLayoutBinding set0Bindings[1] = {};
set0Bindings[0].binding = 0;
set0Bindings[0].type = static_cast<uint32_t>(DescriptorType::CBV);
set0Bindings[0].count = 1;
DescriptorSetLayoutBinding set1Bindings[1] = {};
set1Bindings[0].binding = 0;
set1Bindings[0].type = static_cast<uint32_t>(DescriptorType::SRV);
set1Bindings[0].count = 1;
DescriptorSetLayoutBinding set2Bindings[1] = {};
set2Bindings[0].binding = 0;
set2Bindings[0].type = static_cast<uint32_t>(DescriptorType::UAV);
set2Bindings[0].count = 1;
DescriptorSetLayoutBinding set3Bindings[1] = {};
set3Bindings[0].binding = 0;
set3Bindings[0].type = static_cast<uint32_t>(DescriptorType::Sampler);
set3Bindings[0].count = 1;
DescriptorSetLayoutDesc setLayouts[4] = {};
setLayouts[0].bindings = set0Bindings;
setLayouts[0].bindingCount = 1;
setLayouts[1].bindings = set1Bindings;
setLayouts[1].bindingCount = 1;
setLayouts[2].bindings = set2Bindings;
setLayouts[2].bindingCount = 1;
setLayouts[3].bindings = set3Bindings;
setLayouts[3].bindingCount = 1;
RHIPipelineLayoutDesc desc = {};
desc.setLayouts = setLayouts;
desc.setLayoutCount = 4;
RHIPipelineLayout* layout = GetDevice()->CreatePipelineLayout(desc);
ASSERT_NE(layout, nullptr);
auto* d3d12Layout = static_cast<D3D12PipelineLayout*>(layout);
EXPECT_TRUE(d3d12Layout->HasConstantBufferBinding(0));
EXPECT_TRUE(d3d12Layout->HasShaderResourceTable());
EXPECT_TRUE(d3d12Layout->HasUnorderedAccessTable());
EXPECT_TRUE(d3d12Layout->HasSamplerTable());
EXPECT_EQ(d3d12Layout->GetDesc().constantBufferCount, 1u);
EXPECT_EQ(d3d12Layout->GetDesc().textureCount, 1u);
EXPECT_EQ(d3d12Layout->GetDesc().uavCount, 1u);
EXPECT_EQ(d3d12Layout->GetDesc().samplerCount, 1u);
layout->Shutdown();
delete layout;
}