diff --git a/glsm/build.gradle.kts b/glsm/build.gradle.kts index 4fd5cd6fd..2c012a531 100644 --- a/glsm/build.gradle.kts +++ b/glsm/build.gradle.kts @@ -146,6 +146,10 @@ tasks.test { javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(8) + if (System.getProperty("os.name").lowercase().contains("mac") + && System.getProperty("os.arch") == "aarch64") { + vendor = JvmVendorSpec.AZUL + } } dependsOn(downgradeMainClasses, downgradeTestClasses, downgradeDepsForTest) diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 8b08fb546..8dfd0c674 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -5726,6 +5726,14 @@ public class GLStateManager { return RENDER_BACKEND.getProgramInfoLog(program); } + public static boolean glIsProgram(int obj) { + return RENDER_BACKEND.isProgram(obj); + } + + public static boolean glIsShader(int obj) { + return RENDER_BACKEND.isShader(obj); + } + public static void glBindImageTexture(int unit, int texture, int level, boolean layered, int layer, int access, int format) { RENDER_BACKEND.bindImageTexture(unit, texture, level, layered, layer, access, format); } public static void glMemoryBarrier(int barriers) { RENDER_BACKEND.memoryBarrier(barriers); } public static void glCopyImageSubData(int srcName, int srcTarget, int srcLevel, int srcX, int srcY, int srcZ, diff --git a/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/SharedDrawableVaoTest.java b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/SharedDrawableVaoTest.java new file mode 100644 index 000000000..7402231ea --- /dev/null +++ b/glsm/src/test/java/com/gtnewhorizons/angelica/glsm/SharedDrawableVaoTest.java @@ -0,0 +1,79 @@ +package com.gtnewhorizons.angelica.glsm; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.lwjgl.LWJGLException; +import org.lwjgl.opengl.ContextAttribs; +import org.lwjgl.opengl.Display; +import org.lwjgl.opengl.DisplayMode; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL20; +import org.lwjgl.opengl.GL30; +import org.lwjgl.opengl.PixelFormat; +import org.lwjgl.opengl.SharedDrawable; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + +class SharedDrawableVaoTest { + + private static final String VERT_330 = "#version 330 core\nvoid main() { gl_Position = vec4(0.0); }\n"; + private static final String FRAG_330 = "#version 330 core\nout vec4 o;\nvoid main() { o = vec4(0.0); }\n"; + + @BeforeAll + static void createContext() throws LWJGLException { + assumeTrue(!Display.isCreated(), "inherited Display -- skipping to avoid profile drift"); + Display.setDisplayModeAndFullscreen(new DisplayMode(800, 600)); + Display.setResizable(false); + Display.setFullscreen(false); + Display.create( + new PixelFormat().withDepthBits(24).withStencilBits(8), + new ContextAttribs(4, 1).withProfileCore(true).withForwardCompatible(true)); + GL30.glBindVertexArray(GL30.glGenVertexArrays()); + } + + @AfterAll + static void destroyContext() { + if (Display.isCreated()) Display.destroy(); + } + + @Test + void validateProgramSucceedsOnSharedDrawableWithVao() throws LWJGLException { + SharedDrawable shared = new SharedDrawable(Display.getDrawable()); + Display.getDrawable().releaseContext(); + shared.makeCurrent(); + try { + GL30.glBindVertexArray(GL30.glGenVertexArrays()); + int program = linkTrivialProgram(); + GL20.glValidateProgram(program); + assertEquals(GL11.GL_TRUE, GL20.glGetProgrami(program, GL20.GL_VALIDATE_STATUS), () -> GL20.glGetProgramInfoLog(program, 4096)); + GL20.glDeleteProgram(program); + } finally { + shared.releaseContext(); + Display.getDrawable().makeCurrent(); + shared.destroy(); + } + } + + private static int linkTrivialProgram() { + int vs = compile(GL20.GL_VERTEX_SHADER, VERT_330); + int fs = compile(GL20.GL_FRAGMENT_SHADER, FRAG_330); + int program = GL20.glCreateProgram(); + GL20.glAttachShader(program, vs); + GL20.glAttachShader(program, fs); + GL20.glLinkProgram(program); + assertEquals(GL11.GL_TRUE, GL20.glGetProgrami(program, GL20.GL_LINK_STATUS), () -> GL20.glGetProgramInfoLog(program, 4096)); + GL20.glDeleteShader(vs); + GL20.glDeleteShader(fs); + return program; + } + + private static int compile(int type, String src) { + int shader = GL20.glCreateShader(type); + GL20.glShaderSource(shader, src); + GL20.glCompileShader(shader); + assertEquals(GL11.GL_TRUE, GL20.glGetShaderi(shader, GL20.GL_COMPILE_STATUS), () -> GL20.glGetShaderInfoLog(shader, 4096)); + return shader; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index d68f8cc09..6f3cd2976 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -287,6 +287,14 @@ public enum Mixins implements IMixins { ) ), + DRAGONAPI_SHADER_REGISTRY_PARSE_ERROR(new MixinBuilder() + .setPhase(Phase.EARLY) + .addRequiredMod(TargetedMod.DRAGON_API) + .addClientMixins( + "dragonapi.MixinShaderRegistry_ParseError" + ) + ), + IRIS_RENDERING_NOBACKHAND(new MixinBuilder("Iris Hand Shaders") .setPhase(Phase.EARLY) .setApplyIf(() -> AngelicaConfig.enableIris) diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/glsm/MixinSplashProgressCaching.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/glsm/MixinSplashProgressCaching.java index a50f6440f..0236d4851 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/glsm/MixinSplashProgressCaching.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/glsm/MixinSplashProgressCaching.java @@ -35,6 +35,13 @@ public class MixinSplashProgressCaching { ImmediateModeRecorder.initSplashTessellator(); } + // VAOs aren't shared across GL contexts; the SharedDrawable the client thread just swapped + // onto has none. Core profile (macOS) rejects glValidateProgram without one. + @Inject(method = "start", at = @At("RETURN")) + private static void angelica$bindSharedDrawableVAO(CallbackInfo ci) { + GLStateManager.glBindVertexArray(GLStateManager.glGenVertexArrays()); + } + /** * On return from finish() - destroy splash tessellator and mark splash complete */ diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/dragonapi/MixinShaderRegistry_ParseError.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/dragonapi/MixinShaderRegistry_ParseError.java new file mode 100644 index 000000000..b423a6a21 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/dragonapi/MixinShaderRegistry_ParseError.java @@ -0,0 +1,19 @@ +package com.gtnewhorizons.angelica.mixins.early.dragonapi; + +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + + +@Pseudo +@Mixin(targets = { "Reika/DragonAPI/IO/Shaders/ShaderRegistry" }, remap = false) +public class MixinShaderRegistry_ParseError { + + @Redirect(method = "parseError", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL20;glGetShaderInfoLog(II)Ljava/lang/String;")) + private static String angelica$routeInfoLogByType(int id, int maxLen) { + return GLStateManager.glIsProgram(id) ? GLStateManager.glGetProgramInfoLog(id, maxLen) : GLStateManager.glGetShaderInfoLog(id, maxLen); + } +}