Mesa (master): mesa: fix assertion in _mesa_reference_program()

[Brian Paul]

Module: Mesa
Branch: master
Commit: 4bc39c58eb7fdf3a0be62bed666998a0d1789dcf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bc39c58eb7fdf3a0be62bed666998a0d1789dcf

Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Fri Sep 26 07:40:45 2008 -0600

mesa: fix assertion in _mesa_reference_program()

---

 src/mesa/shader/program.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index b361864..738891a 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -372,7 +372,11 @@ _mesa_reference_program(GLcontext *ctx,
    assert(ptr);
    if (*ptr && prog) {
       /* sanity check */
-      ASSERT((*ptr)->Target == prog->Target);
+      if ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB)
+         ASSERT(prog->Target == GL_VERTEX_PROGRAM_ARB);
+      else if ((*ptr)->Target == GL_FRAGMENT_PROGRAM_ARB)
+         ASSERT(prog->Target == GL_FRAGMENT_PROGRAM_ARB ||
+                prog->Target == GL_FRAGMENT_PROGRAM_NV);
    }
    if (*ptr == prog) {
       return;  /* no change */