mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 12:29:40 +00:00
Fix matching across newlines (#1505)
This commit is contained in:
1 parent
90dac9f39d
commit
c769a08a4e
2 files changed
+36
-1
No files matched your search
@@ -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 = """
|
||||
|
||||
Reference in new issue
Block a user