Changeset 20970 in vbox

Timestamp:

Jun 26, 2009 12:26:49 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49168

Message:

crOpenGL: fix incorrect rendering of glDrawRangeElements

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/array/arrayspu.c (modified) (4 diffs)
• GuestHost/OpenGL/packer/pack_client.c (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.c

@@ -509 +509 @@
 }
 
+static void ARRAYSPU_APIENTRY arrayspu_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
+{
+    if (start>end)
+    {
+        crError("array_spu.self.arrayspu_DrawRangeElements start>end (%d>%d)", start, end);
+    }
+
+    arrayspu_DrawElements(mode, count, type, indices);
+}
+
 static void ARRAYSPU_APIENTRY arrayspu_ColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *pointer )
 {
@@ -677 +687 @@
 arrayspu_PushClientAttrib( GLbitfield mask )
 {
-     crStatePushClientAttrib(mask);
-     array_spu.child.PushClientAttrib(mask);
+    crStatePushClientAttrib(mask);
+    array_spu.child.PushClientAttrib(mask);
 }
 
@@ -685 +695 @@
 arrayspu_PopClientAttrib( void )
 {
-     crStatePopClientAttrib();
-     array_spu.child.PopClientAttrib();
+    crStatePopClientAttrib();
+    array_spu.child.PopClientAttrib();
 }
 
@@ -855 +865 @@
     { "DrawArrays", (SPUGenericFunction) arrayspu_DrawArrays},
     { "DrawElements", (SPUGenericFunction)  arrayspu_DrawElements},
+    { "DrawRangeElements", (SPUGenericFunction) arrayspu_DrawRangeElements},
     { "ColorPointer", (SPUGenericFunction) arrayspu_ColorPointer},
     { "SecondaryColorPointerEXT", (SPUGenericFunction) arrayspu_SecondaryColorPointerEXT},

trunk/src/VBox/GuestHost/OpenGL/packer/pack_client.c

@@ -437 +437 @@
         {
         case GL_UNSIGNED_BYTE:
-                for (i=start; i<count; i++)
+                for (i=0; i<count; i++)
                 {
                         crPackExpandArrayElement((GLint) *p++, c);
@@ -443 +443 @@
                 break;
         case GL_UNSIGNED_SHORT:
-                for (i=start; i<count; i++)
+                for (i=0; i<count; i++)
                 {
                         crPackExpandArrayElement((GLint) * (GLushort *) p, c);
@@ -450 +450 @@
                 break;
         case GL_UNSIGNED_INT:
-                for (i=start; i<count; i++)
+                for (i=0; i<count; i++)
                 {
                         crPackExpandArrayElement((GLint) * (GLuint *) p, c);