diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java index 6d16bfb5d..3ff8cd5b9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java @@ -214,22 +214,11 @@ public class GLBuffer implements AutoCloseable } bufferCount.decrementAndGet(); + GLMC.glDeleteBuffers(id); - // destroy the buffer if it exists, - // the buffer may not exist if the destroy method is called twice - if (GL32.glIsBuffer(id)) + if (Config.Client.Advanced.Debugging.logBufferGarbageCollection.get()) { - GLMC.glDeleteBuffers(id); - - if (Config.Client.Advanced.Debugging.logBufferGarbageCollection.get()) - { - LOGGER.info("destroyed buffer [" + id + "], remaining: [" + BUFFER_ID_TO_PHANTOM.size() + "]"); - } - } - else - { - // shouldn't happen, but just in case - LOGGER.warn("Attempted to destroy a non buffer object with ID ["+id+"]."); + LOGGER.info("destroyed buffer [" + id + "], remaining: [" + BUFFER_ID_TO_PHANTOM.size() + "], cause: ["+cause+"]."); } } diff --git a/coreSubProjects b/coreSubProjects index aaa5e958f..69941fb7f 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit aaa5e958f04b5808a4943c1ab0222f69bbd01ba3 +Subproject commit 69941fb7f8e19c3f5f25f6055dbaa822d6a7d942