backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: run Minecraft::init from the main thread only

Browse source 
this was an orbis-specific hack seemingly that developed into a datarace after merging TU19 causing clang to segfault on startup
This commit is contained in:
Tropical 2026-03-23 01:58:58 -05:00
parent 420416bedc
commit 7a35d1caa2
1 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Minecraft.Client/Platform/Linux/Linux_Minecraft.cpp
View file

@ -877,27 +877,6 @@ return -1;
Tile::CreateNewThreadStorage(); Tile::CreateNewThreadStorage();
Minecraft::main(); Minecraft::main();
// Minecraft::main () used to call Minecraft::Start, but this takes ~2.5
// seconds, so now running this in another thread so we can do some basic
// renderer calls whilst it is happening. This is at attempt to stop getting
// TRC failure on SubmitDone taking > 5 seconds on boot
C4JThread* minecraftThread = new C4JThread(&StartMinecraftThreadProc, NULL,
"Running minecraft start");
minecraftThread->Run();
do {
RenderManager.StartFrame();
Sleep(20);
RenderManager.Present();
} while (minecraftThread->isRunning());
delete minecraftThread;
// Re-acquire the GL context in the main thread.
// StartMinecraftThreadProc calls InitialiseContext() which moves the
// context to the init thread for texture loading; we must reclaim it here
// before any further OpenGL calls in the main render loop.
RenderManager.InitialiseContext();
Minecraft* pMinecraft = Minecraft::GetInstance(); Minecraft* pMinecraft = Minecraft::GetInstance();
app.InitGameSettings(); app.InitGameSettings();