Update Tracy to v0.9

12 files changed, 42 insertions, 20 deletions

diff --git a/contrib/generate_tracy_header/header_bottom.txt b/contrib/generate_tracy_header/header_bottom.txt
index 21f78dce7..cdc941afd 100644
--- a/contrib/generate_tracy_header/header_bottom.txt
+++ b/contrib/generate_tracy_header/header_bottom.txt
@@ -1,4 +1,4 @@
-#  include <Tracy.hpp>
+#  include <tracy/Tracy.hpp>
 #endif
 
 // close the header
diff --git a/contrib/generate_tracy_header/update.sh b/contrib/generate_tracy_header/update.sh
index 15ede2c2a..ea681bbe4 100755
--- a/contrib/generate_tracy_header/update.sh
+++ b/contrib/generate_tracy_header/update.sh
@@ -9,7 +9,7 @@
 
 set -euo pipefail
 
-source=$(ls ../../subprojects/tracy-*/Tracy.hpp)
+source=$(ls ../../subprojects/tracy-*/public/tracy/Tracy.hpp)
 
 if [[ ! -f "$source" ]]; then
   echo "Tracy's source header could not be found."
@@ -32,8 +32,30 @@ echo "Writing updated header: $target"
 # Top
 cat header_top.txt > "$target"
 
+SED=""
+assign_gnu_sed () {
+	# Is sed GNU? (BSD seds don't support --version)
+	if sed --version &>/dev/null; then
+		SED="sed"
+	# No, but do we have gsed?
+	elif command -v gsed &> /dev/null; then
+		SED="gsed"
+	# No, so help the user install it and then quit.
+	else
+		echo "'sed' is not GNU and 'gsed' is not available."
+		if [[ "${OSTYPE:-}" == "darwin"* ]]; then
+			echo "Install GNU sed with: brew install gnu-sed"
+		else
+			echo "Install GNU sed with your $OSTYPE package manager."
+		fi
+		exit 1
+	fi
+}
+
+assign_gnu_sed
+
 # Body
-sed -n "/^#ifndef TRACY_ENABLE/,\${p;/^#else/q}" "$source" >> "$target"
+"$SED" -n "/^#ifndef TRACY_ENABLE/,\${p;/^#else/q}" "$source" >> "$target"
 
 # Bottom
 cat header_bottom.txt >> "$target"
diff --git a/include/tracy.h b/include/tracy.h
index 010d2e7f9..eaed68c72 100644
--- a/include/tracy.h
+++ b/include/tracy.h
@@ -77,7 +77,7 @@
 #	define LockableName(x, y, z)                     ;
 
 #	define TracyPlot(x, y)
-#	define TracyPlotConfig(x, y)
+#	define TracyPlotConfig(x, y, z, w, a)
 
 #	define TracyMessage(x, y)
 #	define TracyMessageL(x)
@@ -123,7 +123,8 @@
 #	define TracyMessageCS(x, y, z, w)
 #	define TracyMessageLCS(x, y, z)
 
-#	define TracyParameterRegister(x)
+#	define TracySourceCallbackRegister(x, y)
+#	define TracyParameterRegister(x, y)
 #	define TracyParameterSetup(x, y, z, w)
 #	define TracyIsConnected false
 
@@ -131,7 +132,7 @@
 #	define TracyFiberLeave
 
 #else
-#	include <Tracy.hpp>
+#	include <tracy/Tracy.hpp>
 #endif
 
 // close the header
diff --git a/src/cpu/core_dyn_x86.cpp b/src/cpu/core_dyn_x86.cpp
index 196889931..a2e4037ae 100644
--- a/src/cpu/core_dyn_x86.cpp
+++ b/src/cpu/core_dyn_x86.cpp
@@ -249,7 +249,7 @@ static void dyn_restoreregister(DynReg * src_reg, DynReg * dst_reg) {
 #include "core_dyn_x86/decoder.h"
 
 Bits CPU_Core_Dyn_X86_Run(void) {
-	ZoneScoped
+	ZoneScoped;
 	// helper class to auto-save DH_FPU state on function exit
 	class auto_dh_fpu {
 	public:
diff --git a/src/cpu/core_dynrec.cpp b/src/cpu/core_dynrec.cpp
index 619a4a972..5841c327b 100644
--- a/src/cpu/core_dynrec.cpp
+++ b/src/cpu/core_dynrec.cpp
@@ -209,7 +209,7 @@ CacheBlock *LinkBlocks(BlockReturn ret)
 */
 
 Bits CPU_Core_Dynrec_Run(void) {
-	ZoneScoped
+	ZoneScoped;
 	for (;;) {
 		// Determine the linear address of CS:EIP
 		PhysPt ip_point=SegPhys(cs)+reg_eip;
diff --git a/src/cpu/core_full.cpp b/src/cpu/core_full.cpp
index 50f8b7ef6..0a5d4dd6d 100644
--- a/src/cpu/core_full.cpp
+++ b/src/cpu/core_full.cpp
@@ -62,7 +62,7 @@ typedef PhysPt EAPoint;
 	}
 
 Bits CPU_Core_Full_Run(void) {
-	ZoneScoped
+	ZoneScoped;
 	FullData inst{};
 	while (CPU_Cycles-->0) {
 #if C_DEBUG
diff --git a/src/cpu/core_normal.cpp b/src/cpu/core_normal.cpp
index 8be88897c..1a3941c75 100644
--- a/src/cpu/core_normal.cpp
+++ b/src/cpu/core_normal.cpp
@@ -138,7 +138,7 @@ static inline uint32_t Fetchd() {
 #define EALookupTable (core.ea_table)
 
 Bits CPU_Core_Normal_Run(void) {
-	ZoneScoped
+	ZoneScoped;
 	while (CPU_Cycles-->0) {
 		LOADIP;
 		core.opcode_index=cpu.code.big*0x200;
diff --git a/src/cpu/core_simple.cpp b/src/cpu/core_simple.cpp
index 101faa216..c4f6abc39 100644
--- a/src/cpu/core_simple.cpp
+++ b/src/cpu/core_simple.cpp
@@ -134,7 +134,7 @@ static inline uint32_t Fetchd() {
 #define EALookupTable (core.ea_table)
 
 Bits CPU_Core_Simple_Run(void) {
-	ZoneScoped
+	ZoneScoped;
 	while (CPU_Cycles-->0) {
 		LOADIP;
 		core.opcode_index=cpu.code.big*0x200;
diff --git a/src/dosbox.cpp b/src/dosbox.cpp
index 07f998985..f60bdbb19 100644
--- a/src/dosbox.cpp
+++ b/src/dosbox.cpp
@@ -167,7 +167,7 @@ static Bitu Normal_Loop() {
 }
 
 void increaseticks() { //Make it return ticksRemain and set it in the function above to remove the global variable.
-	ZoneScoped
+	ZoneScoped;
 	if (GCC_UNLIKELY(ticksLocked)) { // For Fast Forward Mode
 		ticksRemain=5;
 		/* Reset any auto cycle guessing for this frame */
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 3df1100a6..e45aab89c 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -2426,7 +2426,7 @@ void GFX_EndUpdate(const uint16_t *changedLines)
 		break;
 	}
 	sdl.updating = false;
-	FrameMark
+	FrameMark;
 }
 
 // Texture update and presentation
diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp
index 8d6b34af1..53aa82b0d 100644
--- a/src/hardware/mixer.cpp
+++ b/src/hardware/mixer.cpp
@@ -1957,7 +1957,7 @@ static void MIXER_Mix_NoSound()
 static void SDLCALL MIXER_CallBack([[maybe_unused]] void *userdata,
                                    Uint8 *stream, int len)
 {
-	ZoneScoped
+	ZoneScoped;
 	memset(stream, 0, len);
 
 	auto frames_requested = len / mixer_frame_size;
diff --git a/subprojects/tracy.wrap b/subprojects/tracy.wrap
index d220bc1b8..52c569246 100644
--- a/subprojects/tracy.wrap
+++ b/subprojects/tracy.wrap
@@ -1,10 +1,9 @@
 [wrap-file]
-directory = tracy-0.8.2.1
-source_url = https://github.com/wolfpld/tracy/archive/refs/tags/v0.8.2.1.tar.gz
-source_filename = tracy-0.8.2.1.tar.gz
-source_hash = 97f478579efa1f5ce4c8619014a20327010fea122c21248701fe2bbb46ec1c1f
-wrapdb_version = 0.8.2.1-1
+directory = tracy-0.9
+
+source_url = https://github.com/wolfpld/tracy/archive/refs/tags/v0.9.tar.gz
+source_filename = tracy-0.9.tar.gz
+source_hash = 93a91544e3d88f3bc4c405bad3dbc916ba951cdaadd5fcec1139af6fa56e6bfc
 
 [provide]
 tracy = tracy_dep
-