From: Marek Olšák <maraeo@gmail.com>
Date: Mon, 28 Feb 2011 23:12:23 +0000 (+0100)
Subject: r300g: update derived state before uploading vertex buffers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4609be44106274fa88cfdf935257dfbe51cb6039;p=mesa.git

r300g: update derived state before uploading vertex buffers

The function may invoke blitter, which invalidates vertex buffers.
---

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 2ead8667bda..73ed44cc5a2 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -748,6 +748,8 @@ static void r300_draw_vbo(struct pipe_context* pipe,
         return;
     }
 
+    r300_update_derived_state(r300);
+
     /* Start the vbuf manager and update buffers if needed. */
     u_vbuf_mgr_draw_begin(r300->vbuf_mgr, info,
                           &buffers_updated, &uploader_flushed);
@@ -756,8 +758,6 @@ static void r300_draw_vbo(struct pipe_context* pipe,
     }
 
     /* Draw. */
-    r300_update_derived_state(r300);
-
     if (indexed) {
         if (count <= 8 &&
             r300_resource(r300->index_buffer.buffer)->b.user_ptr) {