Clean up vestigial PIX references in Atom

Signed-off-by: Jeremy Ong <jcong@amazon.com>
This commit is contained in:
Jeremy Ong
2021-08-18 17:31:28 -06:00
parent ec6e9407f6
commit f1349a3f60
4 changed files with 4 additions and 13 deletions
@@ -200,9 +200,9 @@ namespace UnitTest
// TODO:BUDGETS disabled until profiler budgets system comes online
// TEST_F(TimeDataStatisticsManagerTest, Test)
{
// {
// run();
}
// }
//End of all Tests of TimeDataStatisticsManagerTest
}//namespace UnitTest
-10
View File
@@ -11,13 +11,6 @@ ly_get_list_relative_pal_filename(pal_source_dir ${CMAKE_CURRENT_LIST_DIR}/Sourc
include(${pal_source_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) # PAL_TRAIT_ATOM_RHI_DX12_SUPPORTED
if(PAL_TRAIT_PIX_AVAILABLE)
set(PIX_BUILD_DEPENDENCY "3rdParty::pix")
else()
set(PIX_BUILD_DEPENDENCY "")
endif()
if(PAL_TRAIT_AFTERMATH_AVAILABLE)
set(USE_NSIGHT_AFTERMATH_DEFINE $<IF:$<CONFIG:release>,"","USE_NSIGHT_AFTERMATH">)
set(AFTERMATH_BUILD_DEPENDENCY "3rdParty::Aftermath")
@@ -90,7 +83,6 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
AZ::AzCore
${PIX_BUILD_DEPENDENCY}
Gem::Atom_RHI.Reflect
)
@@ -116,7 +108,6 @@ ly_add_target(
Gem::Atom_RHI_DX12.Reflect
3rdParty::d3dx12
${AFTERMATH_BUILD_DEPENDENCY}
${PIX_BUILD_DEPENDENCY}
COMPILE_DEFINITIONS
PRIVATE
${USE_NSIGHT_AFTERMATH_DEFINE}
@@ -142,7 +133,6 @@ ly_add_target(
Gem::Atom_RHI.Public
Gem::Atom_RHI_DX12.Reflect
Gem::Atom_RHI_DX12.Private.Static
${PIX_BUILD_DEPENDENCY}
)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -18,7 +18,6 @@ if(d3d12_dll)
set(PAL_TRAIT_ATOM_RHI_DX12_SUPPORTED TRUE)
endif()
set(PAL_TRAIT_PIX_AVAILABLE FALSE)
unset(pix3_header CACHE)
set(PAL_TRAIT_AFTERMATH_AVAILABLE FALSE)
@@ -7,6 +7,8 @@
*/
#pragma once
// NOTE: We are careful to include platform headers *before* we include AzCore/Debug/Profiler.h to ensure that d3d12 symbols
// are defined prior to the inclusion of the pix3 runtime.
#include <RHI/DX12.h>
#include <Atom/RHI/Fence.h>