Skip to content
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

Wait for window initialization to complete in setupMinecraftWindow #37

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Wait for window initialization to complete in setupMinecraftWindow #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c802eb3
Wait for window initialization to complete in setupMinecraftWindow
embeddedt Nov 9, 2023
f5b2449
Time out on window initialization after 30 seconds
embeddedt Nov 9, 2023
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
18 changes: 12 additions & 6 deletions earlydisplay/src/main/java/net/neoforged/fml/earlydisplay/DisplayWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@
import java.util.Objects;
import java.util.Optional;
import java.util.StringJoiner;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
Expand Down Expand Up @@ -86,6 +82,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
private int framecount;
private EarlyFramebuffer framebuffer;
private ScheduledFuture<?> windowTick;
private ScheduledFuture<?> initializationFuture;

private PerformanceInfo performanceInfo;
private ScheduledFuture<?> performanceTick;
Expand Down Expand Up @@ -288,7 +285,7 @@ public Runnable start(@Nullable String mcVersion, final String forgeVersion) {
return thread;
});
initWindow(mcVersion);
renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS);
return this::periodicTick;
}

Expand Down Expand Up @@ -519,6 +516,15 @@ private void handleLastGLFWError(BiConsumer<Integer, String> handler) {
* @return the Window we own.
*/
public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) {
// wait for the window to actually be initialized
try {
this.initializationFuture.get(30, TimeUnit.SECONDS);
} catch(InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
} catch(TimeoutException e) {
Thread.dumpStack();
crashElegantly("We seem to be having trouble initializing the window, waited for 30 seconds");
}
// we have to spin wait for the window ticker
ImmediateWindowHandler.updateProgress("Initializing Game Graphics");
while (!this.windowTick.isDone()) {
Expand Down
Loading