Skip to content

Upgrade blue to v6.0.0 and core to v3.0.0 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccptoebeans merged 3 commits into from
Jul 16, 2026
+8 −2
Merged

Upgrade blue to v6.0.0 and core to v3.0.0 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64be361
Upgrade blue to v6.0.0 and core to v3.0.0
ccptoebeans Jul 16, 2026
08e47c4
Fix deprecation warning in Tr2RenderContext by constructing CcpSemaph…
ccptoebeans Jul 16, 2026
c5d2620
Add compile definition for python2 support in order to flag latest co…
ccptoebeans Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions trinity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
5 changes: 5 additions & 0 deletions trinity/Tr2RenderContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,12 @@ Tr2RenderTargetPtr Tr2RenderContextBase::GetBackBuffer()
Tr2RenderContext::Tr2RenderContext() :
Tr2RenderContextBase( *this ),
m_parallelContextMutex( "Tr2RenderContext", "m_parallelContextMutex" ),

#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;
Expand Down
4 changes: 2 additions & 2 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
{
"name": "carbon-core",
"version>=": "2.4.0"
"version>=": "3.0.0"
},
{
"name": "carbon-imageio",
Expand Down Expand Up @@ -51,7 +51,7 @@
},
{
"name": "carbon-blue",
"version>=": "5.1.2"
"version>=": "6.0.0"
},
{
"name": "carbon-math",
Expand Down