summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-02-09 18:46:16 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-02-09 18:46:16 +0000
commit4f1f5e336b50ac9f7ea615a550e3b65201350305 (patch)
treec74240bf90283c6da2368decd976f8ca144376e7 /src/mesa/main
parenta8d5b176b5208de61667ce0d901d69485eea1957 (diff)
glGet*(GL_FRAGMENT_PROGRAM_BINDING_NV) was returning the vertex program binding.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/get.c6
-rw-r--r--src/mesa/main/get_gen.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index af18de4ce3..5971fc8a76 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1635,7 +1635,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
break;
case GL_FRAGMENT_PROGRAM_BINDING_NV:
CHECK_EXTENSION_B(NV_fragment_program, pname);
- params[0] = INT_TO_BOOLEAN(ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0);
+ params[0] = INT_TO_BOOLEAN(ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0);
break;
case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
CHECK_EXTENSION_B(NV_fragment_program, pname);
@@ -3454,7 +3454,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
break;
case GL_FRAGMENT_PROGRAM_BINDING_NV:
CHECK_EXTENSION_F(NV_fragment_program, pname);
- params[0] = (GLfloat)(ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0);
+ params[0] = (GLfloat)(ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0);
break;
case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
CHECK_EXTENSION_F(NV_fragment_program, pname);
@@ -5273,7 +5273,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
break;
case GL_FRAGMENT_PROGRAM_BINDING_NV:
CHECK_EXTENSION_I(NV_fragment_program, pname);
- params[0] = ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0;
+ params[0] = ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;
break;
case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
CHECK_EXTENSION_I(NV_fragment_program, pname);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 1ca8121e89..d229bddfea 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -807,7 +807,7 @@ StateVars = [
( "GL_MAX_TEXTURE_IMAGE_UNITS_NV", GLint,
["ctx->Const.MaxTextureImageUnits"], "", "NV_fragment_program" ),
( "GL_FRAGMENT_PROGRAM_BINDING_NV", GLint,
- ["ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0"],
+ ["ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0"],
"", "NV_fragment_program" ),
( "GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV", GLint,
["MAX_NV_FRAGMENT_PROGRAM_PARAMS"], "", "NV_fragment_program" ),