From 31c03f2f8c64a62c4cc516dbb9cfd72e4352f037 Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 26 Oct 2012 15:38:23 -0700
Subject: glapi: alias ProgramParameteriARB to ProgramParameteri

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
---
 src/mapi/glapi/gen/ARB_geometry_shader4.xml | 2 +-
 src/mesa/main/dlist.c                       | 6 +++---
 src/mesa/main/shaderapi.c                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/src/mapi/glapi/gen/ARB_geometry_shader4.xml
index 3c4beece6e4..97a4e2e8f0e 100644
--- a/src/mapi/glapi/gen/ARB_geometry_shader4.xml
+++ b/src/mapi/glapi/gen/ARB_geometry_shader4.xml
@@ -27,7 +27,7 @@
     <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED_ARB"   value="0x8DA7"/>
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER" value="0x8CD4"/>
     <enum name="PROGRAM_POINT_SIZE_ARB" value="0x8642"/>
-    <function name="ProgramParameteriARB"  offset="assign">
+    <function name="ProgramParameteriARB"  alias="ProgramParameteri">
         <param name="program" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="value" type="GLint"/>
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 94bfb781d20..c15043694da 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -7177,7 +7177,7 @@ save_ProgramParameteri(GLuint program, GLenum pname, GLint value)
       n[3].i = value;
    }
    if (ctx->ExecuteFlag) {
-      CALL_ProgramParameteriARB(ctx->Exec, (program, pname, value));
+      CALL_ProgramParameteri(ctx->Exec, (program, pname, value));
    }
 }
 
@@ -8509,7 +8509,7 @@ execute_list(struct gl_context *ctx, GLuint list)
 
          /* GL_ARB_geometry_shader4 */
          case OPCODE_PROGRAM_PARAMETERI:
-            CALL_ProgramParameteriARB(ctx->Exec, (n[1].ui, n[2].e, n[3].i));
+            CALL_ProgramParameteri(ctx->Exec, (n[1].ui, n[2].e, n[3].i));
             break;
          case OPCODE_FRAMEBUFFER_TEXTURE:
             CALL_FramebufferTexture(ctx->Exec, (n[1].e, n[2].e,
@@ -10212,7 +10212,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_BlendEquationSeparateiARB(table, save_BlendEquationSeparatei);
 
    /* GL_ARB_geometry_shader4 */
-   SET_ProgramParameteriARB(table, save_ProgramParameteri);
+   SET_ProgramParameteri(table, save_ProgramParameteri);
    SET_FramebufferTexture(table, save_FramebufferTexture);
    SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace);
 
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 75c4c66ac93..4411e8acca7 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1735,7 +1735,7 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
    }
 
    if (_mesa_is_desktop_gl(ctx)) {
-      SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB);
+      SET_ProgramParameteri(exec, _mesa_ProgramParameteriARB);
    }
 
    if (ctx->API == API_OPENGL) {
-- 
cgit v1.2.3