=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Load buffer before applying state for indirect draws.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6280926e3b7e7a270498b2181823162e79caf9ed
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6280926e3b7e7a270498b2181823162e79caf9ed

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Tue Jan  9 15:10:06 2018 +0100

wined3d: Load buffer before applying state for indirect draws.

wined3d_load_buffer() might invalidate the current state.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/drawprim.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 95e79f7..17ce16a 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -407,7 +407,6 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_
         return;
     }
 
-    wined3d_buffer_load(buffer, context, state);
     GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object));
 
     if (idx_size)
@@ -572,6 +571,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
             wined3d_rendertarget_view_prepare_location(dsv, context, location);
     }
 
+    if (parameters->indirect)
+        wined3d_buffer_load(parameters->u.indirect.buffer, context, state);
+
     if (!context_apply_draw_state(context, device, state))
     {
         context_release(context);