diff --git a/CMakeLists.txt b/CMakeLists.txt index 31429d23..1ce25f95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,6 +101,7 @@ set(client_includes ${TRACY_PUBLIC_DIR}/client/TracyArmCpuTable.hpp ${TRACY_PUBLIC_DIR}/client/TracyCallstack.h ${TRACY_PUBLIC_DIR}/client/TracyCallstack.hpp + ${TRACY_PUBLIC_DIR}/client/TracyCpuid.hpp ${TRACY_PUBLIC_DIR}/client/TracyDebug.hpp ${TRACY_PUBLIC_DIR}/client/TracyDxt1.hpp ${TRACY_PUBLIC_DIR}/client/TracyFastVector.hpp @@ -109,6 +110,7 @@ set(client_includes ${TRACY_PUBLIC_DIR}/client/TracyRingBuffer.hpp ${TRACY_PUBLIC_DIR}/client/TracyScoped.hpp ${TRACY_PUBLIC_DIR}/client/TracyStringHelpers.hpp + ${TRACY_PUBLIC_DIR}/client/TracySysPower.hpp ${TRACY_PUBLIC_DIR}/client/TracySysTime.hpp ${TRACY_PUBLIC_DIR}/client/TracySysTrace.hpp ${TRACY_PUBLIC_DIR}/client/TracyThread.hpp) diff --git a/public/tracy/TracyVulkan.hpp b/public/tracy/TracyVulkan.hpp index d60635ae..12162a00 100644 --- a/public/tracy/TracyVulkan.hpp +++ b/public/tracy/TracyVulkan.hpp @@ -55,7 +55,8 @@ namespace tracy Operation(vkEndCommandBuffer) \ Operation(vkGetQueryPoolResults) \ Operation(vkQueueSubmit) \ - Operation(vkQueueWaitIdle) + Operation(vkQueueWaitIdle) \ + Operation(vkResetQueryPool) #define LoadVkDeviceExtensionSymbols(Operation) \ Operation(vkGetCalibratedTimestampsEXT) \ @@ -447,7 +448,9 @@ private: LoadVkDeviceCoreSymbols( VK_LOAD_DEVICE_SYMBOL ) LoadVkDeviceExtensionSymbols( VK_LOAD_DEVICE_SYMBOL ) LoadVkInstanceCoreSymbols( VK_LOAD_INSTANCE_SYMBOL ) +#undef VK_GET_DEVICE_SYMBOL #undef VK_LOAD_DEVICE_SYMBOL +#undef VK_GET_INSTANCE_SYMBOL #undef VK_LOAD_INSTANCE_SYMBOL } #endif