glapi: Alias ClampColor and ClampColorARB.

There's no reason to have separate slots in the dispatch table for
these two functions, since they are synonymous.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index 7642a27c4e6be7eca3cf233274569f6fea667e72..db8bae535137fe48248cc8c428815bedb3b8a857 100644 (file)
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -150,7 +150,7 @@
       <return type="const GLubyte *"/>
   </function>
 
-  <function name="ClampColor" offset="assign">
+  <function name="ClampColor" alias="ClampColorARB">
     <param name="target" type="GLenum"/>
     <param name="clamp" type="GLenum"/>
   </function>

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index d2f14ce1a4836bad6b224d7a4ea863f75f14aa64..e2a503d96a3c61c924ba7378ffc92aed16a72698 100644 (file)
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -768,7 +768,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_ClearBufferfv(exec, _mesa_ClearBufferfv);
       SET_ClearBufferfi(exec, _mesa_ClearBufferfi);
       SET_GetStringi(exec, _mesa_GetStringi);
-      SET_ClampColor(exec, _mesa_ClampColorARB);
    }
 
    /* GL_ARB_instanced_arrays */

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 28cd52a4049b04bf86e4a13e2e398114eb99a0c5..1948bff5ad24724f8c48a6a82282b4cc347b1460 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -10143,7 +10143,6 @@ _mesa_create_save_table(const struct gl_context *ctx)
 
    /* GL_ARB_color_buffer_float */
    SET_ClampColorARB(table, save_ClampColorARB);
-   SET_ClampColor(table, save_ClampColorARB);
 
    /* GL 3.0 */
    SET_ClearBufferiv(table, save_ClearBufferiv);