OSDN Git Service

[removed] redundnat null glBufferData. silly me
authorbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 1 Nov 2010 00:28:57 +0000 (00:28 +0000)
committerbadlogicgames <badlogicgames@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 1 Nov 2010 00:28:57 +0000 (00:28 +0000)
gdx/src/com/badlogic/gdx/graphics/glutils/IndexBufferObject.java
gdx/src/com/badlogic/gdx/graphics/glutils/VertexBufferObject.java

index bb24ab0..242b7c7 100644 (file)
@@ -147,15 +147,11 @@ public class IndexBufferObject {
 \r
                if (isBound) {\r
                        if (Gdx.gl11 != null) {\r
-                               GL11 gl = Gdx.gl11;\r
-                               gl.glBufferData(GL11.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
-                                               .limit(), null, usage);\r
+                               GL11 gl = Gdx.gl11;                             \r
                                gl.glBufferData(GL11.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
                                                .limit(), byteBuffer, usage);\r
                        } else if (Gdx.gl11 != null) {\r
-                               GL20 gl = Gdx.gl20;\r
-                               gl.glBufferData(GL20.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
-                                               .limit(), null, usage);\r
+                               GL20 gl = Gdx.gl20;                             \r
                                gl.glBufferData(GL20.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
                                                .limit(), byteBuffer, usage);\r
                        }\r
@@ -184,9 +180,7 @@ public class IndexBufferObject {
                if (Gdx.gl11 != null) {\r
                        GL11 gl = Gdx.gl11;\r
                        gl.glBindBuffer(GL11.GL_ELEMENT_ARRAY_BUFFER, bufferHandle);\r
-                       if (isDirty) {\r
-                               gl.glBufferData(GL11.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
-                                               .limit(), null, usage);\r
+                       if (isDirty) {                          \r
                                gl.glBufferData(GL11.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
                                                .limit(), byteBuffer, usage);\r
                                isDirty = false;\r
@@ -194,9 +188,7 @@ public class IndexBufferObject {
                } else {\r
                        GL20 gl = Gdx.gl20;\r
                        gl.glBindBuffer(GL20.GL_ELEMENT_ARRAY_BUFFER, bufferHandle);\r
-                       if (isDirty) {\r
-                               gl.glBufferData(GL20.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
-                                               .limit(), null, usage);\r
+                       if (isDirty) {                          \r
                                gl.glBufferData(GL20.GL_ELEMENT_ARRAY_BUFFER, byteBuffer\r
                                                .limit(), byteBuffer, usage);\r
                                isDirty = false;\r
index 5f3cc64..8361945 100644 (file)
@@ -149,15 +149,11 @@ public class VertexBufferObject implements VertexData {
 \r
                if (isBound) {\r
                        if (Gdx.gl20 != null) {\r
-                               GL20 gl = Gdx.gl20;\r
-                               gl.glBufferData(GL20.GL_ARRAY_BUFFER, byteBuffer.limit(), null,\r
-                                               usage);\r
+                               GL20 gl = Gdx.gl20;                             \r
                                gl.glBufferData(GL20.GL_ARRAY_BUFFER, byteBuffer.limit(),\r
                                                byteBuffer, usage);\r
                        } else {\r
-                               GL11 gl = Gdx.gl11;\r
-                               gl.glBufferData(GL11.GL_ARRAY_BUFFER, byteBuffer.limit(), null,\r
-                                               usage);\r
+                               GL11 gl = Gdx.gl11;                             \r
                                gl.glBufferData(GL11.GL_ARRAY_BUFFER, byteBuffer.limit(),\r
                                                byteBuffer, usage);\r
                        }\r
@@ -174,8 +170,6 @@ public class VertexBufferObject implements VertexData {
 \r
                gl.glBindBuffer(GL11.GL_ARRAY_BUFFER, bufferHandle);\r
                if (isDirty) {\r
-                       gl.glBufferData(GL11.GL_ARRAY_BUFFER, byteBuffer.limit(), null,\r
-                                       usage);\r
                        gl.glBufferData(GL11.GL_ARRAY_BUFFER, byteBuffer.limit(),\r
                                        byteBuffer, usage);\r
                        isDirty = false;\r
@@ -239,9 +233,7 @@ public class VertexBufferObject implements VertexData {
                GL20 gl = Gdx.gl20;\r
 \r
                gl.glBindBuffer(GL20.GL_ARRAY_BUFFER, bufferHandle);\r
-               if (isDirty) {\r
-                       gl.glBufferData(GL20.GL_ARRAY_BUFFER, byteBuffer.limit(), null,\r
-                                       usage);\r
+               if (isDirty) {                  \r
                        gl.glBufferData(GL20.GL_ARRAY_BUFFER, byteBuffer.limit(),\r
                                        byteBuffer, usage);\r
                        isDirty = false;\r