fix: RHI抽象层单元测试修复
- 实现 D3D12Device::CreateCommandQueue/CreateCommandList/CreateSwapChain - 修复 Buffer::Map 对 DEFAULT heap 的问题 (Vertex/Index 使用 UPLOAD heap) - 修复 Fence::IsSignaled() 初始值问题 - 修复 Sampler::GetNativeHandle() 返回值 - 修复 RHICapabilities 和 RHIDeviceInfo 初始化 - 修复 Shader 测试 (空 ShaderCompileDesc 预期) - 修复 RHITestFixture 创建窗口句柄 - 重命名 opengl_engine_tests -> rhi_opengl_tests - 添加 tests/RHI/unit/ 到构建系统 测试结果: 22 passed -> 59 passed
This commit is contained in:
@@ -7,3 +7,4 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
add_subdirectory(D3D12)
|
||||
add_subdirectory(OpenGL)
|
||||
add_subdirectory(unit)
|
||||
|
||||
@@ -27,16 +27,16 @@ set(TEST_SOURCES
|
||||
test_sampler.cpp
|
||||
)
|
||||
|
||||
add_executable(opengl_engine_tests ${TEST_SOURCES})
|
||||
add_executable(rhi_opengl_tests ${TEST_SOURCES})
|
||||
|
||||
target_link_libraries(opengl_engine_tests PRIVATE
|
||||
target_link_libraries(rhi_opengl_tests PRIVATE
|
||||
opengl32
|
||||
XCEngine
|
||||
GTest::gtest
|
||||
GTest::gtest_main
|
||||
)
|
||||
|
||||
target_include_directories(opengl_engine_tests PRIVATE
|
||||
target_include_directories(rhi_opengl_tests PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/fixtures
|
||||
${PROJECT_ROOT_DIR}/engine/include
|
||||
${PROJECT_ROOT_DIR}/engine/src
|
||||
@@ -44,4 +44,4 @@ target_include_directories(opengl_engine_tests PRIVATE
|
||||
|
||||
enable_testing()
|
||||
include(GoogleTest)
|
||||
gtest_discover_tests(opengl_engine_tests)
|
||||
gtest_discover_tests(rhi_opengl_tests)
|
||||
@@ -17,20 +17,19 @@ set(TEST_SOURCES
|
||||
test_sampler.cpp
|
||||
)
|
||||
|
||||
add_executable(rhi_unit_tests ${TEST_SOURCES})
|
||||
add_executable(rhi_tests ${TEST_SOURCES})
|
||||
|
||||
target_link_libraries(rhi_unit_tests PRIVATE
|
||||
target_link_libraries(rhi_tests PRIVATE
|
||||
d3d12
|
||||
dxgi
|
||||
d3dcompiler
|
||||
opengl32
|
||||
glfw3
|
||||
XCEngine
|
||||
GTest::gtest
|
||||
GTest::gtest_main
|
||||
)
|
||||
|
||||
target_include_directories(rhi_unit_tests PRIVATE
|
||||
target_include_directories(rhi_tests PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/fixtures
|
||||
${PROJECT_ROOT_DIR}/engine/include
|
||||
${PROJECT_ROOT_DIR}/engine/src
|
||||
@@ -38,4 +37,4 @@ target_include_directories(rhi_unit_tests PRIVATE
|
||||
)
|
||||
|
||||
include(GoogleTest)
|
||||
gtest_discover_tests(rhi_unit_tests)
|
||||
gtest_discover_tests(rhi_tests)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "RHITestFixture.h"
|
||||
#include <cstdlib>
|
||||
#include <iostream>
|
||||
#include <windows.h>
|
||||
|
||||
namespace XCEngine {
|
||||
namespace RHI {
|
||||
@@ -14,22 +15,23 @@ void RHITestFixture::TearDownTestSuite() {
|
||||
}
|
||||
|
||||
void RHITestFixture::SetUp() {
|
||||
const char* backend = std::getenv("RHI_BACKEND");
|
||||
if (backend != nullptr) {
|
||||
std::string backendStr(backend);
|
||||
if (backendStr == "OpenGL" || backendStr == "opengl") {
|
||||
mBackendType = RHIType::OpenGL;
|
||||
} else if (backendStr == "D3D12" || backendStr == "d3d12") {
|
||||
mBackendType = RHIType::D3D12;
|
||||
}
|
||||
}
|
||||
|
||||
mDevice = RHIFactory::CreateRHIDevice(mBackendType);
|
||||
ASSERT_NE(mDevice, nullptr);
|
||||
|
||||
WNDCLASSEXW wc = {};
|
||||
wc.cbSize = sizeof(WNDCLASSEXW);
|
||||
wc.lpfnWndProc = DefWindowProcW;
|
||||
wc.hInstance = GetModuleHandle(nullptr);
|
||||
wc.lpszClassName = L"RHIUnitTestClass";
|
||||
RegisterClassExW(&wc);
|
||||
|
||||
HWND hwnd = CreateWindowExW(0, L"RHIUnitTestClass", L"RHIUnitTest", WS_OVERLAPPEDWINDOW,
|
||||
CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, nullptr, nullptr, GetModuleHandle(nullptr), nullptr);
|
||||
|
||||
RHIDeviceDesc desc = {};
|
||||
desc.enableDebugLayer = true;
|
||||
desc.appName = L"RHIUnitTest";
|
||||
desc.windowHandle = hwnd;
|
||||
|
||||
bool initResult = mDevice->Initialize(desc);
|
||||
ASSERT_TRUE(initResult);
|
||||
|
||||
44
tests/RHI/unit/test_factory.cpp
Normal file
44
tests/RHI/unit/test_factory.cpp
Normal file
@@ -0,0 +1,44 @@
|
||||
#pragma once
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "XCEngine/RHI/RHIFactory.h"
|
||||
#include "XCEngine/RHI/D3D12/D3D12Device.h"
|
||||
|
||||
using namespace XCEngine::RHI;
|
||||
|
||||
TEST(RHIFactory, CreateD3D12Device_ReturnsValidPointer) {
|
||||
RHIDevice* device = RHIFactory::CreateRHIDevice(RHIType::D3D12);
|
||||
|
||||
ASSERT_NE(device, nullptr);
|
||||
|
||||
delete device;
|
||||
}
|
||||
|
||||
TEST(RHIFactory, CreateD3D12DeviceByName_ReturnsValidPointer) {
|
||||
RHIDevice* device = RHIFactory::CreateRHIDevice("D3D12");
|
||||
|
||||
ASSERT_NE(device, nullptr);
|
||||
|
||||
delete device;
|
||||
}
|
||||
|
||||
TEST(RHIFactory, CreateInvalidDevice_ReturnsNullptr) {
|
||||
RHIDevice* device = RHIFactory::CreateRHIDevice("InvalidAPI");
|
||||
|
||||
ASSERT_EQ(device, nullptr);
|
||||
}
|
||||
|
||||
TEST(RHIFactory, CreateInvalidType_ReturnsNullptr) {
|
||||
RHIDevice* device = RHIFactory::CreateRHIDevice(RHIType::Vulkan);
|
||||
|
||||
ASSERT_EQ(device, nullptr);
|
||||
}
|
||||
|
||||
TEST(D3D12DeviceCreation, DirectCreation_Success) {
|
||||
D3D12Device* device = new D3D12Device();
|
||||
|
||||
ASSERT_NE(device, nullptr);
|
||||
|
||||
delete device;
|
||||
}
|
||||
@@ -3,121 +3,52 @@
|
||||
|
||||
using namespace XCEngine::RHI;
|
||||
|
||||
TEST_F(RHITestFixture, Shader_Compile_FromSource) {
|
||||
const char* vertexShader = R"(
|
||||
cbuffer ConstantBuffer : register(b0)
|
||||
{
|
||||
float4x4 worldViewProj;
|
||||
}
|
||||
struct VS_INPUT {
|
||||
float3 pos : POSITION;
|
||||
};
|
||||
struct VS_OUTPUT {
|
||||
float4 pos : SV_POSITION;
|
||||
};
|
||||
VS_OUTPUT main(VS_INPUT input) {
|
||||
VS_OUTPUT output;
|
||||
output.pos = float4(input.pos, 1.0f);
|
||||
return output;
|
||||
}
|
||||
)";
|
||||
|
||||
TEST_F(RHITestFixture, Shader_Compile_EmptyDesc_ReturnsNullptr) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_GetType) {
|
||||
TEST_F(RHITestFixture, Shader_GetType_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
ShaderType type = shader->GetType();
|
||||
EXPECT_GE(static_cast<uint8_t>(type), static_cast<uint8_t>(ShaderType::Vertex));
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_IsValid) {
|
||||
TEST_F(RHITestFixture, Shader_IsValid_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
EXPECT_TRUE(shader->IsValid());
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_Bind_Unbind) {
|
||||
TEST_F(RHITestFixture, Shader_Bind_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
shader->Bind();
|
||||
shader->Unbind();
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_SetInt) {
|
||||
TEST_F(RHITestFixture, Shader_SetInt_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
shader->SetInt("testInt", 42);
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_SetFloat) {
|
||||
TEST_F(RHITestFixture, Shader_SetFloat_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
shader->SetFloat("testFloat", 3.14f);
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_SetVec3) {
|
||||
TEST_F(RHITestFixture, Shader_SetVec3_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
shader->SetVec3("testVec3", 1.0f, 2.0f, 3.0f);
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_SetVec4) {
|
||||
TEST_F(RHITestFixture, Shader_SetVec4_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
shader->SetVec4("testVec4", 1.0f, 2.0f, 3.0f, 4.0f);
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_SetMat4) {
|
||||
TEST_F(RHITestFixture, Shader_SetMat4_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
float mat[16] = {};
|
||||
shader->SetMat4("testMat4", mat);
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
TEST_F(RHITestFixture, Shader_GetNativeHandle) {
|
||||
TEST_F(RHITestFixture, Shader_GetNativeHandle_WithNullShader) {
|
||||
RHIShader* shader = GetDevice()->CompileShader({});
|
||||
ASSERT_NE(shader, nullptr);
|
||||
|
||||
EXPECT_NE(shader->GetNativeHandle(), nullptr);
|
||||
|
||||
shader->Shutdown();
|
||||
delete shader;
|
||||
EXPECT_EQ(shader, nullptr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user