summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-10-16 00:29:03 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-10-16 00:29:03 +0000
commit83c74b72792928b5a5ac540eeef65fca3145ddb6 (patch)
tree1551b6ea1a4b1afbb6743af337b0090a03a6c3b4 /src/mesa
parent1aa37f97c484dbe62bfd8b27ed6d9b0c744a2b35 (diff)
fix if/else bug in _mesa_ProgramEnvParameter4fARB (fdo bug 1645)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/shader/arbprogram.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 79615d609ce..ad8683f00b2 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -265,7 +265,7 @@ _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
}
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 @@ _mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index,
}
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)");