From 7ae4e14a3e284a59fac1895d6fe0fefa501c1acf Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 25 Dec 2023 11:35:24 -0800 Subject: [PATCH] Add some more guards around GL capabilities --- .../client/gl/state/GlStateTracker.java | 6 ++-- .../coderbot/iris/gl/IrisRenderSystem.java | 34 ++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gl/state/GlStateTracker.java b/src/main/java/me/jellysquid/mods/sodium/client/gl/state/GlStateTracker.java index 010b8fc86..48dbb8c64 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gl/state/GlStateTracker.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gl/state/GlStateTracker.java @@ -3,6 +3,7 @@ package me.jellysquid.mods.sodium.client.gl.state; import me.jellysquid.mods.sodium.client.gl.array.GlVertexArray; import me.jellysquid.mods.sodium.client.gl.buffer.GlBuffer; import me.jellysquid.mods.sodium.client.gl.buffer.GlBufferTarget; +import me.jellysquid.mods.sodium.client.gl.func.GlFunctions; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL30; @@ -49,8 +50,9 @@ public class GlStateTracker { for (int i = 0; i < GlBufferTarget.COUNT; i++) { GL15.glBindBuffer(GlBufferTarget.VALUES[i].getTargetParameter(), 0); } - - GL30.glBindVertexArray(0); + if(GlFunctions.isVertexArraySupported()) { + GL30.glBindVertexArray(0); + } } public void clearRestoreState() { diff --git a/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java b/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java index 75c35a14c..cb6ba185b 100644 --- a/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java +++ b/src/main/java/net/coderbot/iris/gl/IrisRenderSystem.java @@ -32,18 +32,24 @@ public class IrisRenderSystem { private static boolean supportsCompute; public static void initRenderer() { - if (Iris.capabilities.OpenGL45) { - dsaState = new DSACore(); - Iris.logger.info("OpenGL 4.5 detected, enabling DSA."); - } else if (Iris.capabilities.GL_ARB_direct_state_access) { - dsaState = new DSAARB(); - Iris.logger.info("ARB_direct_state_access detected, enabling DSA."); - } else { - dsaState = new DSAUnsupported(); - Iris.logger.info("DSA support not detected."); - } + try { + if (Iris.capabilities.OpenGL45) { + dsaState = new DSACore(); + Iris.logger.info("OpenGL 4.5 detected, enabling DSA."); + } + hasMultibind = Iris.capabilities.OpenGL45; - hasMultibind = Iris.capabilities.OpenGL45 || Iris.capabilities.GL_ARB_multi_bind; + } catch (Exception ignored) {} + try { + if (dsaState == null && Iris.capabilities.GL_ARB_direct_state_access) { + dsaState = new DSAARB(); + Iris.logger.info("ARB_direct_state_access detected, enabling DSA."); + } + } catch (Exception ignored) {} + + try { + hasMultibind |= Iris.capabilities.GL_ARB_multi_bind; + } catch (Exception ignored) {} supportsCompute = supportsCompute(); } @@ -487,6 +493,10 @@ public class IrisRenderSystem { // TODO: Proper notification of compute support public static boolean supportsCompute() { - return Iris.capabilities.GL_ARB_compute_shader; + try { + return Iris.capabilities.GL_ARB_compute_shader; + } catch(Exception ignored) { + return false; + } } }