aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorChristoph Bumiller <[email protected]>2011-06-14 17:15:08 +0200
committerChristoph Bumiller <[email protected]>2011-06-14 17:15:08 +0200
commita8b9a75b921b66581b5762c7b5aab1eaa25def7f (patch)
tree32a5edb77e1ffc211c6a797798fb274534afa1ee /src/gallium
parenta128355ecb5b782a69461a04991e4cffb32249db (diff)
nv50: fix copy/paste error in nv50_gmtyprog_validate
Used the vertprog instead of gmtyprog.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nv50/nv50_shader_state.c6
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 5d3f52c38c1..e5b10c37bef 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);