summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2013-09-04 02:06:05 -0400
committerCarl Worth <cworth@cworth.org>2013-09-27 15:27:38 -0700
commit130fda3d3bd452322006d80277079167507d5417 (patch)
tree3144097f107911cfab9ef12f128c2686fca5a36c
parent3a2926fdbf5fe741a0df7782c91d4f90b8df8acd (diff)
nv30: fix inconsistent setting of push->user_priv
It's set to &nv30->bufctx everywhere else. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "9.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 85f7df81a91b1825bf25adf3d4febcbb5e0a0d7e)
-rw-r--r--src/gallium/drivers/nv30/nv30_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c
index bd05042ca22..4c4b89d0558 100644
--- a/src/gallium/drivers/nv30/nv30_context.c
+++ b/src/gallium/drivers/nv30/nv30_context.c
@@ -208,7 +208,7 @@ nv30_context_create(struct pipe_screen *pscreen, void *priv)
/*XXX: *cough* per-context pushbufs */
push = screen->base.pushbuf;
nv30->base.pushbuf = push;
- nv30->base.pushbuf->user_priv = push->user_priv; /* hack at validate time */
+ nv30->base.pushbuf->user_priv = &nv30->bufctx; /* hack at validate time */
nv30->base.pushbuf->rsvd_kick = 16; /* hack in screen before first space */
nv30->base.pushbuf->kick_notify = nv30_context_kick_notify;