diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d26714a60..ca6c1ccb60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 01663ead0a..adbc555f08 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -71,10 +71,6 @@ #include #endif // OPENSPACE_HAS_SPOUT -#ifdef OPENSPACE_HAS_NVTOOLS -#include "nvToolsExt.h" -#endif // OPENSPACE_HAS_NVTOOLS - #ifdef OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION #include #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 }