From: Eric Anholt <eric@anholt.net>
Date: Sat, 22 Oct 2011 18:14:02 +0000 (-0700)
Subject: i965: Move VS pull constant upload to emit() time.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=395a8605fa80aeef48f6d9e90d9a7c38c259120d;p=mesa.git

i965: Move VS pull constant upload to emit() time.

Only needed by the emit() for VS surfaces.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Paul Berry <stereotype441@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
index 0237b585b64..f838daa2b07 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
@@ -42,7 +42,7 @@
  * state atom.
  */
 static void
-prepare_vs_constants(struct brw_context *brw)
+brw_upload_vs_pull_constants(struct brw_context *brw)
 {
    struct gl_context *ctx = &brw->intel.ctx;
    struct intel_context *intel = &brw->intel;
@@ -101,7 +101,7 @@ const struct brw_tracked_state brw_vs_constants = {
       .brw = (BRW_NEW_VERTEX_PROGRAM),
       .cache = CACHE_NEW_VS_PROG,
    },
-   .prepare = prepare_vs_constants,
+   .emit = brw_upload_vs_pull_constants,
 };
 
 /**