mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-13 06:49:05 -05:00
Remove support for built-in NvTools in favor of Tracy
This commit is contained in:
@@ -189,17 +189,6 @@ if (APPLE)
|
||||
)
|
||||
endif ()
|
||||
|
||||
if (MSVC)
|
||||
option(OPENSPACE_NVTOOLS_ENABLED "Include support for Nvidia Tools Extensions" OFF)
|
||||
set(OPENSPACE_NVTOOLS_PATH "C:/Program Files/NVIDIA Corporation/NvToolsExt")
|
||||
if (OPENSPACE_NVTOOLS_ENABLED)
|
||||
begin_dependency("Nvidia Tools Extension")
|
||||
target_compile_definitions(openspace-core PUBLIC "OPENSPACE_HAS_NVTOOLS")
|
||||
target_include_directories(openspace-core PUBLIC "${OPENSPACE_NVTOOLS_PATH}/include")
|
||||
end_dependency()
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
begin_header("Configuring Modules")
|
||||
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/modules")
|
||||
end_header("End: Configuring Modules")
|
||||
|
||||
@@ -71,10 +71,6 @@
|
||||
#include <modules/spout/spoutwrapper.h>
|
||||
#endif // OPENSPACE_HAS_SPOUT
|
||||
|
||||
#ifdef OPENSPACE_HAS_NVTOOLS
|
||||
#include "nvToolsExt.h"
|
||||
#endif // OPENSPACE_HAS_NVTOOLS
|
||||
|
||||
#ifdef OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION
|
||||
#include <float.h>
|
||||
#endif // OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION
|
||||
@@ -417,9 +413,6 @@ void mainPreSyncFunc() {
|
||||
void mainPostSyncPreDrawFunc() {
|
||||
ZoneScoped;
|
||||
|
||||
#ifdef OPENSPACE_HAS_NVTOOLS
|
||||
nvtxRangePush("postSyncPreDraw");
|
||||
#endif // OPENSPACE_HAS_NVTOOLS
|
||||
LTRACE("main::postSynchronizationPreDraw(begin)");
|
||||
|
||||
global::openSpaceEngine->postSynchronizationPreDraw();
|
||||
@@ -432,10 +425,6 @@ void mainPostSyncPreDrawFunc() {
|
||||
#endif // OPENVR_SUPPORT
|
||||
|
||||
LTRACE("main::postSynchronizationPreDraw(end)");
|
||||
|
||||
#ifdef OPENSPACE_HAS_NVTOOLS
|
||||
nvtxRangePop();
|
||||
#endif // OPENSPACE_HAS_NVTOOLS
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user