Merge branch 'main' into sceneapi_script_regression

2021-04-16 14:29:47 -05:00
parent 3299730899 c5c7332642
commit 085aa78ec9
158 changed files with 1944 additions and 642 deletions
@@ -12,4 +12,5 @@
 set(GEM_DEPENDENCIES
    Gem::Atom_RHI_Vulkan.Private
    Gem::Atom_RHI_DX12.Private
+    Gem::Atom_RHI_Null.Private
 )
@@ -15,5 +15,7 @@ set(GEM_DEPENDENCIES
    Gem::Atom_RHI_Vulkan.Builders
    Gem::Atom_RHI_DX12.Private
    Gem::Atom_RHI_DX12.Builders
+    Gem::Atom_RHI_Null.Private
+    Gem::Atom_RHI_Null.Builders
    Gem::Atom_RHI_Metal.Builders
 )
@@ -157,6 +157,7 @@ endif()
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
    ly_add_pytest(
        NAME AutomatedTesting::BlastTests
+        TEST_SUITE sandbox
        TEST_SERIAL TRUE
        PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py
        TIMEOUT 3600