From: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun, 2 Dec 2012 03:11:55 +0000 (-0800)
Subject: mesa: Fix the naming of _mesa_ProgramParameteriARB
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ec41349a7858fda7a2b431aac3f478e51140d0e1;p=mesa.git

mesa: Fix the naming of _mesa_ProgramParameteriARB

After recent changes in the XML, the dispatch generators will expect
this function to be named _mesa_ProgramParameteri.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 1f0002f6fa6..19fa6fc30e6 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1502,7 +1502,7 @@ _mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,
 
 
 void GLAPIENTRY
-_mesa_ProgramParameteriARB(GLuint program, GLenum pname, GLint value)
+_mesa_ProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
    struct gl_shader_program *shProg;
    GET_CURRENT_CONTEXT(ctx);
@@ -1556,7 +1556,7 @@ _mesa_ProgramParameteriARB(GLuint program, GLenum pname, GLint value)
       }
       break;
    default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameteriARB(pname=%s)",
+      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramParameteri(pname=%s)",
                   _mesa_lookup_enum_by_nr(pname));
       break;
    }
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index 8ee68d82da3..53d83032803 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -190,8 +190,8 @@ _mesa_ShaderBinary(GLint n, const GLuint *shaders, GLenum binaryformat,
                    const void* binary, GLint length);
 
 extern void GLAPIENTRY
-_mesa_ProgramParameteriARB(GLuint program, GLenum pname,
-                           GLint value);
+_mesa_ProgramParameteri(GLuint program, GLenum pname, GLint value);
+
 void
 _mesa_use_shader_program(struct gl_context *ctx, GLenum type,
 			 struct gl_shader_program *shProg);