mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #578 from theblackunknown/machizaud/fix-missing-headers

Browse Source 
Couple of fixes
This commit is contained in:
Bartosz Taudul 2023-06-23 15:02:22 +02:00 committed by GitHub
commit 0cb6d8588b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -101,6 +101,7 @@ set(client_includes
${TRACY_PUBLIC_DIR}/client/TracyArmCpuTable.hpp ${TRACY_PUBLIC_DIR}/client/TracyArmCpuTable.hpp
${TRACY_PUBLIC_DIR}/client/TracyCallstack.h ${TRACY_PUBLIC_DIR}/client/TracyCallstack.h
${TRACY_PUBLIC_DIR}/client/TracyCallstack.hpp ${TRACY_PUBLIC_DIR}/client/TracyCallstack.hpp
${TRACY_PUBLIC_DIR}/client/TracyCpuid.hpp
${TRACY_PUBLIC_DIR}/client/TracyDebug.hpp ${TRACY_PUBLIC_DIR}/client/TracyDebug.hpp
${TRACY_PUBLIC_DIR}/client/TracyDxt1.hpp ${TRACY_PUBLIC_DIR}/client/TracyDxt1.hpp
${TRACY_PUBLIC_DIR}/client/TracyFastVector.hpp ${TRACY_PUBLIC_DIR}/client/TracyFastVector.hpp
@ -109,6 +110,7 @@ set(client_includes
${TRACY_PUBLIC_DIR}/client/TracyRingBuffer.hpp ${TRACY_PUBLIC_DIR}/client/TracyRingBuffer.hpp
${TRACY_PUBLIC_DIR}/client/TracyScoped.hpp ${TRACY_PUBLIC_DIR}/client/TracyScoped.hpp
${TRACY_PUBLIC_DIR}/client/TracyStringHelpers.hpp ${TRACY_PUBLIC_DIR}/client/TracyStringHelpers.hpp
${TRACY_PUBLIC_DIR}/client/TracySysPower.hpp
${TRACY_PUBLIC_DIR}/client/TracySysTime.hpp ${TRACY_PUBLIC_DIR}/client/TracySysTime.hpp
${TRACY_PUBLIC_DIR}/client/TracySysTrace.hpp ${TRACY_PUBLIC_DIR}/client/TracySysTrace.hpp
${TRACY_PUBLIC_DIR}/client/TracyThread.hpp) ${TRACY_PUBLIC_DIR}/client/TracyThread.hpp)

5
public/tracy/TracyVulkan.hpp
View File

@ -55,7 +55,8 @@ namespace tracy
Operation(vkEndCommandBuffer) \ Operation(vkEndCommandBuffer) \
Operation(vkGetQueryPoolResults) \ Operation(vkGetQueryPoolResults) \
Operation(vkQueueSubmit) \ Operation(vkQueueSubmit) \
Operation(vkQueueWaitIdle) Operation(vkQueueWaitIdle) \
Operation(vkResetQueryPool)
#define LoadVkDeviceExtensionSymbols(Operation) \ #define LoadVkDeviceExtensionSymbols(Operation) \
Operation(vkGetCalibratedTimestampsEXT) \ Operation(vkGetCalibratedTimestampsEXT) \
@ -447,7 +448,9 @@ private:
LoadVkDeviceCoreSymbols( VK_LOAD_DEVICE_SYMBOL ) LoadVkDeviceCoreSymbols( VK_LOAD_DEVICE_SYMBOL )
LoadVkDeviceExtensionSymbols( VK_LOAD_DEVICE_SYMBOL ) LoadVkDeviceExtensionSymbols( VK_LOAD_DEVICE_SYMBOL )
LoadVkInstanceCoreSymbols( VK_LOAD_INSTANCE_SYMBOL ) LoadVkInstanceCoreSymbols( VK_LOAD_INSTANCE_SYMBOL )
#undef VK_GET_DEVICE_SYMBOL
#undef VK_LOAD_DEVICE_SYMBOL #undef VK_LOAD_DEVICE_SYMBOL
#undef VK_GET_INSTANCE_SYMBOL
#undef VK_LOAD_INSTANCE_SYMBOL #undef VK_LOAD_INSTANCE_SYMBOL
} }
#endif #endif