Merge pull request #30 from xirreal/master

Use Iris uniforms instead of replicating them

src/main/java/me/cortex/vulkanite/client/rendering/VulkanPipeline.java

@@ -8,10 +8,7 @@
 import me.cortex.vulkanite.lib.base.VContext;
 import me.cortex.vulkanite.lib.cmd.VCmdBuff;
 import me.cortex.vulkanite.lib.cmd.VCommandPool;
-import me.cortex.vulkanite.lib.descriptors.DescriptorSetLayoutBuilder;
 import me.cortex.vulkanite.lib.descriptors.DescriptorUpdateBuilder;
-import me.cortex.vulkanite.lib.descriptors.VDescriptorPool;
-import me.cortex.vulkanite.lib.descriptors.VDescriptorSetLayout;
 import me.cortex.vulkanite.lib.memory.VBuffer;
 import me.cortex.vulkanite.lib.memory.VGImage;
 import me.cortex.vulkanite.lib.memory.VImage;
@@ -21,32 +18,26 @@
 import me.cortex.vulkanite.lib.pipeline.RaytracePipelineBuilder;
 import me.cortex.vulkanite.lib.pipeline.VRaytracePipeline;
 import me.cortex.vulkanite.lib.shader.reflection.ShaderReflection;
+import me.cortex.vulkanite.mixin.iris.MixinCelestialUniforms;
+import me.cortex.vulkanite.mixin.iris.MixinCommonUniforms;
 import net.coderbot.iris.gl.buffer.ShaderStorageBuffer;
-import net.coderbot.iris.gl.buffer.ShaderStorageBufferHolder;
-import net.coderbot.iris.gl.buffer.ShaderStorageInfo;
 import net.coderbot.iris.texture.pbr.PBRTextureHolder;
 import net.coderbot.iris.texture.pbr.PBRTextureManager;
 import net.coderbot.iris.uniforms.CapturedRenderingState;
-import net.coderbot.iris.uniforms.CelestialUniforms;
+import net.coderbot.iris.uniforms.CommonUniforms;
+import net.coderbot.iris.uniforms.SystemTimeUniforms;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.CameraSubmersionType;
 import net.minecraft.client.texture.AbstractTexture;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.RotationAxis;
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
-import org.joml.Vector4f;
 import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.vulkan.*;
 
-import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
 import java.util.*;
 
-import static net.coderbot.iris.uniforms.CelestialUniforms.getSunAngle;
-import static net.coderbot.iris.uniforms.CelestialUniforms.isDay;
 import static org.lwjgl.opengl.EXTSemaphore.GL_LAYOUT_GENERAL_EXT;
 import static org.lwjgl.opengl.GL11C.glFinish;
 import static org.lwjgl.opengl.GL11C.glFlush;
@@ -233,9 +224,7 @@ public VulkanPipeline(VContext ctx, AccelerationManager accelerationManager, Ray
 
     private VSemaphore previousSemaphore;
 
-    private int frameId;
-
-    public void renderPostShadows(List<VGImage> outImgs, Camera camera, ShaderStorageBuffer[] ssbos) {
+    public void renderPostShadows(List<VGImage> outImgs, Camera camera, ShaderStorageBuffer[] ssbos, MixinCelestialUniforms celestialUniforms) {
         this.singleUsePool.doReleases();
         PBRTextureManager.notifyPBRTexturesChanged();
 
@@ -281,12 +270,12 @@ public void renderPostShadows(List<VGImage> outImgs, Camera camera, ShaderStorag
                 invProjMatrix.transformProject(+1, +1, 0, 1, tmpv3).get(12*Float.BYTES, bb);
                 invViewMatrix.get(Float.BYTES * 16, bb);
 
-                Uniforms.getSunPosition().get(Float.BYTES * 32, bb);
-                Uniforms.getMoonPosition().get(Float.BYTES * 36, bb);
+                celestialUniforms.invokeGetSunPosition().get(Float.BYTES * 32, bb);
+                celestialUniforms.invokeGetMoonPosition().get(Float.BYTES * 36, bb);
 
-                bb.putInt(Float.BYTES * 40, frameId++);
+                bb.putInt(Float.BYTES * 40, SystemTimeUniforms.COUNTER.getAsInt());
 
-                int flags = Uniforms.isEyeInWater()&3;
+                int flags = MixinCommonUniforms.invokeIsEyeInWater() & 3;
                 bb.putInt(Float.BYTES * 41, flags);
                 bb.rewind();
             }

src/main/java/me/cortex/vulkanite/mixin/iris/MixinCelestialUniforms.java

@@ -0,0 +1,15 @@
+package me.cortex.vulkanite.mixin.iris;
+
+import net.coderbot.iris.uniforms.CelestialUniforms;
+import org.joml.Vector4f;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(value = CelestialUniforms.class, remap = false)
+public interface MixinCelestialUniforms {
+    @Invoker("getSunPosition")
+    public Vector4f invokeGetSunPosition();
+
+    @Invoker("getMoonPosition")
+    public Vector4f invokeGetMoonPosition();
+}

src/main/java/me/cortex/vulkanite/mixin/iris/MixinCommonUniforms.java

@@ -0,0 +1,11 @@
+package me.cortex.vulkanite.mixin.iris;
+
+import net.coderbot.iris.uniforms.CommonUniforms;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(value = CommonUniforms.class, remap = false)
+public interface MixinCommonUniforms {
+    @Invoker("isEyeInWater")
+    public static int invokeIsEyeInWater() { return 0; } // Must have a body, but this is just a dummy body and doesn't actually get executed.
+}

src/main/java/me/cortex/vulkanite/mixin/iris/MixinNewWorldRenderingPipeline.java

@@ -4,21 +4,21 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap.Entry;
 import me.cortex.vulkanite.client.Vulkanite;
 import me.cortex.vulkanite.client.rendering.VulkanPipeline;
-import me.cortex.vulkanite.compat.IGetRaytracingSource;
-import me.cortex.vulkanite.compat.IRenderTargetVkGetter;
-import me.cortex.vulkanite.compat.IVGImage;
-import me.cortex.vulkanite.compat.RaytracingShaderSet;
+import me.cortex.vulkanite.compat.*;
 import me.cortex.vulkanite.lib.base.VContext;
 import me.cortex.vulkanite.lib.memory.VGImage;
 import net.coderbot.iris.gl.buffer.ShaderStorageBuffer;
 import net.coderbot.iris.gl.texture.TextureAccess;
 import net.coderbot.iris.gl.buffer.ShaderStorageBufferHolder;
+import net.coderbot.iris.gl.uniform.DynamicUniformHolder;
 import net.coderbot.iris.mixin.LevelRendererAccessor;
 import net.coderbot.iris.pipeline.CustomTextureManager;
 import net.coderbot.iris.pipeline.newshader.NewWorldRenderingPipeline;
 import net.coderbot.iris.rendertarget.RenderTargets;
 import net.coderbot.iris.shaderpack.ProgramSet;
 import net.coderbot.iris.shaderpack.texture.TextureStage;
+import net.coderbot.iris.uniforms.CelestialUniforms;
+import net.coderbot.iris.uniforms.custom.CustomUniforms;
 import net.minecraft.client.render.Camera;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
@@ -39,7 +39,8 @@ public class MixinNewWorldRenderingPipeline {
     @Shadow @Final private RenderTargets renderTargets;
     @Shadow @Final private CustomTextureManager customTextureManager;
     @Shadow private ShaderStorageBufferHolder shaderStorageBufferHolder;
-
+
+    @Shadow @Final private float sunPathRotation;
     @Unique private RaytracingShaderSet[] rtShaderPasses = null;
     @Unique private VContext ctx;
     @Unique private VulkanPipeline pipeline;
@@ -55,11 +56,9 @@ private VGImage[] getCustomTextures() {
 
         entryList.sort(Comparator.comparing(Entry::getKey));
 
-        VGImage[] sortedTextures = entryList.stream()
+        return entryList.stream()
                 .map(entry -> ((IVGImage) entry.getValue()).getVGImage())
                 .toArray(VGImage[]::new);
-
-        return sortedTextures;
     }
 
     @Inject(method = "<init>", at = @At("TAIL"))
@@ -88,7 +87,10 @@ private void renderShadows(LevelRendererAccessor par1, Camera par2, CallbackInfo
         for (int i = 0; i < renderTargets.getRenderTargetCount(); i++) {
             outImgs.add(((IRenderTargetVkGetter)renderTargets.getOrCreate(i)).getMain());
         }
-        pipeline.renderPostShadows(outImgs, par2, buffers);
+
+        MixinCelestialUniforms celestialUniforms = (MixinCelestialUniforms)(Object) new CelestialUniforms(this.sunPathRotation);
+
+        pipeline.renderPostShadows(outImgs, par2, buffers, celestialUniforms);
     }
 
     @Inject(method = "destroyShaders", at = @At("TAIL"))

src/main/resources/vulkanite.mixins.json

@@ -4,9 +4,11 @@
   "package": "me.cortex.vulkanite.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "iris.MixinNativeImageBackedTexture",
+    "iris.MixinCelestialUniforms",
+    "iris.MixinCommonUniforms",
     "iris.MixinGlResource",
     "iris.MixinGlTexture",
+    "iris.MixinNativeImageBackedTexture",
     "iris.MixinNewWorldRenderingPipeline",
     "iris.MixinPackRenderTargetDirectives",
     "iris.MixinPBRAtlasTexture",