GLSM Tests & AMD Driver Workaround (#290)

* Store graphics vendor
* AMD driver workarounds

* Test TRANSFORM_BIT

* Test GL_TEXTURE_BIT
* Fix handling of bound textures on glDeleteTextures

* Switch up the LOGGER in RenderSystem so we don't trigger a Forge Configuration load; AMD driver default matrix mode workaround

* Switch BatchingFontRenderer to use the gl methods via GLSM to better respect cache bypassing
Fix a few instances of GLSM not respecting the bypass

* Start with "runningSplash" true always to disable the cache until loaded into the world

---------

Co-authored-by: Caedis <[email protected]>
This commit is contained in:
Jason MitchellandCaedis authored and GitHub committed 2024-02-12 22:33:23 -08:00
1 parent d1e505308c
commit ff290c19e2
11 files changed
+203 -50

No files matched your search

@@ -248,7 +248,7 @@ public class BatchingFontRenderer {
batchCommands.sort(FontDrawCmd.DRAW_ORDER_COMPARATOR);
final boolean isTextureEnabledBefore = GLStateManager.glIsEnabled(GL11.GL_TEXTURE_2D);
final int boundTextureBefore = GLStateManager.getBoundTexture();
final int boundTextureBefore = GLStateManager.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
boolean textureChanged = false;
ResourceLocation lastTexture = DUMMY_RESOURCE_LOCATION;
@@ -265,7 +265,7 @@ public class BatchingFontRenderer {
glEnableClientState(GL_COLOR_ARRAY);
glVertexPointer(2, 0, batchVtxPositions);
glEnableClientState(GL_VERTEX_ARRAY);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
GLStateManager.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
// Use plain for loop to avoid allocations
final FontDrawCmd[] cmdsData = batchCommands.elements();
@@ -274,9 +274,9 @@ public class BatchingFontRenderer {
final FontDrawCmd cmd = cmdsData[i];
if (!Objects.equals(lastTexture, cmd.texture)) {
if (lastTexture == null) {
GLStateManager.enableTexture();
GLStateManager.glEnable(GL11.GL_TEXTURE_2D);
} else if (cmd.texture == null) {
GLStateManager.disableTexture();
GLStateManager.glDisable(GL11.GL_TEXTURE_2D);
}
if (cmd.texture != null) {
((FontRendererAccessor) underlying).angelica$bindTexture(cmd.texture);
@@ -292,7 +292,7 @@ public class BatchingFontRenderer {
glPopClientAttrib();
if (isTextureEnabledBefore) {
GLStateManager.enableTexture();
GLStateManager.glEnable(GL11.GL_TEXTURE_2D);
}
if (textureChanged) {
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, boundTextureBefore);
@@ -74,6 +74,7 @@ import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
public class GLStateManager {
public static ContextCapabilities capabilities;
@Getter protected static boolean poppingAttributes;
public static boolean BYPASS_CACHE = Boolean.parseBoolean(System.getProperty("angelica.disableGlCache", "false"));
public static final int MAX_ATTRIB_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_ATTRIB_STACK_DEPTH);
public static final int MAX_MODELVIEW_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_MODELVIEW_STACK_DEPTH);
@@ -83,6 +84,11 @@ 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;
// GLStateManager State Trackers
private static final IntStack attribs = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
protected static final IntegerStateStack activeTextureUnit = new IntegerStateStack();
@@ -131,7 +137,7 @@ public class GLStateManager {
// Thread Checking
@Getter private static final Thread MainThread = Thread.currentThread();
private static Thread CurrentThread = MainThread;
@Setter @Getter private static boolean runningSplash = false;
@Setter @Getter private static boolean runningSplash = true;
private static int glListMode = 0;
private static int glListId = -1;
@@ -177,6 +183,18 @@ public class GLStateManager {
.addFeature(GL11.GL_TEXTURE_ENV_COLOR)
.addFeature(GL11.GL_TEXTURE_MATRIX)
.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");
if(AMD) {
// 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);
}
}
public static void init() {
@@ -249,6 +267,9 @@ public class GLStateManager {
}
public static boolean glIsEnabled(int cap) {
if(shouldBypassCache()) {
return GL11.glIsEnabled(cap);
}
return switch (cap) {
case GL11.GL_ALPHA_TEST -> alphaTest.isEnabled();
case GL11.GL_BLEND -> blendMode.isEnabled();
@@ -493,7 +514,7 @@ public class GLStateManager {
}
}
if (mask != depthState.isEnabled()) {
if (shouldBypassCache() || mask != depthState.isEnabled()) {
depthState.setEnabled(mask);
GL11.glDepthMask(mask);
}
@@ -725,7 +746,6 @@ public class GLStateManager {
public static void glDeleteTextures(int id) {
onDeleteTexture(id);
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1);
GL11.glDeleteTextures(id);
}
@@ -734,7 +754,6 @@ public class GLStateManager {
onDeleteTexture(ids.get(i));
}
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1);
GL11.glDeleteTextures(ids);
}
@@ -976,6 +995,12 @@ public class GLStateManager {
if (AngelicaConfig.enableIris) {
PBRTextureManager.INSTANCE.onDeleteTexture(id);
}
for(int i = 0; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
if(textures.getTextureUnitBindings(i).getBinding() == id) {
textures.getTextureUnitBindings(i).setBinding(0);
}
}
}
public static void makeCurrent(Drawable drawable) throws LWJGLException {
@@ -1068,8 +1093,10 @@ public class GLStateManager {
}
public static void glPopAttrib() {
poppingAttributes = true;
popState();
GL11.glPopAttrib();
poppingAttributes = false;
}
// Matrix Operations
@@ -1377,5 +1404,7 @@ public class GLStateManager {
GL11.glColorMaterial(face, mode);
}
public static void glDepthRange(double near, double far) {
GL11.glDepthRange(near, far);
}
}
@@ -4,6 +4,8 @@ import com.gtnewhorizons.angelica.glsm.dsa.DSAARB;
import com.gtnewhorizons.angelica.glsm.dsa.DSAAccess;
import com.gtnewhorizons.angelica.glsm.dsa.DSACore;
import com.gtnewhorizons.angelica.glsm.dsa.DSAUnsupported;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import org.joml.Vector3i;
@@ -21,12 +23,12 @@ import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
/**
* This class is responsible for abstracting calls to OpenGL and asserting that calls are run on the render thread.
*/
public class RenderSystem {
private static final Logger LOGGER = LogManager.getLogger("RenderSystem");
private static DSAAccess dsaState;
private static boolean hasMultibind;
private static boolean supportsCompute;
@@ -50,6 +52,7 @@ public class RenderSystem {
} catch (NoSuchFieldError ignored) {}
if (dsaState == null) {
dsaState = new DSAUnsupported();
LOGGER.info("No DSA support detected, falling back to legacy OpenGL.");
}
try {
@@ -32,6 +32,7 @@ public class BooleanStateStack extends BooleanState implements IStateStack<Boole
}
set(stack[--pointer]);
this.setEnabled(this.enabled);
return this;
}
@@ -5,10 +5,9 @@ import lombok.Getter;
import org.lwjgl.opengl.GL11;
public class BooleanState implements ISettableState<BooleanState> {
private final int glCap;
protected final int glCap;
@Getter
private boolean enabled;
@Getter protected boolean enabled;
public BooleanState(int glCap) {
this.glCap = glCap;
@@ -23,7 +22,7 @@ public class BooleanState implements ISettableState<BooleanState> {
}
public void setEnabled(boolean enabled) {
if (GLStateManager.shouldBypassCache() || enabled != this.enabled) {
if (GLStateManager.shouldBypassCache() || enabled != this.enabled || (this.glCap == GL11.GL_BLEND && GLStateManager.isAMD() && GLStateManager.isPoppingAttributes())) {
this.enabled = enabled;
if (enabled) {
GL11.glEnable(this.glCap);
@@ -18,7 +18,6 @@ public enum Mixins {
ANGELICA_STARTUP(new Builder("Angelica Startup").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
.setPhase(Phase.EARLY).addMixinClasses(
"angelica.startup.MixinInitGLStateManager"
,"angelica.startup.MixinSplashProgress"
)
),
@@ -1,16 +0,0 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.startup;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(targets="cpw/mods/fml/client/SplashProgress$3", remap = false)
public abstract class MixinSplashProgress {
@Inject(method = "setGL", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/locks/Lock;lock()V", shift = At.Shift.AFTER))
private void angelica$startSplash(CallbackInfo ci) {
GLStateManager.setRunningSplash(true);
}
}
@@ -121,6 +121,7 @@ public class RedirectorTransformer implements IClassTransformer {
.add("glDeleteTextures")
.add("glDepthFunc")
.add("glDepthMask")
.add("glDepthRange")
.add("glDrawArrays")
.add("glDrawBuffer")
.add("glEdgeFlag")