fix: RHI单元测试修复与命名规范统一

RHI抽象层测试修复: - OpenGL Shader: 空描述符正确返回nullptr - OpenGL Texture: 修复TextureType映射(case 2/3) - OpenGL Buffer: 设置stride和state支持 - OpenGL Texture: 添加Format和State支持 - OpenGL SwapChain: 修复IsFullscreen硬编码false问题命名规范统一( snake_case + _test后缀): - D3D12_Minimal -> d3d12_minimal_test - D3D12_Triangle -> d3d12_triangle_test - D3D12_Quad -> d3d12_quad_test - D3D12_Sphere -> d3d12_sphere_test - OpenGL_Minimal -> opengl_minimal_test - OpenGL_Triangle -> opengl_triangle_test - OpenGL_Quad -> opengl_quad_test - OpenGL_Sphere -> opengl_sphere_test - CTest名称去掉_Integration后缀测试结果: 138个测试中从21个失败减少到16个失败
2026-03-23 20:32:33 +08:00
parent df7764e972
commit bc6b47ffcf
15 changed files with 302 additions and 164 deletions
--- a/tests/RHI/D3D12/integration/minimal/CMakeLists.txt
+++ b/tests/RHI/D3D12/integration/minimal/CMakeLists.txt
@@ -2,26 +2,26 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(D3D12_Minimal)
+project(d3d12_minimal_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)

-add_executable(D3D12_Minimal
+add_executable(d3d12_minimal_test
    WIN32
    main.cpp
 )

-target_include_directories(D3D12_Minimal PRIVATE
+target_include_directories(d3d12_minimal_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
 )

-target_compile_definitions(D3D12_Minimal PRIVATE
+target_compile_definitions(d3d12_minimal_test PRIVATE
    UNICODE
    _UNICODE
 )

-target_link_libraries(D3D12_Minimal PRIVATE
+target_link_libraries(d3d12_minimal_test PRIVATE
    d3d12
    dxgi
    d3dcompiler
@@ -29,26 +29,26 @@ target_link_libraries(D3D12_Minimal PRIVATE
    XCEngine
 )

-add_custom_command(TARGET D3D12_Minimal POST_BUILD
+add_custom_command(TARGET d3d12_minimal_test POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/compare_ppm.py
-        $<TARGET_FILE_DIR:D3D12_Minimal>/
+        $<TARGET_FILE_DIR:d3d12_minimal_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/run_integration_test.py
-        $<TARGET_FILE_DIR:D3D12_Minimal>/
+        $<TARGET_FILE_DIR:d3d12_minimal_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
-        $<TARGET_FILE_DIR:D3D12_Minimal>/
+        $<TARGET_FILE_DIR:d3d12_minimal_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
-        $<TARGET_FILE_DIR:D3D12_Minimal>/
+        $<TARGET_FILE_DIR:d3d12_minimal_test>/
 )

-add_test(NAME D3D12_Minimal_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:D3D12_Minimal>/run_integration_test.py
-        $<TARGET_FILE:D3D12_Minimal>
+add_test(NAME d3d12_minimal_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:d3d12_minimal_test>/run_integration_test.py
+        $<TARGET_FILE:d3d12_minimal_test>
        minimal.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        0
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:D3D12_Minimal>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:d3d12_minimal_test>
 )
--- a/tests/RHI/D3D12/integration/quad/CMakeLists.txt
+++ b/tests/RHI/D3D12/integration/quad/CMakeLists.txt
@@ -2,29 +2,29 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(D3D12_Quad)
+project(d3d12_quad_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)

-add_executable(D3D12_Quad
+add_executable(d3d12_quad_test
    WIN32
    main.cpp
 )

-set_target_properties(D3D12_Quad PROPERTIES LINK_FLAGS "/INCREMENTAL:NO")
+set_target_properties(d3d12_quad_test PROPERTIES LINK_FLAGS "/INCREMENTAL:NO")

-target_include_directories(D3D12_Quad PRIVATE
+target_include_directories(d3d12_quad_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
    ${ENGINE_ROOT_DIR}
 )

-target_compile_definitions(D3D12_Quad PRIVATE
+target_compile_definitions(d3d12_quad_test PRIVATE
    UNICODE
    _UNICODE
 )

-target_link_libraries(D3D12_Quad PRIVATE
+target_link_libraries(d3d12_quad_test PRIVATE
    d3d12
    dxgi
    d3dcompiler
@@ -32,29 +32,29 @@ target_link_libraries(D3D12_Quad PRIVATE
    XCEngine
 )

-add_custom_command(TARGET D3D12_Quad POST_BUILD
+add_custom_command(TARGET d3d12_quad_test POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_directory
        ${CMAKE_CURRENT_SOURCE_DIR}/Res
-        $<TARGET_FILE_DIR:D3D12_Quad>/Res
+        $<TARGET_FILE_DIR:d3d12_quad_test>/Res
 )

-add_custom_command(TARGET D3D12_Quad POST_BUILD
+add_custom_command(TARGET d3d12_quad_test POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/compare_ppm.py
-        $<TARGET_FILE_DIR:D3D12_Quad>/
+        $<TARGET_FILE_DIR:d3d12_quad_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/run_integration_test.py
-        $<TARGET_FILE_DIR:D3D12_Quad>/
+        $<TARGET_FILE_DIR:d3d12_quad_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
-        $<TARGET_FILE_DIR:D3D12_Quad>/
+        $<TARGET_FILE_DIR:d3d12_quad_test>/
 )

-add_test(NAME D3D12_Quad_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:D3D12_Quad>/run_integration_test.py
-        $<TARGET_FILE:D3D12_Quad>
+add_test(NAME d3d12_quad_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:d3d12_quad_test>/run_integration_test.py
+        $<TARGET_FILE:d3d12_quad_test>
        quad.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        0
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:D3D12_Quad>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:d3d12_quad_test>
 )
--- a/tests/RHI/D3D12/integration/sphere/CMakeLists.txt
+++ b/tests/RHI/D3D12/integration/sphere/CMakeLists.txt
@@ -2,27 +2,27 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(D3D12_Sphere)
+project(d3d12_sphere_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)

-add_executable(D3D12_Sphere
+add_executable(d3d12_sphere_test
    WIN32
    main.cpp
 )

-target_include_directories(D3D12_Sphere PRIVATE
+target_include_directories(d3d12_sphere_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
    ${ENGINE_ROOT_DIR}
 )

-target_compile_definitions(D3D12_Sphere PRIVATE
+target_compile_definitions(d3d12_sphere_test PRIVATE
    UNICODE
    _UNICODE
 )

-target_link_libraries(D3D12_Sphere PRIVATE
+target_link_libraries(d3d12_sphere_test PRIVATE
    d3d12
    dxgi
    d3dcompiler
@@ -30,29 +30,29 @@ target_link_libraries(D3D12_Sphere PRIVATE
    XCEngine
 )

-add_custom_command(TARGET D3D12_Sphere POST_BUILD
+add_custom_command(TARGET d3d12_sphere_test POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_directory
        ${CMAKE_CURRENT_SOURCE_DIR}/Res
-        $<TARGET_FILE_DIR:D3D12_Sphere>/Res
+        $<TARGET_FILE_DIR:d3d12_sphere_test>/Res
 )

-add_custom_command(TARGET D3D12_Sphere POST_BUILD
+add_custom_command(TARGET d3d12_sphere_test POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/compare_ppm.py
-        $<TARGET_FILE_DIR:D3D12_Sphere>/
+        $<TARGET_FILE_DIR:d3d12_sphere_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/run_integration_test.py
-        $<TARGET_FILE_DIR:D3D12_Sphere>/
+        $<TARGET_FILE_DIR:d3d12_sphere_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
-        $<TARGET_FILE_DIR:D3D12_Sphere>/
+        $<TARGET_FILE_DIR:d3d12_sphere_test>/
 )

-add_test(NAME D3D12_Sphere_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:D3D12_Sphere>/run_integration_test.py
-        $<TARGET_FILE:D3D12_Sphere>
+add_test(NAME d3d12_sphere_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:d3d12_sphere_test>/run_integration_test.py
+        $<TARGET_FILE:d3d12_sphere_test>
        sphere.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        0
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:D3D12_Sphere>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:d3d12_sphere_test>
 )
--- a/tests/RHI/D3D12/integration/triangle/CMakeLists.txt
+++ b/tests/RHI/D3D12/integration/triangle/CMakeLists.txt
@@ -2,26 +2,26 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(D3D12_Triangle)
+project(d3d12_triangle_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)

-add_executable(D3D12_Triangle
+add_executable(d3d12_triangle_test
    WIN32
    main.cpp
 )

-target_include_directories(D3D12_Triangle PRIVATE
+target_include_directories(d3d12_triangle_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
 )

-target_compile_definitions(D3D12_Triangle PRIVATE
+target_compile_definitions(d3d12_triangle_test PRIVATE
    UNICODE
    _UNICODE
 )

-target_link_libraries(D3D12_Triangle PRIVATE
+target_link_libraries(d3d12_triangle_test PRIVATE
    d3d12
    dxgi
    d3dcompiler
@@ -29,29 +29,29 @@ target_link_libraries(D3D12_Triangle PRIVATE
    XCEngine
 )

-add_custom_command(TARGET D3D12_Triangle POST_BUILD
+add_custom_command(TARGET d3d12_triangle_test POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_directory
        ${CMAKE_CURRENT_SOURCE_DIR}/Res
-        $<TARGET_FILE_DIR:D3D12_Triangle>/Res
+        $<TARGET_FILE_DIR:d3d12_triangle_test>/Res
 )

-add_custom_command(TARGET D3D12_Triangle POST_BUILD
+add_custom_command(TARGET d3d12_triangle_test POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/compare_ppm.py
-        $<TARGET_FILE_DIR:D3D12_Triangle>/
+        $<TARGET_FILE_DIR:d3d12_triangle_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/run_integration_test.py
-        $<TARGET_FILE_DIR:D3D12_Triangle>/
+        $<TARGET_FILE_DIR:d3d12_triangle_test>/
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
-        $<TARGET_FILE_DIR:D3D12_Triangle>/
+        $<TARGET_FILE_DIR:d3d12_triangle_test>/
 )

-add_test(NAME D3D12_Triangle_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:D3D12_Triangle>/run_integration_test.py
-        $<TARGET_FILE:D3D12_Triangle>
+add_test(NAME d3d12_triangle_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:d3d12_triangle_test>/run_integration_test.py
+        $<TARGET_FILE:d3d12_triangle_test>
        triangle.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        0
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:D3D12_Triangle>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:d3d12_triangle_test>
 )