From 75617a5456793cc32bca5cd6bdddab987666c76b Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Tue, 14 May 2024 23:18:19 -0700 Subject: [PATCH] More null checks --- .../angelica/glsm/GLStateManager.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index f5cef1877..574e32ac7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -1262,6 +1262,9 @@ public class GLStateManager { return true; } final TextureInfo info = TextureInfoCache.INSTANCE.getInfo(texture); + if (info == null) { + return true; + } switch (pname) { case GL11.GL_TEXTURE_MIN_FILTER -> { if(info.getMinFilter() == param && !shouldBypassCache()) return false; @@ -1333,6 +1336,9 @@ public class GLStateManager { return true; } final TextureInfo info = TextureInfoCache.INSTANCE.getInfo(texture); + if (info == null) { + return true; + } switch (pname) { case EXTTextureFilterAnisotropic.GL_TEXTURE_MAX_ANISOTROPY_EXT -> { if(info.getMaxAnisotropy() == param && !shouldBypassCache()) return false; @@ -1358,7 +1364,9 @@ public class GLStateManager { public static int getTexParameterOrDefault(int texture, int pname, IntSupplier defaultSupplier) { final TextureInfo info = TextureInfoCache.INSTANCE.getInfo(texture); - + if (info == null) { + return defaultSupplier.getAsInt(); + } return switch (pname) { case GL11.GL_TEXTURE_MIN_FILTER -> info.getMinFilter(); case GL11.GL_TEXTURE_MAG_FILTER -> info.getMagFilter(); @@ -1382,6 +1390,9 @@ public class GLStateManager { return GL11.glGetTexParameterf(target, pname); } final TextureInfo info = TextureInfoCache.INSTANCE.getInfo(getBoundTexture()); + if(info == null) { + return GL11.glGetTexParameterf(target, pname); + } return switch (pname) { case EXTTextureFilterAnisotropic.GL_TEXTURE_MAX_ANISOTROPY_EXT -> info.getMaxAnisotropy(); @@ -1395,7 +1406,9 @@ public class GLStateManager { return GL11.glGetTexLevelParameteri(target, level, pname); } final TextureInfo info = TextureInfoCache.INSTANCE.getInfo(getBoundTexture()); - + if (info == null) { + return GL11.glGetTexLevelParameteri(target, level, pname); + } return switch (pname) { case GL11.GL_TEXTURE_WIDTH -> info.getWidth(); case GL11.GL_TEXTURE_HEIGHT -> info.getHeight();