From 270697cd1065238b600cc5cbf347c86bc08ac5c3 Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Mon, 13 Oct 2025 18:48:21 -0400 Subject: [PATCH] Refactor vendor detection (#1049) * Refactor vendor detection Only one vendor can be active at any given time, so make it an enum. * lowercase vendor string --- .../angelica/glsm/GLStateManager.java | 30 +++++++++++++------ .../gtnewhorizons/angelica/glsm/Vendor.java | 27 +++++++++++++++++ .../glsm/stacks/BooleanStateStack.java | 2 +- .../angelica/glsm/states/BooleanState.java | 2 +- .../angelica/glsm/states/MaterialState.java | 2 +- .../angelica/glsm/GLSM_Lighting_UnitTest.java | 2 +- .../angelica/glsm/GLSM_PushPop_UnitTest.java | 12 ++++---- 7 files changed, 58 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/gtnewhorizons/angelica/glsm/Vendor.java diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 6bd4f82b3..cb3d267cb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -81,6 +81,10 @@ import java.util.Map; import java.util.Set; import java.util.function.IntSupplier; +import static com.gtnewhorizons.angelica.glsm.Vendor.AMD; +import static com.gtnewhorizons.angelica.glsm.Vendor.INTEL; +import static com.gtnewhorizons.angelica.glsm.Vendor.MESA; +import static com.gtnewhorizons.angelica.glsm.Vendor.NVIDIA; import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; /** @@ -109,10 +113,7 @@ public class GLStateManager { public static final GLFeatureSet HAS_MULTIPLE_SET = new GLFeatureSet(); - @Getter protected static boolean NVIDIA; - @Getter protected static boolean AMD; - @Getter protected static boolean INTEL; - @Getter protected static boolean MESA; + @Getter private static Vendor VENDOR; // This setting varies depending on driver, so it gets queried at runtime public static final int DEFAULT_DRAW_BUFFER = GL11.glGetInteger(GL11.GL_DRAW_BUFFER); @@ -310,12 +311,9 @@ public class GLStateManager { .addFeature(GL11.GL_VIEWPORT); String glVendor = GL11.glGetString(GL11.GL_VENDOR); - NVIDIA = glVendor.toLowerCase().contains("nvidia"); - AMD = glVendor.toLowerCase().contains("ati") || glVendor.toLowerCase().contains("amd"); - INTEL = glVendor.toLowerCase().contains("intel"); - MESA = glVendor.toLowerCase().contains("mesa"); + VENDOR = Vendor.getVendor(glVendor.toLowerCase()); - if(AMD) { + if (vendorIsAMD()) { // AMD Drivers seem to default to 0 for the matrix mode, so we need to set it to the default GL11.glMatrixMode(GL11.GL_MODELVIEW); } @@ -2139,6 +2137,20 @@ public class GLStateManager { } } + public static boolean vendorIsAMD() { + return VENDOR == AMD; + } + public static boolean vendorIsIntel() { + return VENDOR == INTEL; + } + + public static boolean vendorIsMesa() { + return VENDOR == MESA; + } + + public static boolean vendorIsNVIDIA() { + return VENDOR == NVIDIA; + } } diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/Vendor.java b/src/main/java/com/gtnewhorizons/angelica/glsm/Vendor.java new file mode 100644 index 000000000..4fac0f388 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/Vendor.java @@ -0,0 +1,27 @@ +package com.gtnewhorizons.angelica.glsm; + +/// Matches +public enum Vendor { + AMD("amd"), + INTEL("intel"), + MESA("mesa"), + NVIDIA("nvidia"), + UNKNOWN(""); + + final String[] names; + + Vendor(String... names) { + this.names = names; + } + + public static Vendor getVendor(String vendorString) { + for (var v : values()) { + for (var name : v.names) { + if (vendorString.contains(name)) return v; + } + } + + // Shouldn't be needed as "" matches everything, but sanity checks good. + return UNKNOWN; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java b/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java index 64ff8c5e0..5d72f1967 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/BooleanStateStack.java @@ -47,7 +47,7 @@ public class BooleanStateStack extends BooleanState implements IStateStack { } public void setEnabled(boolean enabled) { - if (GLStateManager.shouldBypassCache() || enabled != this.enabled || (this.glCap == GL11.GL_BLEND && GLStateManager.isAMD() && GLStateManager.isPoppingAttributes())) { + if (GLStateManager.shouldBypassCache() || enabled != this.enabled || (this.glCap == GL11.GL_BLEND && GLStateManager.vendorIsAMD() && GLStateManager.isPoppingAttributes())) { this.enabled = enabled; if (enabled) { GL11.glEnable(this.glCap); diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/states/MaterialState.java b/src/main/java/com/gtnewhorizons/angelica/glsm/states/MaterialState.java index 871d26468..f0bf06330 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/states/MaterialState.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/states/MaterialState.java @@ -124,7 +124,7 @@ public class MaterialState implements ISettableState { // glMaterial specifically for GL_COLOR_INDEXES. Other drivers do not do this. // This probably breaks things but who knows, GLSM is setup to track to what the // driver is doing for it right now. - if (GLStateManager.isNVIDIA()) { + if (GLStateManager.vendorIsNVIDIA()) { vector3f.set(newBuffer.get(0), newBuffer.get(2), newBuffer.get(1)); } else { vector3f.set(newBuffer); diff --git a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java index 54d4bb211..57a94402d 100644 --- a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java +++ b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java @@ -295,7 +295,7 @@ public class GLSM_Lighting_UnitTest { GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); newf4b(0.8F, 0.6F, 0.4F, 0.0F); GLStateManager.glMaterial(GL11.GL_FRONT, GL11.GL_COLOR_INDEXES, f4b); - if (GLStateManager.isNVIDIA()) { + if (GLStateManager.vendorIsNVIDIA()) { verifyMaterialState(GL11.GL_FRONT, GL11.GL_COLOR_INDEXES, new float[]{0.8F, 0.4F, 0.6F}, ""); } else { verifyMaterialState(GL11.GL_FRONT, GL11.GL_COLOR_INDEXES, new float[]{0.8F, 0.6F, 0.4F}, ""); diff --git a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java index cbd9df34e..e25af534c 100644 --- a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java +++ b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java @@ -216,8 +216,8 @@ class GLSM_PushPop_UnitTest { bits.add(new GLBit(GL11.GL_DITHER, "Dither", true)); bits.add(new GLBit(GL11.GL_FOG, "Fog", false)); // This fails on the RESET test in xvfb - if(!(GLStateManager.MESA || GLStateManager.AMD)) { - for(i = 0 ; i < GL11.glGetInteger(GL11.GL_MAX_LIGHTS) ; i++) { + if (!(GLStateManager.vendorIsMesa() || GLStateManager.vendorIsAMD())) { + for (i = 0; i < GL11.glGetInteger(GL11.GL_MAX_LIGHTS); i++) { bits.add(new GLBit(GL11.GL_LIGHT0 + i, "Light " + i, false)); } } @@ -247,7 +247,7 @@ class GLSM_PushPop_UnitTest { bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_3, "Map2 Texture Coord 3", false)); bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_4, "Map2 Texture Coord 4", false)); // Seems to be broken at least on Nvidia - if(!GLStateManager.NVIDIA) bits.add(new GLBit(GL13.GL_MULTISAMPLE, "Multisample", true)); + if (!GLStateManager.vendorIsNVIDIA()) bits.add(new GLBit(GL13.GL_MULTISAMPLE, "Multisample", true)); bits.add(new GLBit(GL11.GL_NORMALIZE, "Normalize", false)); bits.add(new GLBit(GL11.GL_POINT_SMOOTH, "Point Smooth", false)); bits.add(new GLBit(GL11.GL_POLYGON_OFFSET_LINE, "Polygon Offset Line", false)); @@ -297,7 +297,7 @@ class GLSM_PushPop_UnitTest { GLStateManager.glFogf(GL11.GL_FOG_END, 0.5f); GLStateManager.glFogf(GL11.GL_FOG_START, 0.5f); GLStateManager.glFogf(GL11.GL_FOG_MODE, GL11.GL_LINEAR); - if(!GLStateManager.NVIDIA) GLStateManager.glFogf(GL11.GL_FOG_INDEX, 1f); + if (!GLStateManager.vendorIsNVIDIA()) GLStateManager.glFogf(GL11.GL_FOG_INDEX, 1f); verifyIsEnabled(GL11.GL_FOG, true, "Fog Enable"); verifyState(GL11.GL_FOG_COLOR, FLOAT_ARRAY_4_POINT_5, "Fog Color"); @@ -305,7 +305,7 @@ class GLSM_PushPop_UnitTest { verifyState(GL11.GL_FOG_END, 0.5f, "Fog End"); verifyState(GL11.GL_FOG_START, 0.5f, "Fog Start"); verifyState(GL11.GL_FOG_MODE, GL11.GL_LINEAR, "Fog Mode"); - if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 1f, "Fog Index"); + if (!GLStateManager.vendorIsNVIDIA()) verifyState(GL11.GL_FOG_INDEX, 1f, "Fog Index"); GLStateManager.glPopAttrib(); verifyIsEnabled(GL11.GL_FOG, false, "Fog Enable - Reset"); @@ -314,7 +314,7 @@ class GLSM_PushPop_UnitTest { verifyState(GL11.GL_FOG_END, 1f, "Fog End - Reset"); verifyState(GL11.GL_FOG_START, 0f, "Fog Start - Reset"); verifyState(GL11.GL_FOG_MODE, GL11.GL_EXP, "Fog Mode - Reset"); - if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 0f, "Fog Index - Reset"); + if (!GLStateManager.vendorIsNVIDIA()) verifyState(GL11.GL_FOG_INDEX, 0f, "Fog Index - Reset"); } @Test