Changeset 2156Tweet

Timestamp:

Dec 20, 2012, 2:01:32 AM (9 years ago)

Author:

sam

Message:

gpu: warn when a vertex shader attribute isn’t found and do not crash
when a stream is not found in the vertex declaration at bind time.

Location:

trunk/src/gpu

Files:

• shader.cpp (modified) (1 diff)
• vertexbuffer.cpp (modified) (1 diff)

trunk/src/gpu/shader.cpp

@@ -327 +327 @@
 #if defined USE_D3D9 || defined _XBOX
 #elif !defined __CELLOS_LV2__
-    ret.m_flags |= (uint64_t)
-                  (uint32_t)glGetAttribLocation(data->prog_id, attr) << 32;
+    GLint l = glGetAttribLocation(data->prog_id, attr);
+    if (l < 0)
+    {
+        Log::Warn("tried to query invalid attribute: %s\n", attr);
+        l = 0;
+    }
+    ret.m_flags |= (uint64_t)(uint32_t)l << 32;
 #else
     /* FIXME: can we do this at all on the PS3? */

trunk/src/gpu/vertexbuffer.cpp

@@ -374 +374 @@
                 if (usage_index++ == index)
                     break;
+
+        if (attr_index == m_count)
+        {
+            Log::Error("stream #%d with usage %x not found in declaration\n",
+                       index, usage);
+            attr_index = 0;
+        }
 
         /* Now compute the stride and offset up to this stream index */