KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Brian Paul 2005-02-09 18:46:16 +00:00
parent a8d5b176b5
commit 4f1f5e336b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/main/get.c
View File

@ -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);

2
src/mesa/main/get_gen.py
View File

@ -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" ),