Merge pull request CaffeineMC#2060 from embeddedt/ignore-undersized-q…

…uads Ignore undersized quads
QuestCraftPlusPlus · Sep 18, 2023 · 42bb21e · 42bb21e
2 parents 4539ebf + 64ef95c
commit 42bb21e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/.../sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java b/.../sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java
@@ -32,6 +32,10 @@ public void quad(MatrixStack.Entry matrices, BakedQuad bakedQuad, float r, float
             throw new IllegalStateException();
         }
 
+        if (bakedQuad.getVertexData().length < 32) {
+            return; // we do not accept quads with less than 4 properly sized vertices
+        }
+
         VertexBufferWriter writer = VertexBufferWriter.of(this);
 
         ModelQuadView quad = (ModelQuadView) bakedQuad;
@@ -56,6 +60,10 @@ public void quad(MatrixStack.Entry matrices, BakedQuad bakedQuad, float[] bright
             throw new IllegalStateException();
         }
 
+        if (bakedQuad.getVertexData().length < 32) {
+            return; // we do not accept quads with less than 4 properly sized vertices
+        }
+
         VertexBufferWriter writer = VertexBufferWriter.of(this);
 
         ModelQuadView quad = (ModelQuadView) bakedQuad;

diff --git a/.../me/jellysquid/mods/sodium/mixin/features/render/model/block/BlockModelRendererMixin.java b/.../me/jellysquid/mods/sodium/mixin/features/render/model/block/BlockModelRendererMixin.java
@@ -74,6 +74,11 @@ private void renderFast(MatrixStack.Entry entry, VertexConsumer vertexConsumer,
     private static void renderQuads(MatrixStack.Entry matrices, VertexBufferWriter writer, int defaultColor, List<BakedQuad> quads, int light, int overlay) {
         for (int i = 0; i < quads.size(); i++) {
             BakedQuad bakedQuad = quads.get(i);
+
+            if (bakedQuad.getVertexData().length < 32) {
+                continue; // ignore bad quads
+            }
+
             BakedQuadView quad = (BakedQuadView) bakedQuad;
 
             int color = quad.hasColor() ? defaultColor : 0xFFFFFFFF;

diff --git a/...in/java/me/jellysquid/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java b/...in/java/me/jellysquid/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java
@@ -80,6 +80,11 @@ private void renderModelFast(BakedModel model, ItemStack itemStack, int light, i
     private void renderBakedItemQuads(MatrixStack.Entry matrices, VertexBufferWriter writer, List<BakedQuad> quads, ItemStack itemStack, ItemColorProvider colorProvider, int light, int overlay) {
         for (int i = 0; i < quads.size(); i++) {
             BakedQuad bakedQuad = quads.get(i);
+
+            if (bakedQuad.getVertexData().length < 32) {
+                continue; // ignore bad quads
+            }
+
             BakedQuadView quad = (BakedQuadView) bakedQuad;
 
             int color = 0xFFFFFFFF;