1
0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00

Merge branch 'master' into master

This commit is contained in:
Andrew Depke
2020-06-08 23:50:20 -06:00
committed by GitHub
15 changed files with 595 additions and 17 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ namespace tracy
constexpr unsigned Lz4CompressBound( unsigned isize ) { return isize + ( isize / 255 ) + 16; }
enum : uint32_t { ProtocolVersion = 33 };
enum : uint32_t { ProtocolVersion = 34 };
enum : uint32_t { BroadcastVersion = 1 };
using lz4sz_t = uint32_t;
+1
View File
@@ -264,6 +264,7 @@ enum class GpuContextType : uint8_t
Invalid,
OpenGl,
Vulkan,
OpenCL,
Direct3D12
};