Changeset 1234Tweet

Timestamp:

Apr 18, 2012, 1:20:55 AM (11 years ago)

Author:

sam

Message:

gpu: fix a nasty bug in the D3D9 vertex declaration code that caused
wrong offset computations.

Location:

trunk/src

Files:

• gpu/vertexbuffer.cpp (modified) (1 diff)
• gradient.cpp (modified) (1 diff)
• scene.cpp (modified) (4 diffs)

trunk/src/gpu/vertexbuffer.cpp

@@ -304 +304 @@
         elements[n].Offset = 0;
         for (int i = 0; i < n; i++)
-            elements[n].Offset += m_streams[n].size;
+            if (m_streams[i].index == m_streams[n].index)
+                elements[n].Offset += m_streams[i].size;
 
         if (m_streams[n].stream_type >= 0

trunk/src/gradient.cpp

@@ -155 +155 @@
             "    int x = (int)in_FragCoord.x;"
             "    int y = (int)in_FragCoord.y;"
+#if defined USE_D3D9 || defined _XBOX
+            "    float t = bayer[int(frac(x * 0.25) * 4.0)]"
+            "                   [int(frac(y * 0.25) * 4.0)];\n"
+#else
             // FIXME: we cannot address this matrix directly on the PS3
             "    float t = bayer[0][0];\n"
-            "    t = (t + 0.5) / 17.0 + z - x;\n"
+#endif
+            "    t = (t + 0.5) / 17.0;\n"
             "    col.x += frac(t - col.x) - t;\n"
             "    col.y += frac(t - col.y) - t;\n"

trunk/src/scene.cpp

@@ -101 +101 @@
 Scene::~Scene()
 {
-#if defined USE_D3D9 || defined _XBOX
-    /* FIXME: TODO */
-#else
     /* FIXME: this must be done while the GL context is still active.
      * Change the code architecture to make sure of that. */
@@ -110 +107 @@
         delete data->bufs[i];
     free(data->bufs);
-#endif
     delete data->m_vdecl;
     delete data;
@@ -382 +378 @@
         data->bufs[buf + 1]->Unlock();
 
-        stdshader->Bind();
-
         /* Bind texture */
         data->tiles[i].tileset->Bind();
@@ -393 +387 @@
 
         /* Draw arrays */
-#if 0
         data->m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, (n - i) * 2);
-#endif
         data->m_vdecl->Unbind();
         data->tiles[i].tileset->Unbind();