beryl compatibility

Author: xCollateral

src/main/java/net/vulkanmod/mixin/render/clouds/LevelRendererM.java

@@ -22,12 +22,12 @@ public abstract class LevelRendererM {
     @Shadow private @Nullable ClientLevel level;
     @Shadow @Final private LevelTargetBundle targets;
 
-    @Unique private CloudRenderer cloudRenderer;
+    @Unique private CloudRenderer vmCloudRenderer;
 
     @Inject(method = "addCloudsPass", at = @At("HEAD"), cancellable = true)
     public void addCloudsPass(FrameGraphBuilder frameGraphBuilder, CloudStatus cloudStatus, Vec3 camPos, float partialTicks, int i, float g, CallbackInfo ci) {
-        if (this.cloudRenderer == null) {
-            this.cloudRenderer = new CloudRenderer();
+        if (this.vmCloudRenderer == null) {
+            this.vmCloudRenderer = new CloudRenderer();
         }
 
         FramePass framePass = frameGraphBuilder.addPass("clouds");
@@ -41,8 +41,8 @@ public void addCloudsPass(FrameGraphBuilder frameGraphBuilder, CloudStatus cloud
             Profiler profiler = Profiler.getMainProfiler();
             profiler.push("Clouds");
 
-            this.cloudRenderer.renderClouds(this.level, this.ticks, partialTicks,
-                                            camPos.x(), camPos.y(), camPos.z());
+            this.vmCloudRenderer.renderClouds(this.level, this.ticks, partialTicks,
+                                              camPos.x(), camPos.y(), camPos.z());
 
             profiler.pop();
         });
@@ -52,15 +52,15 @@ public void addCloudsPass(FrameGraphBuilder frameGraphBuilder, CloudStatus cloud
 
     @Inject(method = "allChanged", at = @At("RETURN"))
     private void onAllChanged(CallbackInfo ci) {
-        if (this.cloudRenderer != null) {
-            this.cloudRenderer.resetBuffer();
+        if (this.vmCloudRenderer != null) {
+            this.vmCloudRenderer.resetBuffer();
         }
     }
 
     @Inject(method = "onResourceManagerReload", at = @At("RETURN"))
     private void onReload(ResourceManager resourceManager, CallbackInfo ci) {
-        if (this.cloudRenderer != null) {
-            this.cloudRenderer.loadTexture();
+        if (this.vmCloudRenderer != null) {
+            this.vmCloudRenderer.loadTexture();
         }
     }
 

src/main/java/net/vulkanmod/render/PipelineManager.java

@@ -16,10 +16,6 @@
 public abstract class PipelineManager {
     public static VertexFormat terrainVertexFormat;
 
-    public static void setTerrainVertexFormat(VertexFormat format) {
-        terrainVertexFormat = format;
-    }
-
     static GraphicsPipeline
             terrainShader, terrainShaderEarlyZ,
             fastBlitPipeline, cloudsPipeline;
@@ -29,18 +25,18 @@ public static void setTerrainVertexFormat(VertexFormat format) {
     public static void init() {
         setTerrainVertexFormat(CustomVertexFormat.COMPRESSED_TERRAIN);
         createBasicPipelines();
-        setDefaultShader();
+        setDefaultTerrainShaderGetter();
         ThreadBuilderPack.defaultTerrainBuilderConstructor();
     }
 
-    public static void setDefaultShader() {
+    public static void setDefaultTerrainShaderGetter() {
         setShaderGetter(
                 renderType -> renderType == TerrainRenderType.TRANSLUCENT ? terrainShaderEarlyZ : terrainShader);
     }
 
     private static void createBasicPipelines() {
-        terrainShaderEarlyZ = createPipeline("terrain_earlyZ", terrainVertexFormat);
-        terrainShader = createPipeline("terrain", terrainVertexFormat);
+        terrainShaderEarlyZ = createPipeline("terrain_earlyZ", CustomVertexFormat.COMPRESSED_TERRAIN);
+        terrainShader = createPipeline("terrain", CustomVertexFormat.COMPRESSED_TERRAIN);
         fastBlitPipeline = createPipeline("blit", CustomVertexFormat.NONE);
         cloudsPipeline = createPipeline("clouds", DefaultVertexFormat.POSITION_COLOR);
     }
@@ -71,6 +67,14 @@ public static void setShaderGetter(Function<TerrainRenderType, GraphicsPipeline>
         shaderGetter = consumer;
     }
 
+    public static void setTerrainVertexFormat(VertexFormat format) {
+        terrainVertexFormat = format;
+    }
+
+    public static VertexFormat getTerrainVertexFormat() {
+        return terrainVertexFormat;
+    }
+
     public static GraphicsPipeline getTerrainDirectShader(RenderType renderType) {
         return terrainShader;
     }

src/main/java/net/vulkanmod/render/chunk/RenderSection.java

@@ -2,7 +2,6 @@
 
 import com.google.common.collect.Sets;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
-import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.vulkanmod.render.chunk.buffer.AreaBuffer;
@@ -298,7 +297,7 @@ public void resetDrawParameters(TerrainRenderType renderType) {
             AreaBuffer areaBuffer = drawBuffers.getAreaBuffer(renderType);
             int vertexOffset = DrawParametersBuffer.getVertexOffset(ptr);
             if (areaBuffer != null && vertexOffset != -1) {
-                int segmentOffset = vertexOffset * DrawBuffers.VERTEX_SIZE;
+                int segmentOffset = vertexOffset * drawBuffers.vertexSize;
                 areaBuffer.setSegmentFree(segmentOffset);
             }
 

src/main/java/net/vulkanmod/render/chunk/buffer/DrawBuffers.java

@@ -24,7 +24,6 @@
 import static org.lwjgl.vulkan.VK10.*;
 
 public class DrawBuffers {
-    public static final int VERTEX_SIZE = PipelineManager.terrainVertexFormat.getVertexSize();
     public static final int INDEX_SIZE = Short.BYTES;
     public static final int UNDEFINED_FACING_IDX = QuadFacing.UNDEFINED.ordinal();
     public static final float POS_OFFSET = CustomVertexFormat.getPositionOffset();
@@ -34,6 +33,7 @@ public class DrawBuffers {
     private static final long cmdBufferPtr = MemoryUtil.nmemAlignedAlloc(CMD_STRIDE, (long) ChunkAreaManager.AREA_SIZE * QuadFacing.COUNT * CMD_STRIDE);
 
     private final int index;
+    public final int vertexSize = PipelineManager.getTerrainVertexFormat().getVertexSize();
     private final Vector3i origin;
     private final int minHeight;
 
@@ -116,10 +116,10 @@ public void upload(RenderSection section, UploadBuffer buffer, TerrainRenderType
 
             if (vertexBuffer != null && doUpload) {
                 areaBuffer.upload(segment, vertexBuffer, offset);
-                vertexOffset = (segment.offset + offset) / VERTEX_SIZE;
+                vertexOffset = (segment.offset + offset) / vertexSize;
 
                 offset += vertexBuffer.remaining();
-                vertexCount = vertexBuffer.limit() / VERTEX_SIZE;
+                vertexCount = vertexBuffer.limit() / vertexSize;
                 indexCount = vertexCount * 6 / 4;
             }
 
@@ -154,7 +154,7 @@ private AreaBuffer getAreaBufferOrAlloc(TerrainRenderType renderType) {
         };
 
         return this.vertexBuffers.computeIfAbsent(
-                renderType, renderType1 -> new AreaBuffer(AreaBuffer.Usage.VERTEX, initialSize, VERTEX_SIZE));
+                renderType, renderType1 -> new AreaBuffer(AreaBuffer.Usage.VERTEX, initialSize, vertexSize));
     }
 
     public AreaBuffer getAreaBuffer(TerrainRenderType r) {