Changeset 1230Tweet

Timestamp:

Apr 15, 2012, 2:23:20 AM (9 years ago)

Author:

sam

Message:

gpu: fix the core scene renderer.

Location:

trunk/src

Files:

• gpu/vertexbuffer.cpp (modified) (1 diff)
• gpu/vertexbuffer.h (modified) (1 diff)
• scene.cpp (modified) (2 diffs)

trunk/src/gpu/vertexbuffer.cpp

@@ -232 +232 @@
         if (type_index < 0 || type_index >= sizeof(tlut) / sizeof(*tlut))
             type_index = 0;
-Log::Error("Size %d Type %d Stride %d offset %d\n", tlut[type_index].size,
-                              tlut[type_index].type,stride,offset);
 
         glVertexAttribPointer((GLint)reg, tlut[type_index].size,

trunk/src/gpu/vertexbuffer.h

@@ -45 +45 @@
         BlendIndices,
         Normal,
-        PSize,
+        PointSize,
         TexCoord,
         Tangent,

trunk/src/scene.cpp

@@ -381 +381 @@
         }
 
+        data->bufs[buf]->Unlock();
+        data->bufs[buf + 1]->Unlock();
+
         stdshader->Bind();
 
@@ -392 +395 @@
         /* Draw arrays */
 #if defined USE_D3D9 || defined _XBOX
-        g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, (n - i) * 6);
+        g_d3ddevice->DrawPrimitive(D3DPT_TRIANGLELIST, 0, (n - i) * 2);
 #else
         glDrawArrays(GL_TRIANGLES, 0, (n - i) * 6);
 
 #   if defined HAVE_GL_2X && !defined __APPLE__
-        glBindVertexArray(0);
+        //glBindVertexArray(0);
 #   endif
 #   if !defined __CELLOS_LV2__ // Use cgGLEnableClientState etc.
 #   else
-        glDisableClientState(GL_VERTEX_ARRAY);
-        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        //glDisableClientState(GL_VERTEX_ARRAY);
+        //glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 #   endif
 #endif