diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar index 527074ad8..1f45961f8 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version index b7d3870db..7a78e8728 100644 --- a/app_pojavlauncher/src/main/assets/components/lwjgl3/version +++ b/app_pojavlauncher/src/main/assets/components/lwjgl3/version @@ -1 +1 @@ -349d027673855ffded0bb7471a5b662a63b438bd \ No newline at end of file +24ec32a7f38c6126efe7030c71a237e5ec5bf742 \ No newline at end of file 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 7681e5615..0f92e81de 100644 --- a/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java +++ b/jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java @@ -998,6 +998,32 @@ public class GLFW win.height = mGLFWWindowHeight; win.title = title; + // Set the Open GL version for context because Forge and derivatives ask for it + // If we give them 0.0, some mods don't like it, so we base our assumptions on a per renderer basis + int glMajor = 3; + int glMinor = 3; + // These values can be found at headings_array.xml + switch (System.getenv("POJAV_RENDERER")) { + case "vulkan_zink": + if (System.getenv("POJAV_LOAD_TURNIP").equals("1")) { + System.out.println("GLFW: Turnip+Zink detected, setting GL context to 4.6"); + glMajor = 4; + glMinor = 6; + } + case "opengles3_virgl": + System.out.println("GLFW: virglrenderer detected, setting GL context to 4.3"); + glMajor = 4; + glMinor = 3; + case "opengles_mobileglues": + System.out.println("GLFW: MobileGlues detected, setting GL context to 4.0"); + glMajor = 4; + glMinor = 0; + break; + default: + System.out.println("GLFW: "+ System.getenv("POJAV_RENDERER") + " detected, defaulting GL context to 3.3"); + } + win.windowAttribs.put(GLFW_CONTEXT_VERSION_MAJOR, glMajor); + win.windowAttribs.put(GLFW_CONTEXT_VERSION_MINOR, glMinor); mGLFWWindowMap.put(ptr, win); mainContext = ptr;