mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-22 05:12:16 +00:00
GLSM Improvements (#272)
* GLSM Improvements * Add an IntegerStateStack * Use IntegerStateStack to track the active texture unit * Track activeTextureUnit with GL_TEXTURE_BIT * Bugfix - Don't include color with GL_COLOR_BUFFER_BIT * Fully test glPush/PopAttrib for GL_COLOR_BUFFER_BIT * Split GLStateManager init into two pieces
This commit is contained in:
1 parent
0e3e4283af
commit
cf454f287c
13 files changed
+310
-36
No files matched your search
@@ -50,9 +50,8 @@ public class Feature {
|
||||
// GL_COLOR_LOGIC_OP enable bit
|
||||
// GL_INDEX_LOGIC_OP enable bit
|
||||
// Logic op function
|
||||
, GLStateManager.colorMask // Color mode and index mode writemasks
|
||||
, GLStateManager.color // Color mode and index mode writemasks
|
||||
, GLStateManager.clearColor // Color mode and index mode clear values
|
||||
, GLStateManager.colorMask // Color-mode and index-mode writemasks
|
||||
, GLStateManager.clearColor // Color-mode and index-mode clear values
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_CURRENT_BIT, ImmutableSet.of(
|
||||
GLStateManager.color // Current RGBA color
|
||||
@@ -219,11 +218,14 @@ public class Feature {
|
||||
// Stencil buffer writemask
|
||||
));
|
||||
final Set<IStateStack<?>> textureAttribs = new HashSet<>(ImmutableSet.of(
|
||||
GLStateManager.activeTextureUnit // Active texture unit
|
||||
// Enable bits for the four texture coordinates
|
||||
|
||||
// Border color for each texture image
|
||||
// Minification function for each texture image
|
||||
// Magnification function for each texture image
|
||||
// Texture coordinates and wrap mode for each texture image
|
||||
|
||||
// Color and mode for each texture environment
|
||||
// Enable bits GL_TEXTURE_GEN_x, x is S, T, R, and Q
|
||||
// GL_TEXTURE_GEN_MODE setting for S, T, R, and Q
|
||||
@@ -234,9 +236,11 @@ public class Feature {
|
||||
// Current Texture Bindings - GL_TEXTURE_BINDING_2D
|
||||
for(int i = 0 ; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
textureAttribs.add(GLStateManager.textures.getTextureUnitBindings(i));
|
||||
// textureAttribs.add(GLStateManager.textures.getInfo(i))
|
||||
}
|
||||
|
||||
attribToFeatures.put(GL11.GL_TEXTURE_BIT, textureAttribs);
|
||||
|
||||
attribToFeatures.put(GL11.GL_TRANSFORM_BIT, ImmutableSet.of(
|
||||
// Coefficients of the six clipping planes
|
||||
// Enable bits for the user-definable clipping planes
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica.glsm;
|
||||
|
||||
import com.gtnewhorizons.angelica.AngelicaMod;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.AlphaStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.BlendStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.BooleanStateStack;
|
||||
@@ -10,6 +11,7 @@ import com.gtnewhorizons.angelica.glsm.stacks.ColorMaskStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.DepthStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.FogStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.IStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.IntegerStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.MatrixModeStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.ViewPortStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.states.Color4;
|
||||
@@ -84,9 +86,9 @@ public class GLStateManager {
|
||||
|
||||
// GLStateManager State Trackers
|
||||
private static final IntStack attribs = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
|
||||
private static final IntStack activeTextureUnit = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
|
||||
protected static final IntegerStateStack activeTextureUnit = new IntegerStateStack();
|
||||
static {
|
||||
activeTextureUnit.push(0); // GL_TEXTURE0
|
||||
activeTextureUnit.setValue(0); // GL_TEXTURE0
|
||||
}
|
||||
@Getter protected static final TextureUnitArray textures = new TextureUnitArray();
|
||||
@Getter protected static final BlendStateStack blendState = new BlendStateStack();
|
||||
@@ -99,7 +101,7 @@ public class GLStateManager {
|
||||
@Getter protected static final FogStateStack fogState = new FogStateStack();
|
||||
@Getter protected static final BooleanStateStack fogMode = new BooleanStateStack(GL11.GL_FOG);
|
||||
@Getter protected static final Color4Stack color = new Color4Stack();
|
||||
@Getter protected static final Color4Stack clearColor = new Color4Stack();
|
||||
@Getter protected static final Color4Stack clearColor = new Color4Stack(new Color4(0.0F, 0.0F, 0.0F, 0.0F));
|
||||
@Getter protected static final ColorMaskStack colorMask = new ColorMaskStack();
|
||||
@Getter protected static final BooleanStateStack cullState = new BooleanStateStack(GL11.GL_CULL_FACE);
|
||||
@Getter protected static final AlphaStateStack alphaState = new AlphaStateStack();
|
||||
@@ -135,6 +137,8 @@ public class GLStateManager {
|
||||
private static final Map<IStateStack<?>, ISettableState<?>> glListStates = new Object2ObjectArrayMap<>();
|
||||
private static final Int2ObjectMap<Set<Map.Entry<IStateStack<?>, ISettableState<?>>>> glListChanges = new Int2ObjectOpenHashMap<>();
|
||||
|
||||
|
||||
|
||||
public static class GLFeatureSet extends IntOpenHashSet {
|
||||
public GLFeatureSet addFeature(int feature) {
|
||||
super.add(feature);
|
||||
@@ -143,10 +147,11 @@ public class GLStateManager {
|
||||
|
||||
}
|
||||
|
||||
public static void init() {
|
||||
public static void preInit() {
|
||||
capabilities = GLContext.getCapabilities();
|
||||
HAS_MULTIPLE_SET
|
||||
.addFeature(GL11.GL_ACCUM_CLEAR_VALUE)
|
||||
.addFeature(GL14.GL_BLEND_COLOR)
|
||||
.addFeature(GL11.GL_COLOR_CLEAR_VALUE)
|
||||
.addFeature(GL11.GL_COLOR_WRITEMASK)
|
||||
.addFeature(GL11.GL_CURRENT_COLOR)
|
||||
@@ -171,6 +176,10 @@ public class GLStateManager {
|
||||
.addFeature(GL11.GL_TEXTURE_ENV_COLOR)
|
||||
.addFeature(GL11.GL_TEXTURE_MATRIX)
|
||||
.addFeature(GL11.GL_VIEWPORT);
|
||||
}
|
||||
|
||||
public static void init() {
|
||||
|
||||
|
||||
RenderSystem.initRenderer();
|
||||
|
||||
@@ -247,7 +256,7 @@ public class GLStateManager {
|
||||
case GL11.GL_FOG -> fogMode.isEnabled();
|
||||
case GL11.GL_LIGHTING -> lightingState.isEnabled();
|
||||
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.topInt()).isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL12.GL_RESCALE_NORMAL -> rescaleNormalState.isEnabled();
|
||||
default -> GL11.glIsEnabled(cap);
|
||||
};
|
||||
@@ -266,7 +275,7 @@ public class GLStateManager {
|
||||
case GL11.GL_FOG -> fogMode.isEnabled();
|
||||
case GL11.GL_LIGHTING -> lightingState.isEnabled();
|
||||
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.topInt()).isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL12.GL_RESCALE_NORMAL -> rescaleNormalState.isEnabled();
|
||||
default -> GL11.glGetBoolean(pname);
|
||||
};
|
||||
@@ -342,8 +351,9 @@ public class GLStateManager {
|
||||
switch (pname) {
|
||||
case GL11.GL_MODELVIEW_MATRIX -> modelViewMatrix.get(0, params);
|
||||
case GL11.GL_PROJECTION_MATRIX -> projectionMatrix.get(0, params);
|
||||
case GL11.GL_TEXTURE_MATRIX -> textures.getTextureUnitMatrix(getActiveTextureUnit()).get(0, params);
|
||||
// case GL11.GL_TEXTURE_MATRIX -> textures.getTextureUnitMatrix(getActiveTextureUnit()).get(0, params);
|
||||
case GL11.GL_COLOR_CLEAR_VALUE -> clearColor.get(params);
|
||||
case GL11.GL_CURRENT_COLOR -> color.get(params);
|
||||
default -> {
|
||||
if(!HAS_MULTIPLE_SET.contains(pname)) {
|
||||
params.put(0, glGetFloat(pname));
|
||||
@@ -596,8 +606,7 @@ public class GLStateManager {
|
||||
public static void glActiveTexture(int texture) {
|
||||
final int newTexture = texture - GL13.GL_TEXTURE0;
|
||||
if (shouldBypassCache() || getActiveTextureUnit() != newTexture) {
|
||||
activeTextureUnit.popInt();
|
||||
activeTextureUnit.push(newTexture);
|
||||
activeTextureUnit.setValue(newTexture);
|
||||
GL13.glActiveTexture(texture);
|
||||
}
|
||||
}
|
||||
@@ -605,14 +614,13 @@ public class GLStateManager {
|
||||
public static void glActiveTextureARB(int texture) {
|
||||
final int newTexture = texture - GL13.GL_TEXTURE0;
|
||||
if (shouldBypassCache() || getActiveTextureUnit() != newTexture) {
|
||||
activeTextureUnit.popInt();
|
||||
activeTextureUnit.push(newTexture);
|
||||
activeTextureUnit.setValue(newTexture);
|
||||
ARBMultitexture.glActiveTextureARB(texture);
|
||||
}
|
||||
}
|
||||
|
||||
public static int getBoundTexture() {
|
||||
return getBoundTexture(activeTextureUnit.topInt());
|
||||
return getBoundTexture(activeTextureUnit.getValue());
|
||||
}
|
||||
|
||||
public static int getBoundTexture(int unit) {
|
||||
@@ -626,7 +634,7 @@ public class GLStateManager {
|
||||
return;
|
||||
}
|
||||
|
||||
final TextureBinding textureUnit = textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt());
|
||||
final TextureBinding textureUnit = textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue());
|
||||
|
||||
if (shouldBypassCache() || textureUnit.getBinding() != texture) {
|
||||
GL11.glBindTexture(target, texture);
|
||||
@@ -653,7 +661,7 @@ public class GLStateManager {
|
||||
public static void glDeleteTextures(int id) {
|
||||
onDeleteTexture(id);
|
||||
|
||||
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
|
||||
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1);
|
||||
GL11.glDeleteTextures(id);
|
||||
}
|
||||
|
||||
@@ -662,7 +670,7 @@ public class GLStateManager {
|
||||
onDeleteTexture(ids.get(i));
|
||||
}
|
||||
|
||||
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
|
||||
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1);
|
||||
GL11.glDeleteTextures(ids);
|
||||
}
|
||||
|
||||
@@ -1081,7 +1089,7 @@ public class GLStateManager {
|
||||
}
|
||||
|
||||
public static int getActiveTextureUnit() {
|
||||
return activeTextureUnit.topInt();
|
||||
return activeTextureUnit.getValue();
|
||||
}
|
||||
|
||||
public static int getListMode() {
|
||||
|
||||
@@ -16,6 +16,11 @@ public class Color4Stack extends Color4 implements IStateStack<Color4Stack> {
|
||||
}
|
||||
}
|
||||
|
||||
public Color4Stack(Color4 color4) {
|
||||
this();
|
||||
set(color4);
|
||||
}
|
||||
|
||||
public Color4Stack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.IntegerState;
|
||||
|
||||
public class IntegerStateStack extends IntegerState implements IStateStack<IntegerStateStack> {
|
||||
|
||||
protected final IntegerState[] stack;
|
||||
|
||||
protected int pointer;
|
||||
|
||||
public IntegerStateStack() {
|
||||
stack = new IntegerState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new IntegerState();
|
||||
}
|
||||
}
|
||||
|
||||
public IntegerStateStack push() {
|
||||
if(pointer == stack.length) {
|
||||
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
|
||||
}
|
||||
|
||||
stack[pointer++].set(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
public IntegerStateStack push(int value) {
|
||||
push().setValue(value);
|
||||
return this;
|
||||
}
|
||||
|
||||
public IntegerStateStack pop() {
|
||||
if(pointer == 0) {
|
||||
throw new IllegalStateException("Stack underflow");
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.gtnewhorizons.angelica.glsm.states;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
public class IntegerState implements ISettableState<IntegerState> {
|
||||
@Getter @Setter private int value;
|
||||
|
||||
@Override
|
||||
public IntegerState set(IntegerState state) {
|
||||
this.value = state.value;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean sameAs(Object state) {
|
||||
if (this == state) return true;
|
||||
if (!(state instanceof IntegerState integerState)) return false;
|
||||
return value == integerState.value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IntegerState copy() {
|
||||
return new IntegerState().set(this);
|
||||
}
|
||||
}
|
||||
@@ -38,9 +38,9 @@ public class HUDCaching {
|
||||
framebuffer.setFramebufferColor(0, 0, 0, 0);
|
||||
}
|
||||
private static boolean dirty = true;
|
||||
|
||||
|
||||
public static boolean renderingCacheOverride;
|
||||
|
||||
|
||||
/*
|
||||
* Some HUD features cause problems/inaccuracies when being rendered into cache.
|
||||
* We capture those and render them later
|
||||
@@ -55,7 +55,7 @@ public class HUDCaching {
|
||||
public static boolean renderCrosshairsCaptured;
|
||||
|
||||
public static final HUDCaching INSTANCE = new HUDCaching();
|
||||
|
||||
|
||||
|
||||
private HUDCaching() {}
|
||||
|
||||
@@ -65,11 +65,11 @@ public class HUDCaching {
|
||||
private static boolean isEnabled = true;
|
||||
private static final KeyBinding toggle = new KeyBinding("Toggle HUDCaching", 0, "Debug");
|
||||
|
||||
static {
|
||||
public static void registerKeyBindings() {
|
||||
ClientRegistry.registerKeyBinding(toggle);
|
||||
}
|
||||
|
||||
// @SubscribeEvent
|
||||
// @SubscribeEvent
|
||||
// public void onFrame(RenderGameOverlayEvent.Post event) {
|
||||
// if (event.type == RenderGameOverlayEvent.ElementType.TEXT) {
|
||||
// final long currentTimeMillis = System.currentTimeMillis();
|
||||
@@ -121,15 +121,15 @@ public class HUDCaching {
|
||||
} else {
|
||||
renderer.setupOverlayRendering();
|
||||
}
|
||||
|
||||
|
||||
ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
|
||||
int width = resolution.getScaledWidth();
|
||||
int height = resolution.getScaledHeight();
|
||||
GLStateManager.enableBlend();
|
||||
|
||||
|
||||
// reset the color that may be applied by some items
|
||||
GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
|
||||
// render bits that were captured when rendering into cache
|
||||
GuiIngameAccessor gui = (GuiIngameAccessor) ingame;
|
||||
if (renderVignetteCaptured)
|
||||
@@ -138,7 +138,7 @@ public class HUDCaching {
|
||||
} else {
|
||||
GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
|
||||
}
|
||||
|
||||
|
||||
if (ingame instanceof GuiIngameForge) {
|
||||
GuiIngameForgeAccessor guiForge = ((GuiIngameForgeAccessor) ingame);
|
||||
if (renderHelmetCaptured) {
|
||||
@@ -168,11 +168,11 @@ public class HUDCaching {
|
||||
GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
framebuffer.bindFramebufferTexture();
|
||||
drawTexturedRect(tessellator, (float) resolution.getScaledWidth_double(), (float) resolution.getScaledHeight_double());
|
||||
|
||||
|
||||
GLStateManager.tryBlendFuncSeparate(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
|
||||
mc.getTextureManager().bindTexture(Gui.icons);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* We are skipping certain render calls when rendering into cache,
|
||||
* however, we cannot skip the GL state changes. This will fix
|
||||
|
||||
+1
@@ -11,6 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
public class MixinInitGLStateManager {
|
||||
@Inject(method = "initializeTextures", at = @At("RETURN"))
|
||||
private static void angelica$initializeGLStateManager(CallbackInfo ci) {
|
||||
GLStateManager.preInit();
|
||||
GLStateManager.init();
|
||||
}
|
||||
}
|
||||
@@ -70,6 +70,7 @@ public class ClientProxy extends CommonProxy {
|
||||
if(AngelicaConfig.enableHudCaching) {
|
||||
FMLCommonHandler.instance().bus().register(HUDCaching.INSTANCE);
|
||||
MinecraftForge.EVENT_BUS.register(HUDCaching.INSTANCE); // TODO remove debug stuff, unused registration}
|
||||
HUDCaching.registerKeyBindings();
|
||||
}
|
||||
if(AngelicaConfig.enableSodium) {
|
||||
MinecraftForge.EVENT_BUS.register(SodiumDebugScreenHandler.INSTANCE);
|
||||
|
||||
Reference in new issue
Block a user