commit 83c74b72792928b5a5ac540eeef65fca3145ddb6
author Brian Paul <brian.paul@tungstengraphics.com> Sat Oct 16 00:29:03 2004 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Sat Oct 16 00:29:03 2004 +0000
tree 1551b6ea1a4b1afbb6743af337b0090a03a6c3b4
parent 1aa37f97c484dbe62bfd8b27ed6d9b0c744a2b35

fix if/else bug in _mesa_ProgramEnvParameter4fARB (fdo bug 1645)

src/mesa/shader/arbprogram.c

diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 79615d6..ad8683f 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -265,7 +265,7 @@
       }
       ASSIGN_4V(ctx->FragmentProgram.Parameters[index], x, y, z, w);
    }
-   if (target == GL_VERTEX_PROGRAM_ARB
+   else if (target == GL_VERTEX_PROGRAM_ARB
        && ctx->Extensions.ARB_vertex_program) {
       if (index >= ctx->Const.MaxVertexProgramEnvParams) {
          _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter(index)");
@@ -325,7 +325,7 @@
       }
       COPY_4V(params, ctx->FragmentProgram.Parameters[index]);
    }
-   if (target == GL_VERTEX_PROGRAM_ARB
+   else if (target == GL_VERTEX_PROGRAM_ARB
        && ctx->Extensions.ARB_vertex_program) {
       if (index >= ctx->Const.MaxVertexProgramEnvParams) {
          _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramEnvParameter(index)");