Changeset 1532 for trunk/src/gpu/vertexbuffer.cppTweet

Timestamp:

Jun 28, 2012, 2:30:23 PM (10 years ago)

Author:

sam

Message:

gpu: fix vertex and index buffer behaviour on the PS3.

File:

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

trunk/src/gpu/vertexbuffer.cpp

@@ -247 +247 @@
 #else
     /* Or even: */
-    //glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState(GL_NORMAL_ARRAY);
+    glDisableClientState(GL_COLOR_ARRAY);
 #endif
 }
@@ -314 +317 @@
         case VertexUsage::Position:
             glEnableClientState(GL_VERTEX_ARRAY);
+            break;
+        case VertexUsage::TexCoord:
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+            break;
+        case VertexUsage::Normal:
+            glEnableClientState(GL_NORMAL_ARRAY);
             break;
         case VertexUsage::Color:
@@ -531 +540 @@
                                                D3DPOOL_MANAGED, &m_data->m_vbo, NULL)))
         Abort();
-#elif !defined __CELLOS_LV2__
+#else
     glGenBuffers(1, &m_data->m_vbo);
     m_data->m_memory = new uint8_t[size];
@@ -544 +553 @@
         if (FAILED(m_data->m_vbo->Release()))
             Abort();
-#elif !defined __CELLOS_LV2__
+#else
         glDeleteBuffers(1, &m_data->m_vbo);
         delete[] m_data->m_memory;
@@ -561 +570 @@
         Abort();
     return ret;
-#elif !defined __CELLOS_LV2__
+#else
     return m_data->m_memory + offset;
 #endif
@@ -573 +582 @@
     if (FAILED(m_data->m_vbo->Unlock()))
         Abort();
-#elif !defined __CELLOS_LV2__
+#else
     glBindBuffer(GL_ARRAY_BUFFER, m_data->m_vbo);
     glBufferData(GL_ARRAY_BUFFER, m_data->m_size, m_data->m_memory,