diff --git a/tests/RHI/unit/test_command_list.cpp b/tests/RHI/unit/test_command_list.cpp index e2df8910..97a6d933 100644 --- a/tests/RHI/unit/test_command_list.cpp +++ b/tests/RHI/unit/test_command_list.cpp @@ -435,7 +435,7 @@ TEST_P(RHITestFixture, CommandList_SetShader) { shaderDesc.source.assign(vs, vs + strlen(vs)); } - RHIShader* shader = GetDevice()->CompileShader(shaderDesc); + RHIShader* shader = GetDevice()->CreateShader(shaderDesc); if (shader == nullptr) { return; } diff --git a/tests/RHI/unit/test_compute.cpp b/tests/RHI/unit/test_compute.cpp index 590ec6bc..c0633e99 100644 --- a/tests/RHI/unit/test_compute.cpp +++ b/tests/RHI/unit/test_compute.cpp @@ -22,7 +22,7 @@ TEST_P(RHITestFixture, ComputeShader_Compile_ValidShader) { desc.source.assign(cs, cs + strlen(cs)); } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_TRUE(shader->IsValid()); EXPECT_EQ(shader->GetType(), ShaderType::Compute); @@ -48,7 +48,7 @@ TEST_P(RHITestFixture, ComputeShader_GetType_ReturnsCompute) { desc.source.assign(cs, cs + strlen(cs)); } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_EQ(shader->GetType(), ShaderType::Compute); shader->Shutdown(); @@ -73,7 +73,7 @@ TEST_P(RHITestFixture, ComputeShader_Shutdown_Invalidates) { desc.source.assign(cs, cs + strlen(cs)); } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_TRUE(shader->IsValid()); shader->Shutdown(); @@ -105,7 +105,7 @@ TEST_P(RHITestFixture, PipelineState_SetComputeShader) { shaderDesc.source.assign(cs, cs + strlen(cs)); } - RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); + RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc); if (computeShader != nullptr) { pso->SetComputeShader(computeShader); EXPECT_TRUE(pso->HasComputeShader()); @@ -142,7 +142,7 @@ TEST_P(RHITestFixture, PipelineState_HasComputeShader_ReturnsTrue) { shaderDesc.source.assign(cs, cs + strlen(cs)); } - RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); + RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc); if (computeShader != nullptr) { pso->SetComputeShader(computeShader); EXPECT_TRUE(pso->HasComputeShader()); @@ -179,7 +179,7 @@ TEST_P(RHITestFixture, PipelineState_GetType_Compute) { shaderDesc.source.assign(cs, cs + strlen(cs)); } - RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); + RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc); if (computeShader != nullptr) { pso->SetComputeShader(computeShader); EXPECT_EQ(pso->GetType(), PipelineType::Compute); @@ -214,17 +214,17 @@ TEST_P(RHITestFixture, PipelineState_EnsureValid_Compute) { shaderDesc.source.assign(cs, cs + strlen(cs)); } - RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); + RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc); if (computeShader != nullptr) { pso->SetComputeShader(computeShader); - + if (GetBackendType() == RHIType::D3D12) { EXPECT_FALSE(pso->IsValid()); pso->EnsureValid(); } else { EXPECT_TRUE(pso->IsValid()); } - + computeShader->Shutdown(); delete computeShader; } @@ -236,12 +236,12 @@ TEST_P(RHITestFixture, PipelineState_EnsureValid_Compute) { TEST_P(RHITestFixture, CommandList_Dispatch_Basic) { RHICommandList* cmdList = GetDevice()->CreateCommandList({}); ASSERT_NE(cmdList, nullptr); - + cmdList->Reset(); - + GraphicsPipelineDesc desc = {}; RHIPipelineState* pso = GetDevice()->CreatePipelineState(desc); - + if (pso != nullptr) { ShaderCompileDesc shaderDesc = {}; if (GetBackendType() == RHIType::D3D12) { @@ -259,21 +259,21 @@ TEST_P(RHITestFixture, CommandList_Dispatch_Basic) { shaderDesc.source.assign(cs, cs + strlen(cs)); } - RHIShader* computeShader = GetDevice()->CompileShader(shaderDesc); + RHIShader* computeShader = GetDevice()->CreateShader(shaderDesc); if (computeShader != nullptr) { pso->SetComputeShader(computeShader); cmdList->SetPipelineState(pso); cmdList->Dispatch(1, 1, 1); - + computeShader->Shutdown(); delete computeShader; } - + pso->Shutdown(); delete pso; } - + cmdList->Close(); cmdList->Shutdown(); delete cmdList; -} \ No newline at end of file +} diff --git a/tests/RHI/unit/test_shader.cpp b/tests/RHI/unit/test_shader.cpp index 910bfe8e..cba1805c 100644 --- a/tests/RHI/unit/test_shader.cpp +++ b/tests/RHI/unit/test_shader.cpp @@ -6,7 +6,7 @@ using namespace XCEngine::RHI; TEST_P(RHITestFixture, Shader_Compile_EmptyDesc_ReturnsNullptr) { ShaderCompileDesc desc = {}; - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); EXPECT_EQ(shader, nullptr); } @@ -23,7 +23,7 @@ TEST_P(RHITestFixture, Shader_Compile_ValidVertexShader) { desc.profile = L"vs"; } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_TRUE(shader->IsValid()); EXPECT_EQ(shader->GetType(), ShaderType::Vertex); @@ -46,7 +46,7 @@ TEST_P(RHITestFixture, Shader_Compile_ValidFragmentShader) { desc.profile = L"ps"; } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_TRUE(shader->IsValid()); EXPECT_EQ(shader->GetType(), ShaderType::Fragment); @@ -69,7 +69,7 @@ TEST_P(RHITestFixture, Shader_GetType_VertexShader) { desc.profile = L"vs"; } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_EQ(shader->GetType(), ShaderType::Vertex); shader->Shutdown(); @@ -90,7 +90,7 @@ TEST_P(RHITestFixture, Shader_GetType_FragmentShader) { desc.profile = L"ps"; } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_EQ(shader->GetType(), ShaderType::Fragment); shader->Shutdown(); @@ -111,7 +111,7 @@ TEST_P(RHITestFixture, Shader_GetNativeHandle_ValidShader) { desc.profile = L"vs"; } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { void* handle = shader->GetNativeHandle(); EXPECT_NE(handle, nullptr); @@ -133,7 +133,7 @@ TEST_P(RHITestFixture, Shader_Shutdown_Invalidates) { desc.profile = L"vs"; } - RHIShader* shader = GetDevice()->CompileShader(desc); + RHIShader* shader = GetDevice()->CreateShader(desc); if (shader != nullptr) { EXPECT_TRUE(shader->IsValid()); shader->Shutdown();