diff --git a/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch b/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch index a1f5d60b81..1de09e9a5f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/BufferBuilder.java.patch @@ -9,6 +9,15 @@ } public BufferBuilder.State func_181672_a() +@@ -415,7 +417,7 @@ + + public void func_178981_a(int[] p_178981_1_) + { +- this.func_181670_b(p_178981_1_.length * 4); ++ this.func_181670_b(p_178981_1_.length * 4 + this.field_179011_q.func_177338_f());//Forge, fix MC-122110 + this.field_178999_b.position(this.func_181664_j()); + this.field_178999_b.put(p_178981_1_); + this.field_178997_d += p_178981_1_.length / this.field_179011_q.func_181719_f(); @@ -506,15 +508,15 @@ break; case USHORT: diff --git a/src/test/java/net/minecraftforge/test/BufferBuilderExpansionTest.java b/src/test/java/net/minecraftforge/test/BufferBuilderExpansionTest.java new file mode 100644 index 0000000000..d19f9e63b1 --- /dev/null +++ b/src/test/java/net/minecraftforge/test/BufferBuilderExpansionTest.java @@ -0,0 +1,85 @@ +package net.minecraftforge.test; + +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import org.junit.Test; + +import java.util.Arrays; + +import static org.junit.Assert.assertTrue; + +public class BufferBuilderExpansionTest +{ + + public VertexFormat format = DefaultVertexFormats.POSITION; + // 4 quads. + public int num_quads = 4; + public int BUFFER_SIZE = format.getNextOffset() * (num_quads * 4); + + @Test//Test the expansion of the buffer with addVertexData + public void testAddVertexExpansion() + { + BufferBuilder buffer = new BufferBuilder(BUFFER_SIZE / 4); + int prevCap = buffer.getByteBuffer().capacity(); + + int[] ints = new int[3 * 4];// 3 floats per the 4 vertices. + Arrays.fill(ints, Float.floatToIntBits(1.233F));//Just a random value. + + buffer.begin(0x07, format); + for (int i = 0; i < num_quads + 2; i++) + { + buffer.addVertexData(ints); + } + buffer.finishDrawing(); + + assertTrue("BufferBuilder's capacity didn't change.", buffer.getByteBuffer().capacity() > prevCap); + } + + @Test//Test the expansion of the buffer with endVertex. + public void testEndVertexExpansion() + { + BufferBuilder buffer = new BufferBuilder(BUFFER_SIZE / 4); + int prevCap = buffer.getByteBuffer().capacity(); + + buffer.begin(0x07, format); + for (int i = 0; i < num_quads + 2; i++) + { + for (int j = 0; j < 4; j++) + { + buffer.pos(1.233, 1.233, 1.233).endVertex(); + } + } + buffer.finishDrawing(); + + assertTrue("BufferBuilder's capacity didn't change.", buffer.getByteBuffer().capacity() > prevCap); + } + + @Test//Test the expansion of the buffer if addVertexData fills it and pos / tex / endVertex is used. + public void testMixedExpansion() + { + BufferBuilder buffer = new BufferBuilder(BUFFER_SIZE / 4); + int prevCap = buffer.getByteBuffer().capacity(); + + int[] ints = new int[3 * 4]; + Arrays.fill(ints, Float.floatToIntBits(1.233F)); + + buffer.begin(0x07, format); + for (int i = 0; i < num_quads; i++) + { + buffer.addVertexData(ints); + } + + for (int i = 0; i < num_quads + 2; i++) + { + for (int j = 0; j < 4; j++) + { + buffer.pos(1.233, 1.233, 1.233).endVertex(); + } + } + buffer.finishDrawing(); + + assertTrue("BufferBuilder's capacity didn't change.", buffer.getByteBuffer().capacity() > prevCap); + } + +}