Changeset 1292Tweet

Timestamp:

Apr 24, 2012, 8:17:58 PM (9 years ago)

Author:

sam

Message:

ps3: start fixing the vertex buffer logic in there.

File:

• trunk/src/gpu/vertexbuffer.cpp (modified) (4 diffs)

trunk/src/gpu/vertexbuffer.cpp

@@ -47 +47 @@
 #elif defined _XBOX
     D3DVertexBuffer *m_vbo;
-#elif !defined __CELLOS_LV2__ && !defined __ANDROID__
+#elif !defined __ANDROID__
     GLuint m_vbo;
     uint8_t *m_memory;
@@ -246 +246 @@
         uint32_t index = l[n].m_flags & 0xffff;
 
+#   if !defined __CELLOS_LV2__
         glEnableVertexAttribArray((GLint)reg);
+#   else
+        switch (usage)
+        {
+        case VertexUsage::Position:
+            glEnableClientState(GL_VERTEX_ARRAY);
+            break;
+        case VertexUsage::Color:
+            glEnableClientState(GL_COLOR_ARRAY);
+            break;
+        }
+#   endif
 
         /* We need to parse the whole vertex declaration to retrieve
@@ -269 +281 @@
 
         /* Finally, we need to retrieve the type of the data */
+#   if !defined GL_DOUBLE
+#       define GL_DOUBLE 0
+#   endif
         static struct { GLint size; GLenum type; } const tlut[] =
         {
@@ -300 +315 @@
                            || (tlut[type_index].type == GL_BYTE);
 
+#   if !defined __CELLOS_LV2__
         glVertexAttribPointer((GLint)reg, tlut[type_index].size,
                               tlut[type_index].type, normalize,
                               stride, (GLvoid const *)(uintptr_t)offset);
+#   else
+        switch (usage)
+        {
+        case VertexUsage::Position:
+            glVertexPointer(tlut[type_index].size, tlut[type_index].type,
+                            stride, (GLvoid const *)(uintptr_t)offset);
+            break;
+        case VertexUsage::Normal:
+            glNormalPointer(tlut[type_index].type,
+                            stride, (GLvoid const *)(uintptr_t)offset);
+            break;
+        case VertexUsage::Color:
+            glColorPointer(tlut[type_index].size, tlut[type_index].type,
+                           stride, (GLvoid const *)(uintptr_t)offset);
+            break;
+        }
+#   endif
     }
 #endif