From 3af22f055bcc078a97b62e6b2104d83f3bb2fc20 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 12 Aug 2022 12:18:38 +0700 Subject: [PATCH] Fixed a long-lasted bug: 0x0 resolution --- .../src/main/java/org/lwjgl/glfw/GLFW.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java b/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java index 9ef855c36..9bef03d66 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java @@ -689,12 +689,6 @@ public class GLFW if (cbfun == null) mGLFWFramebufferSizeCallback = null; else mGLFWFramebufferSizeCallback = GLFWFramebufferSizeCallback.createSafe(nglfwSetFramebufferSizeCallback(window, memAddressSafe(cbfun))); - mGLFWFramebufferSizeCallback = GLFWFramebufferSizeCallback.createSafe(nglfwSetFramebufferSizeCallback(window, memAddressSafe(cbfun))); - - try { - mGLFWFramebufferSizeCallback.invoke(window, mGLFWWindowWidth, mGLFWWindowHeight); - } catch (Throwable th) {} - return lastCallback; } @@ -798,12 +792,6 @@ public class GLFW if (cbfun == null) mGLFWWindowSizeCallback = null; else mGLFWWindowSizeCallback = GLFWWindowSizeCallback.createSafe(nglfwSetWindowSizeCallback(window, memAddressSafe(cbfun))); - mGLFWWindowSizeCallback = GLFWWindowSizeCallback.createSafe(nglfwSetWindowSizeCallback(window, memAddressSafe(cbfun))); - - try { - mGLFWWindowSizeCallback.invoke(window, mGLFWWindowWidth, mGLFWWindowHeight); - } catch (Throwable th) {} - return lastCallback; } @@ -926,7 +914,9 @@ public class GLFW try { // long __result = nglfwGetVideoModes(monitor, memAddress(count)); long __result = memAddress(stack.callocLong(1)); - return GLFWVidMode.createSafe(__result, 1); + GLFWVidMode.Buffer buffer = GLFWVidMode.createSafe(__result, 1); + buffer.put(glfwGetVideoMode(monitor)); + return buffer; } finally { stack.setPointer(stackPointer); }