glGet*(GL_FRAGMENT_PROGRAM_BINDING_NV) was returning the vertex program binding.

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index af18de4ce37e4fd71226e9fe6453cc63b04a67fb..5971fc8a765eaec34f4e4dea00284b85ea90cd0c 100644 (file)
--- 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 1ca8121e893035d559b105e81c580e2c5f659b88..d229bddfea72bfaee297be0860ffa7821784f004 100644 (file)
--- 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" ),