From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Tue, 14 Jun 2011 15:15:08 +0000 (+0200)
Subject: nv50: fix copy/paste error in nv50_gmtyprog_validate
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8b9a75b921b66581b5762c7b5aab1eaa25def7f;p=mesa.git

nv50: fix copy/paste error in nv50_gmtyprog_validate

Used the vertprog instead of gmtyprog.
---

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);