Changeset 1688Tweet

Timestamp:

Aug 1, 2012, 1:50:59 PM (11 years ago)

Author:

sam

Message:

gpu: only unbind vertex attribs that we actually bound.

Location:

trunk/src/gpu

Files:

• vertexbuffer.cpp (modified) (3 diffs)
• vertexbuffer.h (modified) (2 diffs)

trunk/src/gpu/vertexbuffer.cpp

@@ -237 +237 @@
         Abort();
 #elif !defined __CELLOS_LV2__
-    /* FIXME: we need to unbind what we bound */
-    //glDisableVertexAttribArray(m_attrib);
-    /* FIXME: temporary kludge */
-    for (int i = 0; i < 12; i++)
-        glDisableVertexAttribArray(i);
+    for (int i = 0; i < m_count; i++)
+    {
+        if (m_streams[i].reg >= 0)
+        {
+            for (int j = i + 1; j < m_count; j++)
+                if (m_streams[j].reg == m_streams[i].reg)
+                    m_streams[j].reg = -1;
+
+            glDisableVertexAttribArray(m_streams[i].reg);
+        }
+    }
     glBindBuffer(GL_ARRAY_BUFFER, 0);
-    /* FIXME: only useful for VAOs */
+    /* FIXME: only useful for VAOs? */
     //glBindBuffer(GL_ARRAY_BUFFER, 0);
-    /* Or: */
-    //glDisableVertexAttribArray(m_attrib);
 #else
     /* Or even: */
@@ -347 +351 @@
             if (m_streams[i].index == m_streams[attr_index].index)
             {
+                /* Remember the register used for this stream */
+                m_streams[i].reg = reg;
+
                 stride += m_streams[i].size;
                 if (i < attr_index)
@@ -523 +530 @@
         m_streams[m_count].size = s.m_streams[i].size;
         m_streams[m_count].index = index;
+        m_streams[m_count].reg = -1;
         m_count++;
     }

trunk/src/gpu/vertexbuffer.h

@@ -124 +124 @@
 };
 
+/* Specialise this template for "void" to act as a NOP */
 template<>
 inline void VertexStreamBase::AddStream<void>(int n, VertexUsage usage)
@@ -199 +200 @@
     void AddStream(VertexStreamBase const &);
 
-    struct { uint8_t stream_type, index, usage, size; } m_streams[12 + 1];
+    struct { uint8_t stream_type, index, usage, size; int reg; } m_streams[12 + 1];
     int m_count;