From 64be361081817dff97714c71ce1c9c2cb98ccf33 Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Thu, 16 Jul 2026 11:06:37 +0000 Subject: [PATCH 1/3] Upgrade blue to v6.0.0 and core to v3.0.0 --- vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 94287c300..46ac26106 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,7 @@ }, { "name": "carbon-core", - "version>=": "2.4.0" + "version>=": "3.0.0" }, { "name": "carbon-imageio", @@ -51,7 +51,7 @@ }, { "name": "carbon-blue", - "version>=": "5.1.2" + "version>=": "6.0.0" }, { "name": "carbon-math", From 08e47c4de8c1ad6c5a223d1912440378d0c9628d Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Thu, 16 Jul 2026 13:31:46 +0000 Subject: [PATCH 2/3] Fix deprecation warning in Tr2RenderContext by constructing CcpSemaphore with a name --- trinity/Tr2RenderContext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trinity/Tr2RenderContext.cpp b/trinity/Tr2RenderContext.cpp index 7eb2abbf3..a0b1bb21d 100644 --- a/trinity/Tr2RenderContext.cpp +++ b/trinity/Tr2RenderContext.cpp @@ -151,7 +151,7 @@ Tr2RenderTargetPtr Tr2RenderContextBase::GetBackBuffer() Tr2RenderContext::Tr2RenderContext() : Tr2RenderContextBase( *this ), m_parallelContextMutex( "Tr2RenderContext", "m_parallelContextMutex" ), - m_parallelContextSemaphore( 0, 1024 ) + m_parallelContextSemaphore("Tr2RenderContext_m_parallelContextSemaphore", 0, 1024 ) { #if !TRINITY_PLATFORM_HAS_PRIMARY_CONTEXT m_events = this; From c5d26204913fbebc654ca3160b6adb0761f7e509 Mon Sep 17 00:00:00 2001 From: ccptoebeans Date: Thu, 16 Jul 2026 14:27:12 +0000 Subject: [PATCH 3/3] Add compile definition for python2 support in order to flag latest core tracy feature off --- trinity/CMakeLists.txt | 1 + trinity/Tr2RenderContext.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 606b971e0..9d8822d1e 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -1898,6 +1898,7 @@ function(set_shared_trinity_properties target package_name) target_compile_definitions(${target} PRIVATE BLUE_USE_LOCAL_ITr2DebugRenderer2=1 + PYTHON2_SUPPORT=1 ) endif() diff --git a/trinity/Tr2RenderContext.cpp b/trinity/Tr2RenderContext.cpp index a0b1bb21d..49eef356d 100644 --- a/trinity/Tr2RenderContext.cpp +++ b/trinity/Tr2RenderContext.cpp @@ -151,7 +151,12 @@ Tr2RenderTargetPtr Tr2RenderContextBase::GetBackBuffer() Tr2RenderContext::Tr2RenderContext() : Tr2RenderContextBase( *this ), m_parallelContextMutex( "Tr2RenderContext", "m_parallelContextMutex" ), - m_parallelContextSemaphore("Tr2RenderContext_m_parallelContextSemaphore", 0, 1024 ) + +#ifdef PYTHON2_SUPPORT + m_parallelContextSemaphore( 0, 1024 ) +#else + m_parallelContextSemaphore( "Tr2RenderContext_m_parallelContextSemaphore", 0, 1024 ) +#endif { #if !TRINITY_PLATFORM_HAS_PRIMARY_CONTEXT m_events = this;