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/OpenGL/integration/minimal/CMakeLists.txt
+++ b/tests/RHI/OpenGL/integration/minimal/CMakeLists.txt
@@ -2,53 +2,53 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(OpenGL_Minimal)
+project(opengl_minimal_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)
 set(PACKAGE_DIR ${CMAKE_SOURCE_DIR}/tests/opengl/package)

-add_executable(OpenGL_Minimal
+add_executable(opengl_minimal_test
    WIN32
    main.cpp
    ${PACKAGE_DIR}/src/glad.c
 )

-target_include_directories(OpenGL_Minimal PRIVATE
+target_include_directories(opengl_minimal_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
    ${PACKAGE_DIR}/include
 )

-target_link_libraries(OpenGL_Minimal PRIVATE
+target_link_libraries(opengl_minimal_test PRIVATE
    opengl32
    XCEngine
 )

-target_compile_definitions(OpenGL_Minimal PRIVATE
+target_compile_definitions(opengl_minimal_test PRIVATE
    UNICODE
    _UNICODE
 )

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

-add_test(NAME OpenGL_Minimal_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:OpenGL_Minimal>/run_integration_test.py
-        $<TARGET_FILE:OpenGL_Minimal>
+add_test(NAME opengl_minimal_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:opengl_minimal_test>/run_integration_test.py
+        $<TARGET_FILE:opengl_minimal_test>
        minimal.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        5
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:OpenGL_Minimal>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:opengl_minimal_test>
 )
--- a/tests/RHI/OpenGL/integration/quad/CMakeLists.txt
+++ b/tests/RHI/OpenGL/integration/quad/CMakeLists.txt
@@ -2,56 +2,56 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(OpenGL_Quad)
+project(opengl_quad_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)
 set(PACKAGE_DIR ${CMAKE_SOURCE_DIR}/tests/opengl/package)

-add_executable(OpenGL_Quad
+add_executable(opengl_quad_test
    WIN32
    main.cpp
    ${PACKAGE_DIR}/src/glad.c
 )

-target_include_directories(OpenGL_Quad PRIVATE
+target_include_directories(opengl_quad_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
    ${PACKAGE_DIR}/include
 )

-target_link_libraries(OpenGL_Quad PRIVATE
+target_link_libraries(opengl_quad_test PRIVATE
    opengl32
    XCEngine
 )

-target_compile_definitions(OpenGL_Quad PRIVATE
+target_compile_definitions(opengl_quad_test PRIVATE
    UNICODE
    _UNICODE
 )

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

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

-add_test(NAME OpenGL_Quad_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:OpenGL_Quad>/run_integration_test.py
-        $<TARGET_FILE:OpenGL_Quad>
+add_test(NAME opengl_quad_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:opengl_quad_test>/run_integration_test.py
+        $<TARGET_FILE:opengl_quad_test>
        quad.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        5
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:OpenGL_Quad>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:opengl_quad_test>
 )
--- a/tests/RHI/OpenGL/integration/sphere/CMakeLists.txt
+++ b/tests/RHI/OpenGL/integration/sphere/CMakeLists.txt
@@ -2,56 +2,56 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(OpenGL_Sphere)
+project(opengl_sphere_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)
 set(PACKAGE_DIR ${CMAKE_SOURCE_DIR}/tests/opengl/package)

-add_executable(OpenGL_Sphere
+add_executable(opengl_sphere_test
    WIN32
    main.cpp
    ${PACKAGE_DIR}/src/glad.c
 )

-target_include_directories(OpenGL_Sphere PRIVATE
+target_include_directories(opengl_sphere_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
    ${PACKAGE_DIR}/include
 )

-target_link_libraries(OpenGL_Sphere PRIVATE
+target_link_libraries(opengl_sphere_test PRIVATE
    opengl32
    XCEngine
 )

-target_compile_definitions(OpenGL_Sphere PRIVATE
+target_compile_definitions(opengl_sphere_test PRIVATE
    UNICODE
    _UNICODE
 )

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

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

-add_test(NAME OpenGL_Sphere_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:OpenGL_Sphere>/run_integration_test.py
-        $<TARGET_FILE:OpenGL_Sphere>
+add_test(NAME opengl_sphere_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:opengl_sphere_test>/run_integration_test.py
+        $<TARGET_FILE:opengl_sphere_test>
        sphere.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        5
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:OpenGL_Sphere>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:opengl_sphere_test>
 )
--- a/tests/RHI/OpenGL/integration/triangle/CMakeLists.txt
+++ b/tests/RHI/OpenGL/integration/triangle/CMakeLists.txt
@@ -2,56 +2,56 @@ cmake_minimum_required(VERSION 3.15)

 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

-project(OpenGL_Triangle)
+project(opengl_triangle_test)

 set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)
 set(PACKAGE_DIR ${CMAKE_SOURCE_DIR}/tests/opengl/package)

-add_executable(OpenGL_Triangle
+add_executable(opengl_triangle_test
    WIN32
    main.cpp
    ${PACKAGE_DIR}/src/glad.c
 )

-target_include_directories(OpenGL_Triangle PRIVATE
+target_include_directories(opengl_triangle_test PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${ENGINE_ROOT_DIR}/include
    ${PACKAGE_DIR}/include
 )

-target_link_libraries(OpenGL_Triangle PRIVATE
+target_link_libraries(opengl_triangle_test PRIVATE
    opengl32
    XCEngine
 )

-target_compile_definitions(OpenGL_Triangle PRIVATE
+target_compile_definitions(opengl_triangle_test PRIVATE
    UNICODE
    _UNICODE
 )

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

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

-add_test(NAME OpenGL_Triangle_Integration
-    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:OpenGL_Triangle>/run_integration_test.py
-        $<TARGET_FILE:OpenGL_Triangle>
+add_test(NAME opengl_triangle_test
+    COMMAND ${Python3_EXECUTABLE} $<TARGET_FILE_DIR:opengl_triangle_test>/run_integration_test.py
+        $<TARGET_FILE:opengl_triangle_test>
        triangle.ppm
        ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
        5
-    WORKING_DIRECTORY $<TARGET_FILE_DIR:OpenGL_Triangle>
+    WORKING_DIRECTORY $<TARGET_FILE_DIR:opengl_triangle_test>
 )