ssdfasd
eb4840eac4
1. D3D12CommandQueue::ExecuteCommandLists修复：确保正确调用GetNativeHandle() 2. 集成测试修复：传递&gCommandList而不是gCommandList.GetCommandList() 3. CMakeLists.txt修复：添加renderdoc.dll到所有D3D12/OpenGL集成测试的POST_BUILD命令 测试验证： - 单元测试：144/144通过 - D3D12集成测试：minimal/quad/triangle/sphere全部通过 - OpenGL集成测试：minimal/quad/triangle/sphere全部通过
61 lines
1.7 KiB
CMake
61 lines
1.7 KiB
CMake
cmake_minimum_required(VERSION 3.15)
|
|
|
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
project(d3d12_triangle_test)
|
|
|
|
set(ENGINE_ROOT_DIR ${CMAKE_SOURCE_DIR}/engine)
|
|
|
|
add_executable(d3d12_triangle_test
|
|
WIN32
|
|
main.cpp
|
|
)
|
|
|
|
target_include_directories(d3d12_triangle_test PRIVATE
|
|
${CMAKE_CURRENT_SOURCE_DIR}
|
|
${ENGINE_ROOT_DIR}/include
|
|
)
|
|
|
|
target_compile_definitions(d3d12_triangle_test PRIVATE
|
|
UNICODE
|
|
_UNICODE
|
|
)
|
|
|
|
target_link_libraries(d3d12_triangle_test PRIVATE
|
|
d3d12
|
|
dxgi
|
|
d3dcompiler
|
|
winmm
|
|
XCEngine
|
|
)
|
|
|
|
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_test>/Res
|
|
)
|
|
|
|
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_test>/
|
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
|
${CMAKE_SOURCE_DIR}/tests/rhi/d3d12/integration/run_integration_test.py
|
|
$<TARGET_FILE_DIR:d3d12_triangle_test>/
|
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
|
${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
|
|
$<TARGET_FILE_DIR:d3d12_triangle_test>/
|
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
|
${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
|
|
$<TARGET_FILE_DIR:d3d12_triangle_test>/
|
|
)
|
|
|
|
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_test>
|
|
)
|