Skip to content

Commit 3e567f6

Browse files
fran6cofran6co
committed
[tracy] update to 0.13
1 parent c2aeddd commit 3e567f6

11 files changed

Lines changed: 281 additions & 24 deletions

‎ports/tidy-html5/fix-version.cmake‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 8efec25..6007610 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -700,4 +700,13 @@ install(FILES
6+
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
7+
)
8+
9+
+
10+
+include(CMakePackageConfigHelpers)
11+
+
12+
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-tidy-html5Config-version.cmake"
13+
+ VERSION "${LIBTIDY_VERSION}"
14+
+ COMPATIBILITY SameMajorVersion
15+
+)
16+
+
17+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-tidy-html5Config-version.cmake DESTINATION ${LIB_INSTALL_DIR}/cmake/unofficial-tidy-html5)
18+
# eof

‎ports/tidy-html5/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ vcpkg_from_github(
1010
debug-postfix.patch
1111
fix_unsupport_func_uwp.patch
1212
cmake_find_package_support.patch
13+
fix-version.cmake
1314
)
1415

1516
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB)

‎ports/tidy-html5/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tidy-html5",
33
"version": "5.8.0",
4-
"port-version": 2,
4+
"port-version": 3,
55
"description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
66
"homepage": "https://www.html-tidy.org",
77
"license": null,

‎ports/tracy/downgrade-capstone-5.patch‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
diff --git a/profiler/src/profiler/TracySourceView.cpp b/profiler/src/profiler/TracySourceView.cpp
2+
index c79948b8..7bd717b7 100644
3+
--- a/profiler/src/profiler/TracySourceView.cpp
4+
+++ b/profiler/src/profiler/TracySourceView.cpp
5+
@@ -713,7 +713,7 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
6+
rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
7+
break;
8+
case CpuArchArm64:
9+
- rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
10+
+ rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
11+
break;
12+
default:
13+
assert( false );
14+
@@ -778,9 +778,9 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
15+
}
16+
break;
17+
case CpuArchArm64:
18+
- if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
19+
+ if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
20+
{
21+
- jumpAddr = (uint64_t)detail.aarch64.operands[0].imm;
22+
+ jumpAddr = (uint64_t)detail.arm64.operands[0].imm;
23+
}
24+
break;
25+
default:
26+
@@ -865,18 +865,18 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
27+
}
28+
break;
29+
case CpuArchArm64:
30+
- for( uint8_t i=0; i<detail.aarch64.op_count; i++ )
31+
+ for( uint8_t i=0; i<detail.arm64.op_count; i++ )
32+
{
33+
uint8_t type = 0;
34+
- switch( detail.aarch64.operands[i].type )
35+
+ switch( detail.arm64.operands[i].type )
36+
{
37+
- case AARCH64_OP_IMM:
38+
+ case ARM64_OP_IMM:
39+
type = 0;
40+
break;
41+
- case AARCH64_OP_REG:
42+
+ case ARM64_OP_REG:
43+
type = 1;
44+
break;
45+
- case AARCH64_OP_MEM:
46+
+ case ARM64_OP_MEM:
47+
type = 2;
48+
break;
49+
default:
50+
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
51+
index b1dffe1a..cb1e179f 100644
52+
--- a/server/TracyWorker.cpp
53+
+++ b/server/TracyWorker.cpp
54+
@@ -3912,7 +3912,7 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
55+
rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
56+
break;
57+
case CpuArchArm64:
58+
- rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
59+
+ rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
60+
break;
61+
default:
62+
assert( false );
63+
@@ -3952,9 +3952,9 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
64+
}
65+
break;
66+
case CpuArchArm64:
67+
- if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
68+
+ if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
69+
{
70+
- callAddr = (uint64_t)detail.aarch64.operands[0].imm;
71+
+ callAddr = (uint64_t)detail.arm64.operands[0].imm;
72+
}
73+
break;
74+
default:

‎ports/tracy/fix-vendor-versions.patch‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
diff --git a/cmake/server.cmake b/cmake/server.cmake
2+
index a76d1c13..d8c1a26f 100644
3+
--- a/cmake/server.cmake
4+
+++ b/cmake/server.cmake
5+
@@ -29,7 +29,7 @@ list(TRANSFORM TRACY_SERVER_SOURCES PREPEND "${TRACY_SERVER_DIR}/")
6+
7+
add_library(TracyServer STATIC EXCLUDE_FROM_ALL ${TRACY_COMMON_SOURCES} ${TRACY_SERVER_SOURCES})
8+
target_include_directories(TracyServer PUBLIC ${TRACY_COMMON_DIR} ${TRACY_SERVER_DIR})
9+
-target_link_libraries(TracyServer PUBLIC TracyCapstone libzstd PPQSort::PPQSort)
10+
+target_link_libraries(TracyServer PUBLIC TracyCapstone zstd::libzstd PPQSort::PPQSort)
11+
if(NO_STATISTICS)
12+
target_compile_definitions(TracyServer PUBLIC TRACY_NO_STATISTICS)
13+
endif()
14+
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
15+
index adbd5de9..fbca0f83 100644
16+
--- a/cmake/vendor.cmake
17+
+++ b/cmake/vendor.cmake
18+
@@ -134,16 +134,6 @@ target_include_directories(TracyGetOpt PUBLIC ${GETOPT_DIR})
19+
20+
# ImGui
21+
22+
-CPMAddPackage(
23+
- NAME ImGui
24+
- GITHUB_REPOSITORY ocornut/imgui
25+
- GIT_TAG v1.92.5-docking
26+
- DOWNLOAD_ONLY TRUE
27+
- PATCHES
28+
- "${CMAKE_CURRENT_LIST_DIR}/imgui-emscripten.patch"
29+
- "${CMAKE_CURRENT_LIST_DIR}/imgui-loader.patch"
30+
-)
31+
-
32+
set(IMGUI_SOURCES
33+
imgui_widgets.cpp
34+
imgui_draw.cpp
35+
@@ -204,7 +194,7 @@ CPMAddPackage(
36+
# json
37+
38+
CPMAddPackage(
39+
- NAME json
40+
+ NAME nlohmann_json
41+
GITHUB_REPOSITORY nlohmann/json
42+
GIT_TAG v3.12.0
43+
EXCLUDE_FROM_ALL TRUE
44+
@@ -239,7 +229,7 @@ if(NOT EMSCRIPTEN)
45+
# tidy
46+
47+
CPMAddPackage(
48+
- NAME tidy
49+
+ NAME unofficial-tidy-html5
50+
GITHUB_REPOSITORY htacg/tidy-html5
51+
GIT_TAG 5.8.0
52+
PATCHES
53+
diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt
54+
index 1681a64b..21dadb5a 100644
55+
--- a/profiler/CMakeLists.txt
56+
+++ b/profiler/CMakeLists.txt
57+
@@ -244,7 +244,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
58+
TracyImGui
59+
Threads::Threads
60+
nlohmann_json::nlohmann_json
61+
- md4c
62+
+ md4c::md4c
63+
)
64+
target_include_directories(${PROJECT_NAME} PRIVATE
65+
${tidy_SOURCE_DIR}/include
66+
@@ -256,10 +256,10 @@ target_include_directories(${PROJECT_NAME} PRIVATE
67+
if(NOT EMSCRIPTEN)
68+
target_link_libraries(${PROJECT_NAME} PRIVATE
69+
TracyLibcurl
70+
- base64
71+
- tidy-static
72+
+ aklomp::base64
73+
+ unofficial::tidy-html5::tidy
74+
TracyPugixml
75+
- usearch
76+
+ usearch::usearch
77+
)
78+
endif()
79+

‎ports/tracy/imgui-loader.patch‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
diff --git a/backends/imgui_impl_opengl3_loader.h b/backends/imgui_impl_opengl3_loader.h
2+
index 2c80cc598..1177da586 100644
3+
--- a/backends/imgui_impl_opengl3_loader.h
4+
+++ b/backends/imgui_impl_opengl3_loader.h
5+
@@ -182,6 +182,7 @@ typedef khronos_uint8_t GLubyte;
6+
#define GL_EXTENSIONS 0x1F03
7+
#define GL_NEAREST 0x2600
8+
#define GL_LINEAR 0x2601
9+
+#define GL_LINEAR_MIPMAP_LINEAR 0x2703
10+
#define GL_TEXTURE_MAG_FILTER 0x2800
11+
#define GL_TEXTURE_MIN_FILTER 0x2801
12+
#define GL_TEXTURE_WRAP_S 0x2802
13+
@@ -246,8 +247,10 @@ GLAPI void APIENTRY glGenTextures (GLsizei n, GLuint *textures);
14+
#define GL_TEXTURE0 0x84C0
15+
#define GL_ACTIVE_TEXTURE 0x84E0
16+
typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
17+
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
18+
#ifdef GL_GLEXT_PROTOTYPES
19+
GLAPI void APIENTRY glActiveTexture (GLenum texture);
20+
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
21+
#endif
22+
#endif /* GL_VERSION_1_3 */
23+
#ifndef GL_VERSION_1_4
24+
@@ -490,7 +493,7 @@ GL3W_API GL3WglProc imgl3wGetProcAddress(const char *proc);
25+
26+
/* gl3w internal state */
27+
union ImGL3WProcs {
28+
- GL3WglProc ptr[63];
29+
+ GL3WglProc ptr[64];
30+
struct {
31+
PFNGLACTIVETEXTUREPROC ActiveTexture;
32+
PFNGLATTACHSHADERPROC AttachShader;
33+
@@ -506,6 +509,7 @@ union ImGL3WProcs {
34+
PFNGLCLEARPROC Clear;
35+
PFNGLCLEARCOLORPROC ClearColor;
36+
PFNGLCOMPILESHADERPROC CompileShader;
37+
+ PFNGLCOMPRESSEDTEXIMAGE2DPROC CompressedTexImage2D;
38+
PFNGLCREATEPROGRAMPROC CreateProgram;
39+
PFNGLCREATESHADERPROC CreateShader;
40+
PFNGLDELETEBUFFERSPROC DeleteBuffers;
41+
@@ -575,6 +579,7 @@ GL3W_API extern union ImGL3WProcs imgl3wProcs;
42+
#define glClear imgl3wProcs.gl.Clear
43+
#define glClearColor imgl3wProcs.gl.ClearColor
44+
#define glCompileShader imgl3wProcs.gl.CompileShader
45+
+#define glCompressedTexImage2D imgl3wProcs.gl.CompressedTexImage2D
46+
#define glCreateProgram imgl3wProcs.gl.CreateProgram
47+
#define glCreateShader imgl3wProcs.gl.CreateShader
48+
#define glDeleteBuffers imgl3wProcs.gl.DeleteBuffers
49+
@@ -883,6 +888,7 @@ static const char *proc_names[] = {
50+
"glClear",
51+
"glClearColor",
52+
"glCompileShader",
53+
+ "glCompressedTexImage2D",
54+
"glCreateProgram",
55+
"glCreateShader",
56+
"glDeleteBuffers",

‎ports/tracy/portfile.cmake‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
vcpkg_download_distfile(PATCH_MISSING_CHRONO_INCLUDE
2-
URLS https://github.com/wolfpld/tracy/commit/50ff279aaddfd91dc3cdcfd5b7aec3978e63da25.diff?full_index=1
3-
SHA512 f9594297ea68612b68bd631497cd312ea01b34280a0f098de0d2b99810149345251a8985a6430337d0b55d2f181ceac10d563b64cfe48f78959f79ec7a6ea3b5
4-
FILENAME wolfpld-tracy-PR982.diff
5-
)
6-
71
vcpkg_from_github(
82
OUT_SOURCE_PATH SOURCE_PATH
93
REPO wolfpld/tracy
104
REF "v${VERSION}"
11-
SHA512 d3d99284e3c3172236c3f02b3bc52df111ef650fb8609e54fb3302ece28e55a06cd16713ed532f1e1aad66678ff09639dfc7e01a1e96880fb923b267a1b1b79b
5+
SHA512 18c0c589a1d97d0760958c8ab00ba2135bc602fd359d48445b5d8ed76e5b08742d818bb8f835b599149030f455e553a92db86fb7bae049b47820e4401cf9f935
126
HEAD_REF master
137
PATCHES
148
build-tools.patch
15-
"${PATCH_MISSING_CHRONO_INCLUDE}"
9+
fix-vendor-versions.patch
10+
downgrade-capstone-5.patch
11+
)
12+
13+
vcpkg_from_github(
14+
OUT_SOURCE_PATH tracy_imgui_path
15+
REPO ocornut/imgui
16+
REF "v1.92.5-docking"
17+
SHA512 4618b8bd6e65ac27cd7cecb3469d135622279d83f8a580c028231578f7023c4465911c5878ee7e40c2f6dda606aef86f27c3cecfb7bc9a6022bd1d89eed17c29
18+
PATCHES
19+
"${SOURCE_PATH}/cmake/imgui-emscripten.patch"
20+
imgui-loader.patch # For some reason the source patch doesn't work on git imgui
1621
)
1722

1823
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -40,16 +45,28 @@ vcpkg_cmake_configure(
4045
OPTIONS
4146
-DDOWNLOAD_CAPSTONE=OFF
4247
-DLEGACY=ON
48+
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
49+
-DCPM_USE_LOCAL_PACKAGES=ON
50+
-DCPM_LOCAL_PACKAGES_ONLY=ON
51+
-DCPM_DONT_UPDATE_MODULE_PATH=ON
52+
-DFETCHCONTENT_FULLY_DISCONNECTED=ON
53+
-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS
54+
-DImGui_SOURCE_DIR=${tracy_imgui_path}
4355
${FEATURE_OPTIONS}
4456
OPTIONS_RELEASE
4557
${TOOLS_OPTIONS}
4658
MAYBE_UNUSED_VARIABLES
4759
DOWNLOAD_CAPSTONE
4860
LEGACY
61+
CPM_DONT_UPDATE_MODULE_PATH
62+
CPM_LOCAL_PACKAGES_ONLY
63+
CPM_USE_LOCAL_PACKAGES
64+
FETCHCONTENT_TRY_FIND_PACKAGE_MODE
65+
ImGui_SOURCE_DIR
4966
)
5067
vcpkg_cmake_install()
5168
vcpkg_copy_pdbs()
52-
vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy)
69+
vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy CONFIG_PATH "lib/cmake/Tracy")
5370

5471
function(tracy_copy_tool tool_name tool_dir)
5572
vcpkg_copy_tools(

‎ports/tracy/vcpkg.json‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
{
22
"name": "tracy",
3-
"version": "0.11.1",
4-
"port-version": 2,
3+
"version": "0.13.1",
54
"description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.",
65
"homepage": "https://github.com/wolfpld/tracy",
76
"license": "BSD-3-Clause",
87
"supports": "!(windows & (arm | uwp))",
98
"dependencies": [
9+
"aklomp-base64",
10+
"curl",
11+
"md4c",
12+
"nativefiledialog-extended",
13+
"nlohmann-json",
1014
{
1115
"name": "pthreads",
1216
"platform": "!windows"
1317
},
18+
"pugixml",
19+
"tidy-html5",
20+
"usearch",
1421
{
1522
"name": "vcpkg-cmake",
1623
"host": true
1724
},
1825
{
1926
"name": "vcpkg-cmake-config",
2027
"host": true
21-
}
28+
},
29+
"zstd"
2230
],
2331
"default-features": [
2432
"crash-handler"
@@ -43,10 +51,7 @@
4351
},
4452
"freetype",
4553
"glfw3",
46-
{
47-
"name": "tbb",
48-
"platform": "!windows"
49-
}
54+
"ppqsort"
5055
]
5156
},
5257
"crash-handler": {
@@ -74,10 +79,7 @@
7479
},
7580
"freetype",
7681
"glfw3",
77-
{
78-
"name": "tbb",
79-
"platform": "!windows"
80-
}
82+
"ppqsort"
8183
]
8284
},
8385
"on-demand": {

‎versions/baseline.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9814,7 +9814,7 @@
98149814
},
98159815
"tidy-html5": {
98169816
"baseline": "5.8.0",
9817-
"port-version": 2
9817+
"port-version": 3
98189818
},
98199819
"tiff": {
98209820
"baseline": "4.7.1",
@@ -9993,8 +9993,8 @@
99939993
"port-version": 6
99949994
},
99959995
"tracy": {
9996-
"baseline": "0.11.1",
9997-
"port-version": 2
9996+
"baseline": "0.13.1",
9997+
"port-version": 0
99989998
},
99999999
"transwarp": {
1000010000
"baseline": "2.2.3",

0 commit comments

Comments
 (0)