diff options
author | Paul Berry <stereotype441@gmail.com> | 2012-10-18 22:13:02 -0700 |
---|---|---|
committer | Paul Berry <stereotype441@gmail.com> | 2012-10-23 10:24:39 -0700 |
commit | bad96f6ada47ec8e2caea7246e31654b1c7c92bb (patch) | |
tree | 249187fd2e8540c476ffb5814594f7ca84e7da5a /src | |
parent | 992ed68ed65b99fd76213cb355404f9a18e26da1 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/mapi/glapi/gen/GL3x.xml | 2 | ||||
-rw-r--r-- | src/mesa/main/api_exec.c | 1 | ||||
-rw-r--r-- | src/mesa/main/dlist.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index 7642a27c4e6..db8bae53513 100644 --- 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 d2f14ce1a48..e2a503d96a3 100644 --- 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 28cd52a4049..1948bff5ad2 100644 --- 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); |