summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/nouveau/nv10_context.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-11-10 20:18:33 +0100
committerFrancisco Jerez <currojerez@riseup.net>2010-11-11 14:50:50 +0100
commitcdb38b5d3d1b93a90a91ad06c0f03efdfde6b525 (patch)
tree1ebfc5ddf9b1b1c11e1e7e08c8204e05507195bd /src/mesa/drivers/dri/nouveau/nv10_context.c
parentdc524adee2cfd0f115800cd4ec3f8384010f154e (diff)
dri/nouveau: Split hardware/software TNL instantiation more cleanly.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv10_context.c')
-rw-r--r--src/mesa/drivers/dri/nouveau/nv10_context.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c
index 78be401ba2..de2c93ec81 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_context.c
@@ -411,7 +411,8 @@ nv10_context_destroy(struct gl_context *ctx)
struct nouveau_context *nctx = to_nouveau_context(ctx);
nv04_surface_takedown(ctx);
- nv10_render_destroy(ctx);
+ nv10_swtnl_destroy(ctx);
+ nv10_vbo_destroy(ctx);
nouveau_grobj_free(&nctx->hw.eng3d);
@@ -467,7 +468,8 @@ nv10_context_create(struct nouveau_screen *screen, const struct gl_config *visua
goto fail;
nv10_hwctx_init(ctx);
- nv10_render_init(ctx);
+ nv10_vbo_init(ctx);
+ nv10_swtnl_init(ctx);
return ctx;