openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File cr-vbo-fix.diff of Package cr

commit b4bb08efce4f4b2f31e2036d3520764661f4ef2a
Author: David Reveman <davidr@novell.com>
Date:   Thu Apr 2 15:36:56 2009 -0400

Initialize vertex buffer objects properly.

diff --git a/state_tracker/state_client.c b/state_tracker/state_client.c
index aa2665e..55a13de 100644
--- a/state_tracker/state_client.c
+++ b/state_tracker/state_client.c
@@ -88,8 +88,8 @@ void crStateClientInit(CRClientState *c)
 	c->array.v.type = GL_FLOAT;
 	c->array.v.stride = 0;
 	c->array.v.enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-	c->array.v.buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+	c->array.v.buffer = NULL;
 #endif
 
 	/* color array */
@@ -98,8 +98,8 @@ void crStateClientInit(CRClientState *c)
 	c->array.c.type = GL_FLOAT;
 	c->array.c.stride = 0;
 	c->array.c.enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-	c->array.c.buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+	c->array.c.buffer = NULL;
 #endif
 
 	/* fog array */
@@ -108,8 +108,8 @@ void crStateClientInit(CRClientState *c)
 	c->array.f.type = GL_FLOAT;
 	c->array.f.stride = 0;
 	c->array.f.enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-	c->array.f.buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+	c->array.f.buffer = NULL;
 #endif
 
 	/* secondary color array */
@@ -118,8 +118,8 @@ void crStateClientInit(CRClientState *c)
 	c->array.s.type = GL_FLOAT;
 	c->array.s.stride = 0;
 	c->array.s.enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-	c->array.s.buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+	c->array.s.buffer = NULL;
 #endif
 
 	/* edge flag array */
@@ -128,8 +128,8 @@ void crStateClientInit(CRClientState *c)
 	c->array.e.type = GL_FLOAT;
 	c->array.e.stride = 0;
 	c->array.e.enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-	c->array.e.buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+	c->array.e.buffer = NULL;
 #endif
 
 	/* color index array */
@@ -138,8 +138,8 @@ void crStateClientInit(CRClientState *c)
 	c->array.i.type = GL_FLOAT;
 	c->array.i.stride = 0;
 	c->array.i.enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-	c->array.i.buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+	c->array.i.buffer = NULL;
 #endif
 
 	/* normal array */
@@ -148,8 +148,8 @@ void crStateClientInit(CRClientState *c)
 	c->array.n.type = GL_FLOAT;
 	c->array.n.stride = 0;
 	c->array.n.enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-	c->array.n.buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+	c->array.n.buffer = NULL;
 #endif
 
 	/* texcoord arrays */
@@ -160,8 +160,8 @@ void crStateClientInit(CRClientState *c)
 		c->array.t[i].type = GL_FLOAT;
 		c->array.t[i].stride = 0;
 		c->array.t[i].enabled = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-		c->array.t[i].buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+		c->array.t[i].buffer = NULL;
 #endif
 	}
 
@@ -172,8 +172,8 @@ void crStateClientInit(CRClientState *c)
 		c->array.a[i].type = 0;
 		c->array.a[i].size = 0;
 		c->array.a[i].stride = 0;
-#ifdef CR_ARB_vertex_buffer_object2
-		c->array.a[i].buffer = g->bufferobject.vertexBuffer;
+#ifdef CR_ARB_vertex_buffer_object
+		c->array.a[i].buffer = NULL;
 #endif
 	}
 #endif

Places

File cr-vbo-fix.diff of Package cr

Places