Mesa (10.6): nouveau: no need to do tnl wakeup, state updates are always hooked up

[Emil Velikov]

Module: Mesa
Branch: 10.6
Commit: 0a7202385d6c129164feb151deec99a0e43ed7bf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a7202385d6c129164feb151deec99a0e43ed7bf

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Mon Aug 10 17:41:36 2015 -0400

nouveau: no need to do tnl wakeup, state updates are always hooked up

A TNL state update now requires a DrawBuffer to be set, which it isn't
early on in context creation. Since we init swtnl from context init,
this caused crashes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91570
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 3fa1ca34cc0134bd16b3315a0695703c9f684bd4)

---

 src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c |    1 -
 src/mesa/drivers/dri/nouveau/nv04_render.c     |    1 -
 2 files changed, 2 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c b/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
index 0753c3a..755de2c 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
@@ -338,7 +338,6 @@ TAG(swtnl_init)(struct gl_context *ctx)
 			   NUM_VERTEX_ATTRS * 4 * sizeof(GLfloat));
 	_tnl_need_projected_coords(ctx, GL_FALSE);
 	_tnl_allow_vertex_fog(ctx, GL_FALSE);
-	_tnl_wakeup(ctx);
 
 	swtnl_alloc_vertices(ctx);
 }
diff --git a/src/mesa/drivers/dri/nouveau/nv04_render.c b/src/mesa/drivers/dri/nouveau/nv04_render.c
index 30e9f9a..3b7f782 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_render.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_render.c
@@ -285,7 +285,6 @@ nv04_render_init(struct gl_context *ctx)
 	_tnl_init_vertices(ctx, tnl->vb.Size,
 			   NUM_VERTEX_ATTRS * 4 * sizeof(GLfloat));
 	_tnl_allow_pixel_fog(ctx, GL_FALSE);
-	_tnl_wakeup(ctx);
 }
 
 void