diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:47:23 +0100 |
| commit | b3e1e62c45f525cdd332073aaa34d8452cb23374 (patch) | |
| tree | 221ee6420074033279921fadc971d30d63d6847b /mesalib/src/mesa/main/arbprogram.c | |
| parent | b142593315b909b9e202f0f4585b96bf2e74b9db (diff) | |
| download | vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.gz vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.tar.bz2 vcxsrv-b3e1e62c45f525cdd332073aaa34d8452cb23374.zip | |
git update 19 nov 2012
fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d
libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e
mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe
pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7
xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
Diffstat (limited to 'mesalib/src/mesa/main/arbprogram.c')
| -rw-r--r-- | mesalib/src/mesa/main/arbprogram.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/arbprogram.c b/mesalib/src/mesa/main/arbprogram.c index 9be86c2fe..8150b5f4e 100644 --- a/mesalib/src/mesa/main/arbprogram.c +++ b/mesalib/src/mesa/main/arbprogram.c @@ -46,7 +46,7 @@ * and glBindProgramARB. */ void GLAPIENTRY -_mesa_BindProgram(GLenum target, GLuint id) +_mesa_BindProgramARB(GLenum target, GLuint id) { struct gl_program *curProg, *newProg; GET_CURRENT_CONTEXT(ctx); @@ -132,7 +132,7 @@ _mesa_BindProgram(GLenum target, GLuint id) * \note Called by both glDeleteProgramsNV and glDeleteProgramsARB. */ void GLAPIENTRY -_mesa_DeletePrograms(GLsizei n, const GLuint *ids) +_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -156,14 +156,14 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) if (ctx->VertexProgram.Current && ctx->VertexProgram.Current->Base.Id == ids[i]) { /* unbind this currently bound program */ - _mesa_BindProgram(prog->Target, 0); + _mesa_BindProgramARB(prog->Target, 0); } break; case GL_FRAGMENT_PROGRAM_ARB: if (ctx->FragmentProgram.Current && ctx->FragmentProgram.Current->Base.Id == ids[i]) { /* unbind this currently bound program */ - _mesa_BindProgram(prog->Target, 0); + _mesa_BindProgramARB(prog->Target, 0); } break; default: @@ -185,7 +185,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) * \note Called by both glGenProgramsNV and glGenProgramsARB. */ void GLAPIENTRY -_mesa_GenPrograms(GLsizei n, GLuint *ids) +_mesa_GenProgramsARB(GLsizei n, GLuint *ids) { GLuint first; GLuint i; |