Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-01 18:50:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix GL resource sharing across native application windows

Browse Source 
Decouple GL object sharing between native windows from auxiliary worker-thread context support. Platforms without threaded GL contexts, such as Haiku, must still share textures and other GL resources between their window contexts.

Always configure SDL_GL_SHARE_WITH_CURRENT_CONTEXT according to the requested context settings, while continuing to create the auxiliary thread context only on supported platforms. Explicitly reset the SDL attribute for non-shared contexts to avoid leaking state into subsequent window creation.

Apply the fix to both SDL2 and SDL3 backends. Also link the Haiku unit test executable against libbsd and libnetwork to resolve its PTY and socket dependencies.
This commit is contained in:
Martín Lucas Golini
2026-09-12 01:51:17 -03:00
parent 5d3be27a9d
commit 42de99cf3b
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -86,3 +86,4 @@ ecode.dmg
/projects/android-project/.project
/projects/android-project/app/.project
/design/
/projects/haiku/ecode/ecode.app/*
bin/assets/icon/ecode-icon-web.hvif
BIN
View File
Binary file not shown.
premake4.lua
+3
View File
@@ -2011,6 +2011,9 @@ solution "eepp"
if not os.is("windows") and not os.is("haiku") then
links { "pthread" }
end
if os.is("haiku") then
links { "bsd", "network" }
end
files { "src/tests/unit_tests/*.cpp",
"src/tools/ecode/jsonhelper.cpp",
"src/tools/ecode/plugins/git/git.cpp",
premake5.lua
+2
View File
@@ -2033,6 +2033,8 @@ workspace "eepp"
"src/tools/ecode/plugins/autocomplete/usersnippetstore.cpp" }
filter { "system:not windows", "system:not haiku" }
links { "pthread" }
filter "system:haiku"
links { "bsd", "network" }
filter {}
eepp_module_backward_add( false )
build_link_configuration( "eepp-unit_tests", true )
src/eepp/window/backend/SDL2/windowsdl2.cpp
+7 -10
View File
@@ -217,19 +217,16 @@ bool WindowSDL::create( WindowSettings Settings, ContextSettings Context ) {
SDL_GL_SetAttribute( SDL_GL_ACCELERATED_VISUAL, 0 );
}
// Sharing window contexts is independent from supporting an auxiliary context on a worker
// thread. Platforms without threaded GL contexts still need shared object namespaces for
// resources used by multiple native windows.
SDL_GL_SetAttribute( SDL_GL_SHARE_WITH_CURRENT_CONTEXT,
mWindow.ContextConfig.SharedGLContext ? 1 : 0 );
#ifdef SDL2_THREADED_GLCONTEXT
if ( mWindow.ContextConfig.SharedGLContext ) {
SDL_GL_SetAttribute( SDL_GL_SHARE_WITH_CURRENT_CONTEXT, 1 );
if ( mWindow.ContextConfig.SharedGLContext )
mGLContextThread = SDL_GL_CreateContext( mSDLWindow );
mGLContext = SDL_GL_CreateContext( mSDLWindow );
} else {
mGLContext = SDL_GL_CreateContext( mSDLWindow );
}
#else
mGLContext = SDL_GL_CreateContext( mSDLWindow );
mWindow.ContextConfig.SharedGLContext = false;
#endif
mGLContext = SDL_GL_CreateContext( mSDLWindow );
if ( nullptr == mGLContext
#ifdef SDL2_THREADED_GLCONTEXT
src/eepp/window/backend/SDL3/windowsdl3.cpp
+7 -10
View File
@@ -188,19 +188,16 @@ bool WindowSDL::create( WindowSettings Settings, ContextSettings Context ) {
}
#endif
// Sharing window contexts is independent from supporting an auxiliary context on a worker
// thread. Platforms without threaded GL contexts still need shared object namespaces for
// resources used by multiple native windows.
SDL_GL_SetAttribute( SDL_GL_SHARE_WITH_CURRENT_CONTEXT,
mWindow.ContextConfig.SharedGLContext ? 1 : 0 );
#ifdef SDL3_THREADED_GLCONTEXT
if ( mWindow.ContextConfig.SharedGLContext ) {
SDL_GL_SetAttribute( SDL_GL_SHARE_WITH_CURRENT_CONTEXT, 1 );
if ( mWindow.ContextConfig.SharedGLContext )
mGLContextThread = SDL_GL_CreateContext( mSDLWindow );
mGLContext = SDL_GL_CreateContext( mSDLWindow );
} else {
mGLContext = SDL_GL_CreateContext( mSDLWindow );
}
#else
mGLContext = SDL_GL_CreateContext( mSDLWindow );
mWindow.ContextConfig.SharedGLContext = false;
#endif
mGLContext = SDL_GL_CreateContext( mSDLWindow );
if ( nullptr == mGLContext
#ifdef SDL3_THREADED_GLCONTEXT