nouveau: no need to do tnl wakeup, state updates are always hooked up
authorIlia Mirkin <imirkin@alum.mit.edu>
Mon, 10 Aug 2015 21:41:36 +0000 (17:41 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Mon, 10 Aug 2015 21:43:44 +0000 (17:43 -0400)
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@alum.mit.edu>
Cc: "10.6" <mesa-stable@lists.freedesktop.org>
src/mesa/drivers/dri/nouveau/nouveau_swtnl_t.c
src/mesa/drivers/dri/nouveau/nv04_render.c

index 0753c3a..755de2c 100644 (file)
@@ -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);
 }
index 30e9f9a..3b7f782 100644 (file)
@@ -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