Mesa (9.2): nv30: fix inconsistent setting of push->user_priv

Carl Worth cworth at kemper.freedesktop.org
Fri Sep 27 23:03:18 UTC 2013


Module: Mesa
Branch: 9.2
Commit: 130fda3d3bd452322006d80277079167507d5417
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=130fda3d3bd452322006d80277079167507d5417

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Sep  4 02:06:05 2013 -0400

nv30: fix inconsistent setting of push->user_priv

It's set to &nv30->bufctx everywhere else.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "9.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 85f7df81a91b1825bf25adf3d4febcbb5e0a0d7e)

---

 src/gallium/drivers/nv30/nv30_context.c |    2 +-
 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 bd05042..4c4b89d 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;
 




More information about the mesa-commit mailing list