Update renderer integration for new pipeline API

README.md

@@ -75,3 +75,8 @@ This is a fabric mod that introduces a brand new **Vulkan** based voxel renderin
 - This mod is still in development, please report issues in the [issue tab](https://github.com/xCollateral/VulkanMod/issues) with logs attached!
 - This mode isn't just "minecraft on vulkan" (e.g: [zink](https://docs.mesa3d.org/drivers/zink.html) ), it is a full rewrite of the minecraft renderer.
 
+## Development
+
+- Run `./gradlew genSource` after updating mappings to refresh the decompiled Minecraft sources used by the mixins. The build script uses [Fabric Loom](https://github.com/FabricMC/fabric-loom) with Mojang mappings, so the access widener stays in the `named` namespace even though the source names now match Mojang's.
+- If the command emits a very large log, redirect the output to a file (for example `./gradlew genSource > genSource.log`) so you can inspect the results after the task completes.
+

src/main/java/net/vulkanmod/config/gui/VOptionList.java

@@ -8,6 +8,7 @@
 import net.vulkanmod.config.gui.widget.OptionWidget;
 import net.vulkanmod.config.gui.widget.VAbstractWidget;
 import net.vulkanmod.config.option.Option;
+import net.vulkanmod.vulkan.VRenderSystem;
 import net.vulkanmod.vulkan.util.ColorUtil;
 import org.jetbrains.annotations.Nullable;
 
@@ -203,7 +204,7 @@ public void updateState(double mX, double mY) {
     }
 
     public void renderWidget(int mouseX, int mouseY) {
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
         GuiRenderer.enableScissor(x, y, width, height);
 
         this.renderList(mouseX, mouseY);

src/main/java/net/vulkanmod/config/gui/widget/CyclingOptionWidget.java

@@ -8,6 +8,7 @@
 import net.minecraft.network.chat.Component;
 import net.vulkanmod.config.gui.GuiRenderer;
 import net.vulkanmod.config.option.CyclingOption;
+import net.vulkanmod.vulkan.VRenderSystem;
 import net.vulkanmod.vulkan.util.ColorUtil;
 import org.joml.Matrix4f;
 
@@ -32,7 +33,7 @@ protected int getYImage(boolean hovered) {
     }
 
     public void renderControls(double mouseX, double mouseY) {
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
 
         this.renderBars();
 
@@ -127,7 +128,7 @@ void renderButton(PoseStack matrices, double mouseX, double mouseY) {
             Tesselator tesselator = Tesselator.getInstance();
             BufferBuilder bufferBuilder = tesselator.begin(VertexFormat.Mode.TRIANGLE_STRIP, DefaultVertexFormat.POSITION);
 
-            RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+            VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
 
             float f = this.isHovered(mouseX, mouseY) && this.active ? 5.0f : 4.5f;
 
@@ -137,11 +138,11 @@ void renderButton(PoseStack matrices, double mouseX, double mouseY) {
             RenderSystem.enableBlend();
 
             if(this.isHovered(mouseX, mouseY) && this.active)
-                RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+                VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
             else if(this.active)
-                RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 0.8f);
+                VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 0.8f);
             else
-                RenderSystem.setShaderColor(0.3f, 0.3f, 0.3f, 0.8f);
+                VRenderSystem.setShaderColor(0.3f, 0.3f, 0.3f, 0.8f);
 
             float h = f;
             float w = f - 1.0f;
@@ -159,7 +160,7 @@ else if(this.active)
 
             BufferUploader.drawWithShader(bufferBuilder.buildOrThrow());
 
-            RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+            VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
             RenderSystem.setShader(GameRenderer::getPositionTexShader);
         }
 

src/main/java/net/vulkanmod/config/gui/widget/OptionWidget.java

@@ -1,6 +1,5 @@
 package net.vulkanmod.config.gui.widget;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
@@ -19,6 +18,7 @@
 import net.vulkanmod.config.option.CyclingOption;
 import net.vulkanmod.config.option.Option;
 import net.vulkanmod.render.util.MathUtil;
+import net.vulkanmod.vulkan.VRenderSystem;
 import net.vulkanmod.vulkan.util.ColorUtil;
 
 import java.util.Objects;
@@ -70,7 +70,7 @@ public void renderWidget(double mouseX, double mouseY) {
         Minecraft minecraftClient = Minecraft.getInstance();
 
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
         int i = this.getYImage(this.isHovered());
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();

src/main/java/net/vulkanmod/config/gui/widget/RangeOptionWidget.java

@@ -1,6 +1,5 @@
 package net.vulkanmod.config.gui.widget;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.sounds.SoundManager;
@@ -9,6 +8,7 @@
 import net.vulkanmod.config.gui.GuiRenderer;
 import net.vulkanmod.config.option.RangeOption;
 import net.vulkanmod.vulkan.util.ColorUtil;
+import net.vulkanmod.vulkan.VRenderSystem;
 import org.lwjgl.glfw.GLFW;
 
 public class RangeOptionWidget extends OptionWidget<RangeOption> {
@@ -30,7 +30,7 @@ protected int getYImage(boolean hovered) {
 
     @Override
     protected void renderControls(double mouseX, double mouseY) {
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
 
         int valueX = this.controlX + (int) (this.value * (this.controlWidth));
 

src/main/java/net/vulkanmod/config/gui/widget/VButtonWidget.java

@@ -1,13 +1,13 @@
 package net.vulkanmod.config.gui.widget;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
 import net.vulkanmod.config.gui.GuiRenderer;
 import net.vulkanmod.vulkan.util.ColorUtil;
+import net.vulkanmod.vulkan.VRenderSystem;
 
 import java.util.function.Consumer;
 
@@ -28,7 +28,7 @@ public void renderWidget(double mouseX, double mouseY) {
         Minecraft minecraftClient = Minecraft.getInstance();
         Font textRenderer = minecraftClient.font;
         RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, this.alpha);
+        VRenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, this.alpha);
 
         RenderSystem.enableBlend();
 

src/main/java/net/vulkanmod/mixin/render/DynamicUniformsMixin.java

@@ -0,0 +1,28 @@
+package net.vulkanmod.mixin.render;
+
+import com.mojang.blaze3d.buffers.GpuBufferSlice;
+import net.minecraft.client.renderer.DynamicUniforms;
+import net.vulkanmod.vulkan.VRenderSystem;
+import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
+import org.joml.Vector3fc;
+import org.joml.Vector4fc;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(DynamicUniforms.class)
+public class DynamicUniformsMixin {
+
+    @Inject(method = "writeTransform", at = @At("HEAD"))
+    private void captureTransform(Matrix4fc modelView, Vector4fc color, Vector3fc modelOffset, Matrix4fc textureMatrix, float lineWidth, CallbackInfoReturnable<GpuBufferSlice> cir) {
+        VRenderSystem.applyModelViewMatrix(new Matrix4f(modelView));
+        VRenderSystem.setShaderColor(color.x(), color.y(), color.z(), color.w());
+        VRenderSystem.setModelOffset(modelOffset.x(), modelOffset.y(), modelOffset.z());
+        VRenderSystem.setTextureMatrix(new Matrix4f(textureMatrix));
+        VRenderSystem.setLineWidth(lineWidth);
+        VRenderSystem.calculateMVP();
+    }
+}
+