Added glsl-processor

FoundryMC · Feb 13, 2025 · 283e800 · 283e800
1 parent 7185578
commit 283e800
Show file tree

Hide file tree

Showing 117 changed files with 126 additions and 13,335 deletions.
diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle
@@ -57,6 +57,17 @@ repositories {
             includeGroup "maven.modrinth"
         }
     }
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = "JitPack"
+                url = "https://jitpack.io"
+            }
+        }
+        filter {
+            includeGroup "com.github.Ocelot5836"
+        }
+    }
     maven {
         name = 'BlameJared'
         url = 'https://maven.blamejared.com'

diff --git a/common/build.gradle b/common/build.gradle
@@ -24,6 +24,8 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
     implementation "gg.moonflower:molang-compiler:${molang_compiler_version}"
+//    implementation "io.github.ocelot:glsl-processor:${glsl_processor_version}"
+    implementation "com.github.Ocelot5836:glsl-processor:${glsl_processor_version}"
 
     implementation "io.github.spair:imgui-java-binding:$imgui_version"
     implementation("io.github.spair:imgui-java-lwjgl3:$imgui_version") {

diff --git a/common/src/main/java/foundry/veil/api/client/necromancer/render/Skin.java b/common/src/main/java/foundry/veil/api/client/necromancer/render/Skin.java
@@ -31,7 +31,6 @@
 import java.util.List;
 
 import static org.lwjgl.opengl.ARBDirectStateAccess.glNamedBufferSubData;
-import static org.lwjgl.opengl.GL11C.GL_TRIANGLES;
 import static org.lwjgl.opengl.GL15C.glBindBuffer;
 import static org.lwjgl.opengl.GL15C.glBufferSubData;
 import static org.lwjgl.opengl.GL30C.glUniform1ui;

diff --git a/common/src/main/java/foundry/veil/api/client/render/VeilShaderBufferLayout.java b/common/src/main/java/foundry/veil/api/client/render/VeilShaderBufferLayout.java
@@ -1,10 +1,10 @@
 package foundry.veil.api.client.render;
 
 import foundry.veil.api.client.render.shader.definition.ShaderBlock;
-import foundry.veil.api.glsl.grammar.*;
-import foundry.veil.api.glsl.node.GlslNode;
-import foundry.veil.api.glsl.node.variable.GlslNewNode;
-import foundry.veil.api.glsl.node.variable.GlslStructNode;
+import io.github.ocelot.glslprocessor.api.grammar.*;
+import io.github.ocelot.glslprocessor.api.node.GlslNode;
+import io.github.ocelot.glslprocessor.api.node.variable.GlslNewNode;
+import io.github.ocelot.glslprocessor.api.node.variable.GlslStructNode;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import org.jetbrains.annotations.Nullable;
 import org.joml.*;

diff --git a/common/src/main/java/foundry/veil/api/client/render/dynamicbuffer/DynamicBufferType.java b/common/src/main/java/foundry/veil/api/client/render/dynamicbuffer/DynamicBufferType.java
@@ -3,7 +3,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import foundry.veil.api.client.render.framebuffer.FramebufferAttachmentDefinition;
-import foundry.veil.api.glsl.grammar.GlslTypeSpecifier;
+import io.github.ocelot.glslprocessor.api.grammar.GlslTypeSpecifier;
 
 import java.util.Arrays;
 import java.util.Locale;

diff --git a/...on/src/main/java/foundry/veil/api/client/render/light/renderer/IndirectLightRenderer.java b/...on/src/main/java/foundry/veil/api/client/render/light/renderer/IndirectLightRenderer.java
@@ -4,8 +4,10 @@
 import com.mojang.blaze3d.vertex.MeshData;
 import com.mojang.blaze3d.vertex.VertexBuffer;
 import foundry.veil.Veil;
+import foundry.veil.VeilDebugHooks;
 import foundry.veil.api.client.render.CullFrustum;
 import foundry.veil.api.client.render.VeilRenderSystem;
+import foundry.veil.api.client.render.ext.VeilDebug;
 import foundry.veil.api.client.render.light.IndirectLight;
 import foundry.veil.api.client.render.light.Light;
 import foundry.veil.api.client.render.shader.VeilShaders;

diff --git a/common/src/main/java/foundry/veil/api/client/render/post/stage/BlitPostStage.java b/common/src/main/java/foundry/veil/api/client/render/post/stage/BlitPostStage.java
@@ -1,6 +1,5 @@
 package foundry.veil.api.client.render.post.stage;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
@@ -14,7 +13,6 @@
 import foundry.veil.api.client.render.post.PostPipeline;
 import foundry.veil.api.client.render.post.uniform.UniformValue;
 import foundry.veil.api.client.render.shader.program.ShaderProgram;
-import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 import org.joml.*;

diff --git a/common/src/main/java/foundry/veil/api/client/render/shader/ShaderImporter.java b/common/src/main/java/foundry/veil/api/client/render/shader/ShaderImporter.java
@@ -1,7 +1,7 @@
 package foundry.veil.api.client.render.shader;
 
 import foundry.veil.api.client.render.shader.processor.ShaderPreProcessor;
-import foundry.veil.api.glsl.node.GlslTree;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
 import net.minecraft.resources.ResourceLocation;
 
 import java.io.IOException;

diff --git a/common/src/main/java/foundry/veil/api/client/render/shader/ShaderManager.java b/common/src/main/java/foundry/veil/api/client/render/shader/ShaderManager.java
@@ -12,16 +12,16 @@
 import foundry.veil.api.client.render.shader.processor.*;
 import foundry.veil.api.client.render.shader.program.ProgramDefinition;
 import foundry.veil.api.client.render.shader.program.ShaderProgram;
-import foundry.veil.api.glsl.GlslParser;
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.node.GlslTree;
 import foundry.veil.impl.ThreadTaskScheduler;
 import foundry.veil.impl.client.render.dynamicbuffer.DynamicBufferManger;
 import foundry.veil.impl.client.render.dynamicbuffer.DynamicBufferProcessor;
 import foundry.veil.impl.client.render.shader.ShaderImporterImpl;
 import foundry.veil.impl.client.render.shader.program.DynamicShaderProgramImpl;
 import foundry.veil.impl.client.render.shader.program.ShaderProgramImpl;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslParser;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;

diff --git a/common/src/main/java/foundry/veil/api/client/render/shader/ShaderModificationManager.java b/common/src/main/java/foundry/veil/api/client/render/shader/ShaderModificationManager.java
@@ -1,12 +1,12 @@
 package foundry.veil.api.client.render.shader;
 
 import foundry.veil.Veil;
-import foundry.veil.api.glsl.node.GlslTree;
 import foundry.veil.impl.client.render.shader.modifier.InputShaderModification;
 import foundry.veil.impl.client.render.shader.modifier.ReplaceShaderModification;
 import foundry.veil.impl.client.render.shader.modifier.ShaderModification;
 import foundry.veil.impl.client.render.shader.modifier.SimpleShaderModification;
 import foundry.veil.impl.client.render.shader.transformer.VeilJobParameters;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
 import net.minecraft.resources.FileToIdConverter;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.Resource;

diff --git a/common/src/main/java/foundry/veil/api/client/render/shader/definition/ShaderBlock.java b/common/src/main/java/foundry/veil/api/client/render/shader/definition/ShaderBlock.java
@@ -1,10 +1,10 @@
 package foundry.veil.api.client.render.shader.definition;
 
 import foundry.veil.api.client.render.VeilRenderSystem;
-import foundry.veil.api.glsl.grammar.GlslTypeQualifier;
 import foundry.veil.impl.client.render.shader.definition.DynamicShaderBlockImpl;
 import foundry.veil.impl.client.render.shader.definition.SizedShaderBlockImpl;
 import foundry.veil.impl.client.render.shader.definition.WrapperShaderBlockImpl;
+import io.github.ocelot.glslprocessor.api.grammar.GlslTypeQualifier;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.system.NativeResource;
 

diff --git a/...src/main/java/foundry/veil/api/client/render/shader/processor/ShaderBindingProcessor.java b/...src/main/java/foundry/veil/api/client/render/shader/processor/ShaderBindingProcessor.java
@@ -1,12 +1,12 @@
 package foundry.veil.api.client.render.shader.processor;
 
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.grammar.GlslSpecifiedType;
-import foundry.veil.api.glsl.grammar.GlslTypeQualifier;
-import foundry.veil.api.glsl.grammar.GlslTypeSpecifier;
-import foundry.veil.api.glsl.node.GlslConstantNode;
-import foundry.veil.api.glsl.node.GlslTree;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.grammar.GlslSpecifiedType;
+import io.github.ocelot.glslprocessor.api.grammar.GlslTypeQualifier;
+import io.github.ocelot.glslprocessor.api.grammar.GlslTypeSpecifier;
+import io.github.ocelot.glslprocessor.api.node.GlslConstantNode;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 
 import java.io.IOException;
 import java.util.Iterator;

diff --git a/.../src/main/java/foundry/veil/api/client/render/shader/processor/ShaderBufferProcessor.java b/.../src/main/java/foundry/veil/api/client/render/shader/processor/ShaderBufferProcessor.java
@@ -2,9 +2,9 @@
 
 import foundry.veil.api.client.registry.VeilShaderBufferRegistry;
 import foundry.veil.api.client.render.VeilShaderBufferLayout;
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.node.GlslTree;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 import net.minecraft.ResourceLocationException;
 import net.minecraft.resources.ResourceLocation;
 

diff --git a/.../src/main/java/foundry/veil/api/client/render/shader/processor/ShaderImportProcessor.java b/.../src/main/java/foundry/veil/api/client/render/shader/processor/ShaderImportProcessor.java
@@ -1,8 +1,8 @@
 package foundry.veil.api.client.render.shader.processor;
 
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.node.GlslTree;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 import net.minecraft.ResourceLocationException;
 import net.minecraft.resources.ResourceLocation;
 

diff --git a/.../src/main/java/foundry/veil/api/client/render/shader/processor/ShaderModifyProcessor.java b/.../src/main/java/foundry/veil/api/client/render/shader/processor/ShaderModifyProcessor.java
@@ -2,10 +2,10 @@
 
 import foundry.veil.api.client.render.VeilRenderSystem;
 import foundry.veil.api.client.render.shader.ShaderModificationManager;
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.node.GlslTree;
 import foundry.veil.impl.client.render.shader.transformer.VeilJobParameters;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 import net.minecraft.resources.ResourceLocation;
 
 import java.io.IOException;

diff --git a/...n/src/main/java/foundry/veil/api/client/render/shader/processor/ShaderMultiProcessor.java b/...n/src/main/java/foundry/veil/api/client/render/shader/processor/ShaderMultiProcessor.java
@@ -1,8 +1,8 @@
 package foundry.veil.api.client.render.shader.processor;
 
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.node.GlslTree;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 
 import java.io.IOException;
 

diff --git a/common/src/main/java/foundry/veil/api/client/render/shader/processor/ShaderPreProcessor.java b/common/src/main/java/foundry/veil/api/client/render/shader/processor/ShaderPreProcessor.java
@@ -6,13 +6,13 @@
 import foundry.veil.api.client.render.shader.ShaderManager;
 import foundry.veil.api.client.render.shader.definition.ShaderPreDefinitions;
 import foundry.veil.api.client.render.shader.program.ProgramDefinition;
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.node.GlslNode;
-import foundry.veil.api.glsl.node.GlslRootNode;
-import foundry.veil.api.glsl.node.GlslTree;
-import foundry.veil.api.glsl.node.function.GlslFunctionNode;
-import foundry.veil.api.glsl.node.variable.GlslNewNode;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.node.GlslNode;
+import io.github.ocelot.glslprocessor.api.node.GlslRootNode;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.api.node.function.GlslFunctionNode;
+import io.github.ocelot.glslprocessor.api.node.variable.GlslNewNode;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...src/main/java/foundry/veil/api/client/render/shader/processor/ShaderVersionProcessor.java b/...src/main/java/foundry/veil/api/client/render/shader/processor/ShaderVersionProcessor.java
@@ -1,9 +1,9 @@
 package foundry.veil.api.client.render.shader.processor;
 
-import foundry.veil.api.glsl.GlslSyntaxException;
-import foundry.veil.api.glsl.grammar.GlslVersionStatement;
-import foundry.veil.api.glsl.node.GlslTree;
-import foundry.veil.lib.anarres.cpp.LexerException;
+import io.github.ocelot.glslprocessor.api.GlslSyntaxException;
+import io.github.ocelot.glslprocessor.api.grammar.GlslVersionStatement;
+import io.github.ocelot.glslprocessor.api.node.GlslTree;
+import io.github.ocelot.glslprocessor.lib.anarres.cpp.LexerException;
 
 import java.io.IOException;
 

diff --git a/common/src/main/java/foundry/veil/api/client/render/shader/program/ShaderProgram.java b/common/src/main/java/foundry/veil/api/client/render/shader/program/ShaderProgram.java
@@ -1,7 +1,6 @@
 package foundry.veil.api.client.render.shader.program;
 
 import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.shaders.Uniform;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormat;

diff --git a/common/src/main/java/foundry/veil/api/glsl/GlslInjectionPoint.java b/common/src/main/java/foundry/veil/api/glsl/GlslInjectionPoint.java