fix texture3D and array expressions

TauMC · Oct 24, 2024 · 0510f4b · 0510f4b
1 parent 1e24b38
commit 0510f4b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/src/main/antlr/GLSLParser.g4 b/src/main/antlr/GLSLParser.g4
@@ -396,6 +396,7 @@ type_specifier_nonarray
     | IIMAGE2DMSARRAY
     | UIMAGE2DMSARRAY
     | TEXTURE2D // embeddedt: make texture2D a valid type name for now, so texture2D(t, v) is valid input
+    | TEXTURE3D // ferriarnus: make texture3D a valid type name for now, so texture3D(t, v) is valid input
     | struct_specifier
     | type_name
     ;

diff --git a/src/main/java/org/taumc/glsl/ExpressionRenamer.java b/src/main/java/org/taumc/glsl/ExpressionRenamer.java
@@ -44,6 +44,8 @@ public void enterFunction_prototype(GLSLParser.Function_prototypeContext ctx) {
     public void enterType_specifier_nonarray(GLSLParser.Type_specifier_nonarrayContext ctx) {
         if (ctx.TEXTURE2D() != null) {
             handleIdentifier(ctx.TEXTURE2D());
+        } else if (ctx.TEXTURE3D() != null) {
+            handleIdentifier(ctx.TEXTURE3D());
         }
     }
 }
diff --git a/src/main/java/org/taumc/glsl/FunctionCallWrapper.java b/src/main/java/org/taumc/glsl/FunctionCallWrapper.java
@@ -18,21 +18,6 @@ public FunctionCallWrapper(String name, String code) {
         this.code = code;
     }
 
-//    @Override
-//    public void enterFunction_call_generic(GLSLParser.Function_call_genericContext ctx) {
-//        String function = ctx.getText();
-//        if (function.startsWith(name + "(")) {
-//            function = code + "(" + function + ")";
-//            GLSLLexer lexer = new GLSLLexer(CharStreams.fromString(function));
-//            GLSLParser parser = new GLSLParser(new CommonTokenStream(lexer));
-//            var def = parser.function_call_generic();
-//            var parent = ctx.getParent();
-//            def.setParent(parent);
-//            parent.children.set(parent.children.indexOf(ctx), def);
-//        }
-//    }
-
-
     @Override
     public void enterPostfix_expression(GLSLParser.Postfix_expressionContext ctx) {
         String function = ctx.getText();

diff --git a/src/main/java/org/taumc/glsl/Main.java b/src/main/java/org/taumc/glsl/Main.java
@@ -44,6 +44,7 @@ public static void main(String[] args) throws Exception {
         Util.removeUnusedFunctions(translationUnit);
         Util.rewriteStructArrays(translationUnit);
         Util.renameFunctionCall(translationUnit, "texture2D", "texture");
+        Util.replaceExpression(translationUnit, "gl_TextureMatrix[0]", "mat4(1.0f)");
 
         System.out.println(getFormattedShader(translationUnit));
 

diff --git a/src/main/java/org/taumc/glsl/ReplaceExpression.java b/src/main/java/org/taumc/glsl/ReplaceExpression.java
@@ -28,6 +28,22 @@ public void enterBinary_expression(GLSLParser.Binary_expressionContext ctx) {
             expr.parent = ctx.getParent();
             int i = ctx.getParent().children.indexOf(ctx);
             ctx.getParent().children.set(i, expr);
+        } else if (ctx.getText().startsWith(oldExpression.getText())) {
+            if (ctx.unary_expression() != null) {
+                if (ctx.unary_expression().postfix_expression() != null) {
+                    if (ctx.unary_expression().postfix_expression().postfix_expression() != null) {
+                        if (ctx.unary_expression().postfix_expression().postfix_expression().getText().equals(oldExpression.getText())) {
+                            GLSLLexer lexer = new GLSLLexer(CharStreams.fromString(newExpression));
+                            GLSLParser parser = new GLSLParser(new CommonTokenStream(lexer));
+                            var expr = parser.postfix_expression();
+                            expr.parent = ctx.unary_expression().postfix_expression();
+                            int i = ctx.unary_expression().postfix_expression().children.indexOf(ctx.unary_expression().postfix_expression().postfix_expression());
+                            ctx.unary_expression().postfix_expression().children.set(i, expr);
+                        }
+                    }
+
+                }
+            }
         }
     }
 

diff --git a/test.glsl b/test.glsl
@@ -89,7 +89,7 @@ void main() {
     }
     const float test = _vert_init(vec2(1,1));
 
-    if (vartest > test) {
+    if (vartest > gl_TextureMatrix[0][3]) {
         test = 4;
     }