Module: Mesa Branch: master Commit: a8b9a75b921b66581b5762c7b5aab1eaa25def7f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8b9a75b921b66581b5762c7b5aab1eaa25def7f
Author: Christoph Bumiller <[email protected]> Date: Tue Jun 14 17:15:08 2011 +0200 nv50: fix copy/paste error in nv50_gmtyprog_validate Used the vertprog instead of gmtyprog. --- src/gallium/drivers/nv50/nv50_shader_state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nv50/nv50_shader_state.c b/src/gallium/drivers/nv50/nv50_shader_state.c index 5d3f52c..e5b10c3 100644 --- a/src/gallium/drivers/nv50/nv50_shader_state.c +++ b/src/gallium/drivers/nv50/nv50_shader_state.c @@ -215,10 +215,12 @@ void nv50_gmtyprog_validate(struct nv50_context *nv50) { struct nouveau_channel *chan = nv50->screen->base.channel; - struct nv50_program *gp = nv50->vertprog; + struct nv50_program *gp = nv50->gmtyprog; + if (!gp) /* GP_ENABLE is updated in linkage validation */ + return; if (!nv50_program_validate(nv50, gp)) - return; + return; BEGIN_RING(chan, RING_3D(GP_REG_ALLOC_TEMP), 1); OUT_RING (chan, gp->max_gpr); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
