summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2012-10-14 15:09:19 -0700
committerKenneth Graunke <kenneth@whitecape.org>2012-10-16 11:24:34 -0700
commit16d8161962d04170f141a893a50a620906abe375 (patch)
tree4a2163eabd927ff5e9b12812ce727f65ab73ad0f
parent070ba30c368d03615f0784030ba3245f8d4211e2 (diff)
mesa: Switch to the other glGetVertexAttribPointervARB implementation.
Previously, Mesa used nvprogram.c's _mesa_GetVertexAttribPointervNV() function to implement this GL call. There was also a second implementation in varray.c, _mesa_GetVertexAttribPointervARB(), which was entirely unused. The varray.c variant has an additional assertion and checks the index against ctx->Const.VertexProgram.MaxAttribs rather than MAX_VERTEX_GENERIC_ATTRIBS. However, that variable is defined to the same value, so it should be fine. This will allow us to kill the duplicate function. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--src/mesa/main/api_exec.c3
-rw-r--r--src/mesa/main/dlist.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 37d98d1b3d7..d9b8af3f288 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -480,7 +480,6 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_IsProgramNV(exec, _mesa_IsProgramARB);
/* glVertexAttrib*NV functions handled in api_loopback.c */
}
- SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);
/* 273. GL_APPLE_vertex_array_object */
if (ctx->API == API_OPENGL) {
@@ -624,7 +623,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);
SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);
- /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */
+ SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervARB);
if (ctx->API == API_OPENGL) {
SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);
SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 0288649babb..8749ee34285 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -10029,7 +10029,7 @@ _mesa_create_save_table(const struct gl_context *ctx)
SET_GetVertexAttribdvARB(table, _mesa_GetVertexAttribdvARB);
SET_GetVertexAttribfvARB(table, _mesa_GetVertexAttribfvARB);
SET_GetVertexAttribivARB(table, _mesa_GetVertexAttribivARB);
- SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV);
+ SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervARB);
SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB);
SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB);
SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB);