From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 26 Oct 2012 22:33:13 +0000 (-0700)
Subject: glapi: alias FramebufferTextureARB to FramebufferTexture
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dd6660038e1896049f3bc00458117fcfe4259e1b;p=mesa.git

glapi: alias FramebufferTextureARB to FramebufferTexture

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
---

diff --git a/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/src/mapi/glapi/gen/ARB_geometry_shader4.xml
index d9e540fc94d..3c4beece6e4 100644
--- a/src/mapi/glapi/gen/ARB_geometry_shader4.xml
+++ b/src/mapi/glapi/gen/ARB_geometry_shader4.xml
@@ -32,7 +32,7 @@
         <param name="pname" type="GLenum"/>
         <param name="value" type="GLint"/>
     </function>
-    <function name="FramebufferTextureARB"  offset="assign">
+    <function name="FramebufferTextureARB"  alias="FramebufferTexture">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="texture" type="GLuint"/>
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e92eb0e1390..8f9672a3c32 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -788,7 +788,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    if (_mesa_is_desktop_gl(ctx)) {
-      SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB);
+      SET_FramebufferTexture(exec, _mesa_FramebufferTextureARB);
       SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB);
    }
 
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d53879efd51..94bfb781d20 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -7196,7 +7196,7 @@ save_FramebufferTexture(GLenum target, GLenum attachment,
       n[4].i = level;
    }
    if (ctx->ExecuteFlag) {
-      CALL_FramebufferTextureARB(ctx->Exec, (target, attachment, texture, level));
+      CALL_FramebufferTexture(ctx->Exec, (target, attachment, texture, level));
    }
 }
 
@@ -8512,7 +8512,7 @@ execute_list(struct gl_context *ctx, GLuint list)
             CALL_ProgramParameteriARB(ctx->Exec, (n[1].ui, n[2].e, n[3].i));
             break;
          case OPCODE_FRAMEBUFFER_TEXTURE:
-            CALL_FramebufferTextureARB(ctx->Exec, (n[1].e, n[2].e,
+            CALL_FramebufferTexture(ctx->Exec, (n[1].e, n[2].e,
                                                    n[3].ui, n[4].i));
             break;
          case OPCODE_FRAMEBUFFER_TEXTURE_FACE:
@@ -10213,7 +10213,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
 
    /* GL_ARB_geometry_shader4 */
    SET_ProgramParameteriARB(table, save_ProgramParameteri);
-   SET_FramebufferTextureARB(table, save_FramebufferTexture);
+   SET_FramebufferTexture(table, save_FramebufferTexture);
    SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace);
 
    /* GL_NV_conditional_render */