fix texture2D issue

TauMC · Oct 20, 2024 · bc38ac8 · bc38ac8
1 parent 27dc6b4
commit bc38ac8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/org/taumc/glsl/ExpressionRenamer.java b/src/main/java/org/taumc/glsl/ExpressionRenamer.java
@@ -38,4 +38,12 @@ public void enterFunction_prototype(GLSLParser.Function_prototypeContext ctx) {
             handleIdentifier(ctx.IDENTIFIER());
         }
     }
+
+
+    @Override
+    public void enterType_specifier_nonarray(GLSLParser.Type_specifier_nonarrayContext ctx) {
+        if (ctx.TEXTURE2D() != null) {
+            handleIdentifier(ctx.TEXTURE2D());
+        }
+    }
 }
diff --git a/src/main/java/org/taumc/glsl/Main.java b/src/main/java/org/taumc/glsl/Main.java
@@ -42,12 +42,14 @@ public static void main(String[] args) throws Exception {
         Util.replaceExpression(translationUnit, "vartest", "unint(5)");
         Util.removeUnusedFunctions(translationUnit);
         Util.rewriteStructArrays(translationUnit);
+        Util.renameFunctionCall(translationUnit, "texture2D", "texture");
+
         System.out.println(getFormattedShader(translationUnit));
 
         ShaderViewerGUI.display(parser, translationUnit);
     }
 
-    private static String getFormattedShader(ParseTree tree) {
+    public static String getFormattedShader(ParseTree tree) {
         StringBuilder sb = new StringBuilder();
         getFormattedShader(tree, sb);
         return sb.toString();

diff --git a/src/main/java/org/taumc/glsl/Util.java b/src/main/java/org/taumc/glsl/Util.java
@@ -174,10 +174,10 @@ public static void initialize(GLSLParser.Translation_unitContext root, GLSLParse
         }
     }
 
-    public static void makeOutDeclaration(GLSLParser.Translation_unitContext root, GLSLParser.Single_declarationContext inDeclarationContext) {
-        String insert = inDeclarationContext.getText() + ";";
+    public static void makeOutDeclaration(GLSLParser.Translation_unitContext root, GLSLParser.Single_declarationContext inDeclarationContext, String name) {
+        String insert = Main.getFormattedShader(inDeclarationContext.fully_specified_type()) + name + ";"; //TODO, find a different way to make the out declaration
         insert = insert.replaceFirst("in", "out");
-        Util.prependMain(root, insert);
+        Util.injectVariable(root, insert);
     }
 
     public static Map<String, GLSLParser.Single_declarationContext> findQualifiers(GLSLParser.Translation_unitContext root, int type) {