Changeset 16036 in vbox for trunk/src

Timestamp:

Jan 19, 2009 10:13:51 AM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: fix crash in spec viewperf tcvis-01 benchmark

File:

• trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/array/arrayspu.c (modified) (13 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/array/arrayspu.c

@@ -26 +26 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->e.buffer->data)
+        if (array->e.buffer && array->e.buffer->data)
         {
             p = (unsigned char *)(array->e.buffer->data) + (unsigned long)p;
@@ -49 +49 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-                if (array->a[attr].buffer->data)
+                if (array->a[attr].buffer && array->a[attr].buffer->data)
                 {
                     p = (unsigned char *)(array->a[attr].buffer->data) + (unsigned long)p;
@@ -110 +110 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-            if (array->t[unit].buffer->data)
+            if (array->t[unit].buffer && array->t[unit].buffer->data)
             {
                 p = (unsigned char *)(array->t[unit].buffer->data) + (unsigned long)p;
@@ -162 +162 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->i.buffer->data)
+        if (array->i.buffer && array->i.buffer->data)
         {
             p = (unsigned char *)(array->i.buffer->data) + (unsigned long)p;
@@ -181 +181 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->c.buffer->data)
+        if (array->c.buffer && array->c.buffer->data)
         {
             p = (unsigned char *)(array->c.buffer->data) + (unsigned long)p;
@@ -252 +252 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->n.buffer->data)
+        if (array->n.buffer && array->n.buffer->data)
         {
             p = (unsigned char *)(array->n.buffer->data) + (unsigned long)p;
@@ -273 +273 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->s.buffer->data)
+        if (array->s.buffer && array->s.buffer->data)
         {
             p = (unsigned char *)(array->s.buffer->data) + (unsigned long)p;
@@ -306 +306 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->f.buffer->data)
+        if (array->f.buffer && array->f.buffer->data)
         {
             p = (unsigned char *)(array->f.buffer->data) + (unsigned long)p;
@@ -322 +322 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->a[VERT_ATTRIB_POS].buffer->data)
+        if (array->a[VERT_ATTRIB_POS].buffer && array->a[VERT_ATTRIB_POS].buffer->data)
         {
             p = (unsigned char *)(array->a[VERT_ATTRIB_POS].buffer->data) + (unsigned long)p;
@@ -376 +376 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-        if (array->v.buffer->data)
+        if (array->v.buffer && array->v.buffer->data)
         {
             p = (unsigned char *)(array->v.buffer->data) + (unsigned long)p;
@@ -445 +445 @@
 
 static void ARRAYSPU_APIENTRY arrayspu_DrawElements(GLenum mode, GLsizei count,
-                                                                                                        GLenum type, const GLvoid *indices)
+                                                    GLenum type, const GLvoid *indices)
 {
     int i;
@@ -469 +469 @@
 
 #ifdef CR_ARB_vertex_buffer_object
-    if (elementsBuffer->data)
+    if (elementsBuffer && elementsBuffer->data)
     {
         p = (unsigned char *)(elementsBuffer->data) + (unsigned long)p;
@@ -640 +640 @@
 static void ARRAYSPU_APIENTRY
 arrayspu_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, 
-                                                                GLboolean normalized, GLsizei stride,
-                                                                const GLvoid *pointer)
+                                GLboolean normalized, GLsizei stride,
+                                const GLvoid *pointer)
 {
     crStateVertexAttribPointerARB( index, size, type, normalized, stride, pointer );