Skip to content

Commit d42b95a

Browse files
committed
Merge branch 'external-texture-render-test' into partner-test-1652-1646
# Conflicts: # Apps/HeadlessScreenshotApp/Win32/App.cpp # Apps/PrecompiledShaderTest/Source/App.cpp # Apps/StyleTransferApp/Win32/App.cpp
2 parents 8a519b7 + ac6ba6e commit d42b95a

25 files changed

Lines changed: 1416 additions & 253 deletions

Apps/UnitTests/CMakeLists.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ set(BABYLONJS_MATERIALS_ASSETS
1111
"../node_modules/babylonjs-materials/babylonjs.materials.js")
1212

1313
set(TEST_ASSETS
14+
"JavaScript/dist/tests.externalTexture.render.js"
1415
"JavaScript/dist/tests.javaScript.all.js"
1516
"JavaScript/dist/tests.shaderCache.basicScene.js")
1617

1718
set(SOURCES
1819
"Source/App.h"
1920
"Source/App.cpp"
2021
"Source/Tests.ExternalTexture.cpp"
22+
"Source/Tests.ExternalTexture.Render.cpp"
2123
"Source/Tests.JavaScript.cpp"
2224
"Source/Tests.ShaderCache.cpp"
2325
"Source/Tests.UniformPadding.cpp"
@@ -26,8 +28,7 @@ set(SOURCES
2628

2729
if(GRAPHICS_API STREQUAL "D3D11")
2830
set(SOURCES ${SOURCES}
29-
"Source/Tests.Device.${GRAPHICS_API}.cpp"
30-
"Source/Tests.ExternalTexture.${GRAPHICS_API}.cpp")
31+
"Source/Tests.Device.${GRAPHICS_API}.cpp")
3132
endif()
3233

3334
if(APPLE)
@@ -43,7 +44,11 @@ elseif(UNIX AND NOT ANDROID)
4344
set(SOURCES ${SOURCES} "Source/App.X11.cpp")
4445
set(ADDITIONAL_COMPILE_DEFINITIONS PRIVATE SKIP_EXTERNAL_TEXTURE_TESTS)
4546
elseif(WIN32)
46-
set(SOURCES ${SOURCES} "Source/App.Win32.cpp")
47+
set(SOURCES ${SOURCES}
48+
"Source/App.Win32.cpp"
49+
"Source/RenderDoc.h"
50+
"Source/RenderDoc.cpp")
51+
set(ADDITIONAL_COMPILE_DEFINITIONS ${ADDITIONAL_COMPILE_DEFINITIONS} PRIVATE HAS_RENDERDOC)
4752
endif()
4853

4954
add_executable(UnitTests ${BABYLONJS_ASSETS} ${BABYLONJS_MATERIALS_ASSETS} ${TEST_ASSETS} ${SOURCES})
@@ -65,6 +70,10 @@ target_link_libraries(UnitTests
6570

6671
target_compile_definitions(UnitTests PRIVATE ${ADDITIONAL_COMPILE_DEFINITIONS})
6772

73+
if(GRAPHICS_API STREQUAL "D3D12")
74+
target_compile_definitions(UnitTests PRIVATE SKIP_RENDER_TESTS)
75+
endif()
76+
6877
add_test(NAME UnitTests COMMAND UnitTests)
6978

7079
# See https://gitlab.kitware.com/cmake/cmake/-/issues/23543

0 commit comments

Comments
 (0)