wined3d: Fix index offset for immediate mode draws.

This fixes 42fcf202. A non-NULL pointer doesn't imply that the pointer isn't an offset into a buffer object data. Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Fix index offset for immediate mode draws.
0581d861 · Józef Kucia · Alexandre Julliard · 6c5e1aff · 0581d861
Commit 0581d861 authored Oct 24, 2016 by Józef Kucia Committed by Alexandre Julliard Oct 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

drawprim.c dlls/wined3d/drawprim.c +4 -6

No files found.
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -196,12 +196,10 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const
    if (instance_count)
        FIXME("Instancing not implemented.\n");

-    /* Immediate mode drawing can't make use of indices in a vbo - get the
-     * data from the index buffer. If the index buffer has no vbo (not
-     * supported or other reason), or with user pointer drawing idx_data
-     * will be non-NULL. */
-    if (idx_size && !idx_data)
-        idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context);
+    /* Immediate mode drawing can't make use of indices in a VBO - get the
+     * data from the index buffer. */
+    if (idx_size)
+        idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context) + state->index_offset;

    ops = &d3d_info->ffp_attrib_ops;