wined3d: Take the input slot into account when handling WINED3D_APPEND_ALIGNED_ELEMENT.

cbe717b8 · Henri Verbeet · Alexandre Julliard · f3765e9f · cbe717b8
Commit cbe717b8 authored Mar 23, 2015 by Henri Verbeet Committed by Alexandre Julliard Mar 23, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 7 deletions

vertexdeclaration.c dlls/wined3d/vertexdeclaration.c +11 -7

No files found.
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -218,14 +218,18 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara
        if (e->offset == WINED3D_APPEND_ALIGNED_ELEMENT)
        {
-            if (!i)
+            const struct wined3d_vertex_declaration_element *prev;
-            {
+            unsigned int j;
-                e->offset = 0;
-            }
+            e->offset = 0;
-            else
+            for (j = 1; j <= i; ++j)
            {
-                struct wined3d_vertex_declaration_element *prev = &declaration->elements[i - 1];
+                prev = &declaration->elements[i - j];
-                e->offset = (prev->offset + prev->format->byte_count + 3) & ~3;
+                if (prev->input_slot == e->input_slot)
+                {
+                    e->offset = (prev->offset + prev->format->byte_count + 3) & ~3;
+                    break;
+                }
            }
        }