diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java index 34414ecd9..c5b24b6d3 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/RenderSystem.java @@ -9,6 +9,7 @@ import com.gtnewhorizons.angelica.glsm.dsa.DSAUnsupported; import com.gtnewhorizons.angelica.glsm.ffp.ShaderManager; import com.gtnewhorizons.angelica.glsm.hooks.GLSMInitConfig; import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache; +import lombok.Getter; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; import org.joml.Vector3i; @@ -48,6 +49,9 @@ public class RenderSystem { private static int maxSSBOBindings; private static int maxGlslVersion; private static boolean supportsGpuShader4; + @Getter private static int glMajor; + @Getter private static int glMinor; + @Getter private static boolean coreProfile; // Sampler object state tracking (null if unsupported) private static int[] samplers; @@ -140,10 +144,17 @@ public class RenderSystem { if (GLStateManager.capabilities.OpenGL32) { final int profileMask = RENDER_BACKEND.getInteger(GL32.GL_CONTEXT_PROFILE_MASK); if ((profileMask & GL32.GL_CONTEXT_CORE_PROFILE_BIT) != 0) { + coreProfile = true; GLStateManager.LOGGER.info("GL 3.3 core profile detected, enabling FFP shader emulation."); ShaderManager.getInstance().enable(); } } + + final Matcher glVerMatcher = SEMVER_PATTERN.matcher(RENDER_BACKEND.getString(GL11.GL_VERSION)); + if (glVerMatcher.matches()) { + glMajor = Integer.parseInt(glVerMatcher.group("major")); + glMinor = Integer.parseInt(glVerMatcher.group("minor")); + } } public static void generateMipmaps(int texture, int mipmapTarget) { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index a3d936a11..65059c6f1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -71,6 +71,12 @@ public enum Mixins implements IMixins { .addClientMixins("angelica.gui.MixinGuiMainMenu") ), + ANGELICA_GL_SPLASH_TEXT( + new MixinBuilder("Rewrite 'OpenGL 1.2!' splash to reflect the actual GL context") + .setPhase(Phase.EARLY) + .addClientMixins("angelica.gui.MixinGuiMainMenuSplash") + ), + ANGELICA_FONT_RENDERER(new MixinBuilder() .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableFontRenderer) diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/gui/MixinGuiMainMenuSplash.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/gui/MixinGuiMainMenuSplash.java new file mode 100644 index 000000000..75c691c71 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/gui/MixinGuiMainMenuSplash.java @@ -0,0 +1,30 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.gui; + +import com.gtnewhorizons.angelica.glsm.RenderSystem; +import net.minecraft.client.gui.GuiMainMenu; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(GuiMainMenu.class) +public abstract class MixinGuiMainMenuSplash { + + @Unique + private static final String VANILLA_GL_SPLASH = "OpenGL 1.2!"; + + @Shadow private String splashText; + + @Inject(method = "", at = @At("RETURN")) + private void angelica$rewriteGlSplash(CallbackInfo ci) { + if (!VANILLA_GL_SPLASH.equals(this.splashText)) return; + + final int major = RenderSystem.getGlMajor(); + final int minor = RenderSystem.getGlMinor(); + if (major == 0) return; + + this.splashText = "OpenGL " + major + "." + minor + (RenderSystem.isCoreProfile() ? " core!" : "!"); + } +}