From 72c67436ef55b85b5d1675b999b9dabed0138cfa Mon Sep 17 00:00:00 2001 From: Bixilon Date: Tue, 30 Nov 2021 13:37:45 +0100 Subject: [PATCH] remove all opengl ARB references --- .../system/opengl/buffer/uniform/OpenGLUniformBuffer.kt | 4 +++- .../system/opengl/buffer/vertex/FloatOpenGLVertexBuffer.kt | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/uniform/OpenGLUniformBuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/uniform/OpenGLUniformBuffer.kt index ff36dc5a0..9909bc066 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/uniform/OpenGLUniformBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/uniform/OpenGLUniformBuffer.kt @@ -18,7 +18,9 @@ import de.bixilon.minosoft.gui.rendering.system.base.buffer.RenderBufferTypes import de.bixilon.minosoft.gui.rendering.system.base.buffer.uniform.UniformBuffer import de.bixilon.minosoft.gui.rendering.system.base.shader.Shader import de.bixilon.minosoft.gui.rendering.system.opengl.buffer.OpenGLRenderBuffer -import org.lwjgl.opengl.ARBUniformBufferObject.* +import org.lwjgl.opengl.GL30.glBindBufferBase +import org.lwjgl.opengl.GL30.glBindBufferRange +import org.lwjgl.opengl.GL31.GL_UNIFORM_BUFFER abstract class OpenGLUniformBuffer(override val bindingIndex: Int) : OpenGLRenderBuffer(RenderBufferTypes.UNIFORM_BUFFER), UniformBuffer { override val drawTypes: RenderBufferDrawTypes = RenderBufferDrawTypes.DYNAMIC diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/vertex/FloatOpenGLVertexBuffer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/vertex/FloatOpenGLVertexBuffer.kt index af1864e2f..f950d6745 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/vertex/FloatOpenGLVertexBuffer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/buffer/vertex/FloatOpenGLVertexBuffer.kt @@ -5,11 +5,10 @@ import de.bixilon.minosoft.gui.rendering.system.base.buffer.vertex.FloatVertexBu import de.bixilon.minosoft.gui.rendering.system.base.buffer.vertex.PrimitiveTypes import de.bixilon.minosoft.gui.rendering.system.opengl.buffer.FloatOpenGLBuffer import de.bixilon.minosoft.gui.rendering.util.mesh.MeshStruct -import org.lwjgl.opengl.ARBVertexArrayObject.* -import org.lwjgl.opengl.GL11.* import org.lwjgl.opengl.GL15.glBufferData import org.lwjgl.opengl.GL20.glEnableVertexAttribArray import org.lwjgl.opengl.GL20.glVertexAttribPointer +import org.lwjgl.opengl.GL30.* import java.nio.FloatBuffer class FloatOpenGLVertexBuffer(override val structure: MeshStruct, data: FloatBuffer, override val primitiveType: PrimitiveTypes) : FloatOpenGLBuffer(data), FloatVertexBuffer {