keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Move ClientVisualization to secondary thread

Browse source
This commit is contained in:
RogueLogix 2020-04-26 16:06:44 -07:00
parent 677e2104a0
commit 6a0b16817d
1 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/fmllauncher/java/net/minecraftforge/fml/loading/progress/ClientVisualization.java
View file

@ -21,6 +21,7 @@ package net.minecraftforge.fml.loading.progress;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWErrorCallback; import org.lwjgl.glfw.GLFWErrorCallback;
import org.lwjgl.glfw.GLFWImage; import org.lwjgl.glfw.GLFWImage;
import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.glfw.GLFWVidMode;
@ -42,7 +43,6 @@ import java.util.function.IntSupplier;
import java.util.function.LongSupplier; import java.util.function.LongSupplier;
import java.util.function.Supplier; import java.util.function.Supplier;
import static org.lwjgl.glfw.Callbacks.glfwFreeCallbacks;
import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.glfw.GLFW.glfwCreateWindow; import static org.lwjgl.glfw.GLFW.glfwCreateWindow;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
@ -828,6 +828,10 @@ class ClientVisualization implements EarlyProgressVisualization.Visualization {
"QTBWCfsDUEnrRM79TlpTxdiRQqPUZ1K6oljEemiV2jpI30rdTl9fXLusM3GdWC9nWqlgPepH7LDH" + "QTBWCfsDUEnrRM79TlpTxdiRQqPUZ1K6oljEemiV2jpI30rdTl9fXLusM3GdWC9nWqlgPepH7LDH" +
"hqHbz9XSh0ldQFRIedowVo+o7cFPaWv+t4KwgVHL/w+K90N4AQIYnQAAAABJRU5ErkJggg=="; "hqHbz9XSh0ldQFRIedowVo+o7cFPaWv+t4KwgVHL/w+K90N4AQIYnQAAAABJRU5ErkJggg==";
private Thread renderThread = new Thread(this::renderThreadFunc);
private boolean running = true;
private void initWindow() { private void initWindow() {
GLFWErrorCallback.createPrint(System.err).set(); GLFWErrorCallback.createPrint(System.err).set();
@ -879,7 +883,9 @@ class ClientVisualization implements EarlyProgressVisualization.Visualization {
iconBuf.put(icon); iconBuf.put(icon);
iconBuf.position(0); iconBuf.position(0);
final ByteBuffer imgBuffer = STBImage.stbi_load_from_memory(iconBuf, iconWidth, iconHeight, iconChannels, 4); final ByteBuffer imgBuffer = STBImage.stbi_load_from_memory(iconBuf, iconWidth, iconHeight, iconChannels, 4);
System.out.println(" BIG FARTS " +STBImage.stbi_failure_reason()); if (imgBuffer == null) {
throw new RuntimeException("Failed to load window icon"); // ignore it and make the icon optional?
}
glfwImages.position(0); glfwImages.position(0);
glfwImages.width(iconWidth.get(0)); glfwImages.width(iconWidth.get(0));
glfwImages.height(iconHeight.get(0)); glfwImages.height(iconHeight.get(0));
@ -888,12 +894,8 @@ class ClientVisualization implements EarlyProgressVisualization.Visualization {
glfwImages.position(0); glfwImages.position(0);
glfwSetWindowIcon(window, glfwImages); glfwSetWindowIcon(window, glfwImages);
} }
glfwMakeContextCurrent(window);
glfwSwapInterval(1);
glfwShowWindow(window); glfwShowWindow(window);
GL.createCapabilities(); glfwPollEvents();
glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
} }
private void renderProgress() { private void renderProgress() {
@ -908,7 +910,6 @@ class ClientVisualization implements EarlyProgressVisualization.Visualization {
glEnable(GL_BLEND); glEnable(GL_BLEND);
renderMessages(); renderMessages();
glfwSwapBuffers(window); glfwSwapBuffers(window);
glfwPollEvents();
} }
private static float clamp(float num, float min, float max) { private static float clamp(float num, float min, float max) {
@ -1021,18 +1022,43 @@ class ClientVisualization implements EarlyProgressVisualization.Visualization {
MemoryUtil.memFree(charBuffer); MemoryUtil.memFree(charBuffer);
} }
private void renderThreadFunc() {
glfwMakeContextCurrent(window);
glfwSwapInterval(1);
GL.createCapabilities();
glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
while (running) {
renderProgress();
try {
Thread.sleep(50);
} catch (InterruptedException ignored) {
break;
}
}
glfwMakeContextCurrent(0);
}
@Override @Override
public Runnable start() { public Runnable start() {
initWindow(); initWindow();
return this::renderProgress; renderThread.start();
return org.lwjgl.glfw.GLFW::glfwPollEvents;
} }
@Override @Override
public long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) { public long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier<String> title, final LongSupplier monitorSupplier) {
running = false;
try {
renderThread.join();
} catch (InterruptedException ignored) {
}
glfwSetWindowTitle(window, title.get()); glfwSetWindowTitle(window, title.get());
glfwSetWindowSize(window, width.getAsInt(), height.getAsInt()); glfwSetWindowSize(window, width.getAsInt(), height.getAsInt());
if (monitorSupplier.getAsLong()!=0L) if (monitorSupplier.getAsLong() != 0L)
glfwSetWindowMonitor(window, monitorSupplier.getAsLong(),0, 0, width.getAsInt(), height.getAsInt(), GLFW_DONT_CARE); glfwSetWindowMonitor(window, monitorSupplier.getAsLong(), 0, 0, width.getAsInt(), height.getAsInt(), GLFW_DONT_CARE);
glfwMakeContextCurrent(window);
GL.createCapabilities();
glClearColor(1.0f, 1.0f, 1.0f, 1.0f); glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
renderProgress(); renderProgress();