diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformer.java b/src/main/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformer.java index 668ad41d8..587577b28 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformer.java @@ -40,7 +40,7 @@ import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; public class CompatShaderTransformer { private static final Pattern VERSION_PATTERN = - Pattern.compile("#version\\s+(\\d+)(?:\\s+(\\w+))?"); + Pattern.compile("#version[ \\t]+(\\d+)(?:[ \\t]+(\\w+))?"); private static final Pattern DEFINE_PATTERN = Pattern.compile("^\\s*#\\s*define\\s+.+$", Pattern.MULTILINE); diff --git a/src/test/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformerTest.java b/src/test/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformerTest.java index f17b05893..f782075ea 100644 --- a/src/test/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformerTest.java +++ b/src/test/java/com/gtnewhorizons/angelica/glsm/CompatShaderTransformerTest.java @@ -529,6 +529,41 @@ class CompatShaderTransformerTest { assertTrue(result.contains("angelica_SceneColor"), "should reference angelica_SceneColor"); } + @Test + void testVersionPatternDoesNotEatNextLine() { + String src = "#version 330\nsomeword\n"; + + String result = CompatShaderTransformer.transform(src, false); + assertTrue(result.contains("someword"), "Next-line word must not be eaten by version fixup"); + assertTrue(result.contains("#version 330 core"), "Version should be upgraded to core"); + } + + @Test + void testModernShaderWithoutCoreKeyword() { + String src = """ + #version 430 + in vec3 Position; + uniform mat4 ModelViewMat; + uniform mat4 ProjMat; + out vec4 vertexColor; + out float fogDistance; + void main() { + vec4 finalPos = vec4(Position, 1.0); + vec4 modelPos = ModelViewMat * finalPos; + gl_Position = ProjMat * modelPos; + fogDistance = length(modelPos.xz); + vertexColor = vec4(1.0); + } + """; + + String result = CompatShaderTransformer.transform(src, false); + assertTrue(result.contains("#version 430 core"), "Version should get 'core' profile added"); + assertTrue(result.contains("in vec3 Position"), "'in' keyword must not be eaten"); + assertTrue(result.contains("ModelViewMat"), "Shader content must be preserved"); + assertTrue(result.contains("ProjMat"), "Shader content must be preserved"); + assertTrue(result.contains("fogDistance"), "Shader content must be preserved"); + } + @Test void testLegacyQualifierConversion() { String vertSrc = """