From 7c935bb5817b9fcae99675c4232e4287ecd59a67 Mon Sep 17 00:00:00 2001 From: TomTheFurry Date: Tue, 29 Mar 2022 13:09:29 +0800 Subject: [PATCH] I think test renderer is now more correct? --- .../java/com/seibel/lod/core/render/RenderSystemTest.java | 4 ++-- .../lod/core/render/objects/VertexAttributePreGL43.java | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/seibel/lod/core/render/RenderSystemTest.java b/src/main/java/com/seibel/lod/core/render/RenderSystemTest.java index 387b4b649..d6a6439d1 100644 --- a/src/main/java/com/seibel/lod/core/render/RenderSystemTest.java +++ b/src/main/java/com/seibel/lod/core/render/RenderSystemTest.java @@ -93,12 +93,12 @@ public class RenderSystemTest { // Switch between the two buffers per second if (System.currentTimeMillis() % 2000 < 1000) { - va.bindBufferToBindingPoint(sameContextBuffer.id, 0); GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, sameContextBuffer.id); + va.bindBufferToAllBindingPoint(sameContextBuffer.id); spamLogger.debug("same context buffer"); } else { - va.bindBufferToBindingPoint(sharedContextBuffer.id, 0); GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, sharedContextBuffer.id); + va.bindBufferToAllBindingPoint(sharedContextBuffer.id); spamLogger.debug("shared context buffer"); } // Render the square diff --git a/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java b/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java index e03e87b69..545bed56f 100644 --- a/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java +++ b/src/main/java/com/seibel/lod/core/render/objects/VertexAttributePreGL43.java @@ -82,11 +82,7 @@ public final class VertexAttributePreGL43 extends VertexAttribute { @Override // Requires VertexAttribute binded public void setVertexAttribute(int bindingPoint, int attributeIndex, VertexPointer attribute) { - TreeSet intArray = bindingPointsToIndexBuilder.get(bindingPoint); - if (intArray == null) { - intArray = new TreeSet(); - bindingPointsToIndexBuilder.put(bindingPoint, intArray); - } + TreeSet intArray = bindingPointsToIndexBuilder.computeIfAbsent(bindingPoint, k -> new TreeSet()); intArray.add(attributeIndex); while (pointersBuilder.size() <= attributeIndex) {