PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix resize crashes

Browse Source
This commit is contained in:
khanhduytran0 committed 2021-02-17 18:54:20 +07:00
1 parent eab1fe58cc
commit 724829d164
1 file changed
+7 -33
Download Patch File Download Diff File Expand all files Collapse all files
JavaApp/src/main/java/org/lwjgl/opengl/Display.java
+7 -33
View File
@@ -853,7 +853,7 @@ public class Display {
public static void setDisplayMode(DisplayMode dm) throws LWJGLException {
mode = dm;
newCurrentWindow(GLFW.glfwCreateWindow(dm.getWidth(), dm.getHeight(), windowTitle, 0, 0));
GLFW.glfwSetWindowSize(Window.handle, dm.getWidth(), dm.getHeight());
}
public static DisplayMode getDisplayMode() {
@@ -965,8 +965,7 @@ public class Display {
glfwWindowHint(GLFW_RESIZABLE, displayResizable ? GL_TRUE : GL_FALSE);
glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GL_TRUE);
newCurrentWindow(GLFW.glfwCreateWindow(width.get(), height.get(), windowTitle,
GLFW.glfwGetWindowMonitor(Window.handle), NULL));
GLFW.glfwSetWindowSize(Window.handle, width.get(), height.get());
}
}
displayResizable = resizable;
@@ -976,10 +975,9 @@ public class Display {
return displayResizable;
}
public static void setDisplayModeAndFullscreen(DisplayMode mode) throws LWJGLException {
Display.mode = mode;
newCurrentWindow(glfwCreateWindow(mode.getWidth(), mode.getHeight(), windowTitle,
mode.isFullscreenCapable() ? glfwGetPrimaryMonitor() : NULL, NULL));
public static void setDisplayModeAndFullscreen(DisplayMode dm) throws LWJGLException {
Display.mode = dm;
GLFW.glfwSetWindowSize(Window.handle, dm.getWidth(), dm.getHeight());
}
public static void setFullscreen(boolean fullscreen) throws LWJGLException {
@@ -999,11 +997,7 @@ public class Display {
glfwWindowHint(GLFW_RESIZABLE, displayResizable ? GL_TRUE : GL_FALSE);
glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GL_TRUE);
if (fullscreen)
newCurrentWindow(glfwCreateWindow(width.get(), height.get(), windowTitle,
glfwGetPrimaryMonitor(), NULL));
else
newCurrentWindow(glfwCreateWindow(width.get(), height.get(), windowTitle, NULL, NULL));
GLFW.glfwSetWindowSize(Window.handle, width.get(), height.get());
}
}
displayFullscreen = fullscreen;
@@ -1057,26 +1051,6 @@ public class Display {
return display_impl;
}
private static void newCurrentWindow(long newWindow) {
if (Window.handle != MemoryUtil.NULL)
glfwDestroyWindow(Window.handle);
Window.handle = newWindow;
//try {
//Mouse.setNativeCursor(Mouse.getCurrentCursor());
//} catch (LWJGLException e) {
// System.err.println("Failed to set new window cursor!");
// e.printStackTrace();
//}
GLFW.glfwSetWindowTitle(newWindow, windowTitle);
Window.setCallbacks();
// glfwMakeContextCurrent(Window.handle);
context = org.lwjgl.opengl.GLContext.createFromCurrent();
glfwSwapInterval(0);
glfwShowWindow(Window.handle);
}
static class Window {
static long handle;
@@ -1126,4 +1100,4 @@ public class Display {
}
}
}
}