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

test: Update RHI unit tests to use CreateShader API

Browse Source 
Rename CompileShader to CreateShader in all RHI unit tests:
- test_command_list.cpp
- test_compute.cpp
- test_shader.cpp
This commit is contained in:
ssdfasd
2026-03-25 19:01:59 +08:00
parent 81532983f0
commit 6bbd35873b
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/RHI/unit/test_command_list.cpp
View File

@@ -435,7 +435,7 @@ TEST_P(RHITestFixture, CommandList_SetShader) {
shaderDesc.source.assign(vs, vs + strlen(vs)); shaderDesc.source.assign(vs, vs + strlen(vs));
} }
RHIShader* shader = GetDevice()->CompileShader(shaderDesc); RHIShader* shader = GetDevice()->CreateShader(shaderDesc);
if (shader == nullptr) { if (shader == nullptr) {
return; return;
} }

34
tests/RHI/unit/test_compute.cpp
View File

@@ -22,7 +22,7 @@ TEST_P(RHITestFixture, ComputeShader_Compile_ValidShader) {
desc.source.assign(cs, cs + strlen(cs)); desc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid()); EXPECT_TRUE(shader->IsValid());
EXPECT_EQ(shader->GetType(), ShaderType::Compute); EXPECT_EQ(shader->GetType(), ShaderType::Compute);
@@ -48,7 +48,7 @@ TEST_P(RHITestFixture, ComputeShader_GetType_ReturnsCompute) {
desc.source.assign(cs, cs + strlen(cs)); desc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_EQ(shader->GetType(), ShaderType::Compute); EXPECT_EQ(shader->GetType(), ShaderType::Compute);
shader->Shutdown(); shader->Shutdown();
@@ -73,7 +73,7 @@ TEST_P(RHITestFixture, ComputeShader_Shutdown_Invalidates) {
desc.source.assign(cs, cs + strlen(cs)); desc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid()); EXPECT_TRUE(shader->IsValid());
shader->Shutdown(); shader->Shutdown();
@@ -105,7 +105,7 @@ TEST_P(RHITestFixture, PipelineState_SetComputeShader) {
shaderDesc.source.assign(cs, cs + strlen(cs)); shaderDesc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc);
if (computeShader != nullptr) { if (computeShader != nullptr) {
pso->SetComputeShader(computeShader); pso->SetComputeShader(computeShader);
EXPECT_TRUE(pso->HasComputeShader()); EXPECT_TRUE(pso->HasComputeShader());
@@ -142,7 +142,7 @@ TEST_P(RHITestFixture, PipelineState_HasComputeShader_ReturnsTrue) {
shaderDesc.source.assign(cs, cs + strlen(cs)); shaderDesc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc);
if (computeShader != nullptr) { if (computeShader != nullptr) {
pso->SetComputeShader(computeShader); pso->SetComputeShader(computeShader);
EXPECT_TRUE(pso->HasComputeShader()); EXPECT_TRUE(pso->HasComputeShader());
@@ -179,7 +179,7 @@ TEST_P(RHITestFixture, PipelineState_GetType_Compute) {
shaderDesc.source.assign(cs, cs + strlen(cs)); shaderDesc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc);
if (computeShader != nullptr) { if (computeShader != nullptr) {
pso->SetComputeShader(computeShader); pso->SetComputeShader(computeShader);
EXPECT_EQ(pso->GetType(), PipelineType::Compute); EXPECT_EQ(pso->GetType(), PipelineType::Compute);
@@ -214,17 +214,17 @@ TEST_P(RHITestFixture, PipelineState_EnsureValid_Compute) {
shaderDesc.source.assign(cs, cs + strlen(cs)); shaderDesc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc);
if (computeShader != nullptr) { if (computeShader != nullptr) {
pso->SetComputeShader(computeShader); pso->SetComputeShader(computeShader);
if (GetBackendType() == RHIType::D3D12) { if (GetBackendType() == RHIType::D3D12) {
EXPECT_FALSE(pso->IsValid()); EXPECT_FALSE(pso->IsValid());
pso->EnsureValid(); pso->EnsureValid();
} else { } else {
EXPECT_TRUE(pso->IsValid()); EXPECT_TRUE(pso->IsValid());
} }
computeShader->Shutdown(); computeShader->Shutdown();
delete computeShader; delete computeShader;
} }
@@ -236,12 +236,12 @@ TEST_P(RHITestFixture, PipelineState_EnsureValid_Compute) {
TEST_P(RHITestFixture, CommandList_Dispatch_Basic) { TEST_P(RHITestFixture, CommandList_Dispatch_Basic) {
RHICommandList* cmdList = GetDevice()->CreateCommandList({}); RHICommandList* cmdList = GetDevice()->CreateCommandList({});
ASSERT_NE(cmdList, nullptr); ASSERT_NE(cmdList, nullptr);
cmdList->Reset(); cmdList->Reset();
GraphicsPipelineDesc desc = {}; GraphicsPipelineDesc desc = {};
RHIPipelineState* pso = GetDevice()->CreatePipelineState(desc); RHIPipelineState* pso = GetDevice()->CreatePipelineState(desc);
if (pso != nullptr) { if (pso != nullptr) {
ShaderCompileDesc shaderDesc = {}; ShaderCompileDesc shaderDesc = {};
if (GetBackendType() == RHIType::D3D12) { if (GetBackendType() == RHIType::D3D12) {
@@ -259,21 +259,21 @@ TEST_P(RHITestFixture, CommandList_Dispatch_Basic) {
shaderDesc.source.assign(cs, cs + strlen(cs)); shaderDesc.source.assign(cs, cs + strlen(cs));
} }
RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc);
if (computeShader != nullptr) { if (computeShader != nullptr) {
pso->SetComputeShader(computeShader); pso->SetComputeShader(computeShader);
cmdList->SetPipelineState(pso); cmdList->SetPipelineState(pso);
cmdList->Dispatch(1, 1, 1); cmdList->Dispatch(1, 1, 1);
computeShader->Shutdown(); computeShader->Shutdown();
delete computeShader; delete computeShader;
} }
pso->Shutdown(); pso->Shutdown();
delete pso; delete pso;
} }
cmdList->Close(); cmdList->Close();
cmdList->Shutdown(); cmdList->Shutdown();
delete cmdList; delete cmdList;
} }

14
tests/RHI/unit/test_shader.cpp
View File

@@ -6,7 +6,7 @@ using namespace XCEngine::RHI;
TEST_P(RHITestFixture, Shader_Compile_EmptyDesc_ReturnsNullptr) { TEST_P(RHITestFixture, Shader_Compile_EmptyDesc_ReturnsNullptr) {
ShaderCompileDesc desc = {}; ShaderCompileDesc desc = {};
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
EXPECT_EQ(shader, nullptr); EXPECT_EQ(shader, nullptr);
} }
@@ -23,7 +23,7 @@ TEST_P(RHITestFixture, Shader_Compile_ValidVertexShader) {
desc.profile = L"vs"; desc.profile = L"vs";
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid()); EXPECT_TRUE(shader->IsValid());
EXPECT_EQ(shader->GetType(), ShaderType::Vertex); EXPECT_EQ(shader->GetType(), ShaderType::Vertex);
@@ -46,7 +46,7 @@ TEST_P(RHITestFixture, Shader_Compile_ValidFragmentShader) {
desc.profile = L"ps"; desc.profile = L"ps";
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid()); EXPECT_TRUE(shader->IsValid());
EXPECT_EQ(shader->GetType(), ShaderType::Fragment); EXPECT_EQ(shader->GetType(), ShaderType::Fragment);
@@ -69,7 +69,7 @@ TEST_P(RHITestFixture, Shader_GetType_VertexShader) {
desc.profile = L"vs"; desc.profile = L"vs";
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_EQ(shader->GetType(), ShaderType::Vertex); EXPECT_EQ(shader->GetType(), ShaderType::Vertex);
shader->Shutdown(); shader->Shutdown();
@@ -90,7 +90,7 @@ TEST_P(RHITestFixture, Shader_GetType_FragmentShader) {
desc.profile = L"ps"; desc.profile = L"ps";
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_EQ(shader->GetType(), ShaderType::Fragment); EXPECT_EQ(shader->GetType(), ShaderType::Fragment);
shader->Shutdown(); shader->Shutdown();
@@ -111,7 +111,7 @@ TEST_P(RHITestFixture, Shader_GetNativeHandle_ValidShader) {
desc.profile = L"vs"; desc.profile = L"vs";
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
void* handle = shader->GetNativeHandle(); void* handle = shader->GetNativeHandle();
EXPECT_NE(handle, nullptr); EXPECT_NE(handle, nullptr);
@@ -133,7 +133,7 @@ TEST_P(RHITestFixture, Shader_Shutdown_Invalidates) {
desc.profile = L"vs"; desc.profile = L"vs";
} }
RHIShader* shader = GetDevice()->CompileShader(desc); RHIShader* shader = GetDevice()->CreateShader(desc);
if (shader != nullptr) { if (shader != nullptr) {
EXPECT_TRUE(shader->IsValid()); EXPECT_TRUE(shader->IsValid());
shader->Shutdown(); shader->Shutdown();