From 07afebba4e48362d092b5966df7bbba37b914c50 Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Sun, 2 Dec 2018 23:28:12 +0100 Subject: [PATCH] GLState: constant UNBIND = 0 --- vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java | 4 ++-- vtm/src/org/oscim/renderer/BufferObject.java | 2 +- vtm/src/org/oscim/renderer/GLState.java | 1 + vtm/src/org/oscim/renderer/MapRenderer.java | 4 ++-- vtm/src/org/oscim/renderer/bucket/LineTexBucket.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java b/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java index 3fc749e9..b5d64160 100644 --- a/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java +++ b/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java @@ -94,8 +94,8 @@ public class GdxSpriteBatchTest extends GdxMapApp { mMapRenderer.onDrawFrame(); gl.flush(); - GLState.bindVertexBuffer(0); - GLState.bindElementBuffer(0); + GLState.bindVertexBuffer(GLState.UNBIND); + GLState.bindElementBuffer(GLState.UNBIND); gl.frontFace(GL.CCW); spriteBatch.setProjectionMatrix(camera.combined); diff --git a/vtm/src/org/oscim/renderer/BufferObject.java b/vtm/src/org/oscim/renderer/BufferObject.java index da74f443..373e76d5 100644 --- a/vtm/src/org/oscim/renderer/BufferObject.java +++ b/vtm/src/org/oscim/renderer/BufferObject.java @@ -85,7 +85,7 @@ public final class BufferObject extends Inlist { } public void unbind() { - GLState.bindBuffer(target, 0); + GLState.bindBuffer(target, GLState.UNBIND); } // ---------------------------- pool ---------------------------- diff --git a/vtm/src/org/oscim/renderer/GLState.java b/vtm/src/org/oscim/renderer/GLState.java index fba9d135..60c57c1d 100644 --- a/vtm/src/org/oscim/renderer/GLState.java +++ b/vtm/src/org/oscim/renderer/GLState.java @@ -29,6 +29,7 @@ public class GLState { static final Logger log = LoggerFactory.getLogger(GLState.class); public final static int DISABLED = -1; + public final static int UNBIND = 0; private final static boolean[] vertexArray = {false, false}; private static boolean blend = false; diff --git a/vtm/src/org/oscim/renderer/MapRenderer.java b/vtm/src/org/oscim/renderer/MapRenderer.java index 423ca0aa..c2e0840f 100644 --- a/vtm/src/org/oscim/renderer/MapRenderer.java +++ b/vtm/src/org/oscim/renderer/MapRenderer.java @@ -215,7 +215,7 @@ public class MapRenderer { gl.bufferData(GL.ELEMENT_ARRAY_BUFFER, indices.length * 2, buf, GL.STATIC_DRAW); - GLState.bindElementBuffer(0); + GLState.bindElementBuffer(GLState.UNBIND); /* initialize default quad */ FloatBuffer floatBuffer = MapRenderer.getFloatBuffer(8); @@ -228,7 +228,7 @@ public class MapRenderer { gl.bufferData(GL.ARRAY_BUFFER, quad.length * 4, floatBuffer, GL.STATIC_DRAW); - GLState.bindVertexBuffer(0); + GLState.bindVertexBuffer(GLState.UNBIND); GLState.init(); diff --git a/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java b/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java index bcb7ca29..43691bc2 100644 --- a/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java +++ b/vtm/src/org/oscim/renderer/bucket/LineTexBucket.java @@ -297,7 +297,7 @@ public final class LineTexBucket extends LineBucket { GLState.bindVertexBuffer(mVertexFlipID); gl.bufferData(GL.ARRAY_BUFFER, flip.length, sbuf, GL.STATIC_DRAW); - GLState.bindVertexBuffer(0); + GLState.bindVertexBuffer(GLState.UNBIND); // mTexID = new int[10]; // byte[] stipple = new byte[40];