fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-25 12:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Remove the _glapi_table argument from _mesa_array_element.

Browse source 
The value is now unused.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
This commit is contained in:
Mathias Fröhlich 2019-04-03 13:28:57 +02:00
parent 3b6f32907f
commit 0ed7603d97
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/main/api_arrayelt.c
View file

@ -1422,8 +1422,7 @@ attrib_src(const struct gl_vertex_array_object *vao,
void
_mesa_array_element(struct gl_context *ctx,
struct _glapi_table *disp, GLint elt)
_mesa_array_element(struct gl_context *ctx, GLint elt)
{
const struct gl_vertex_array_object *vao = ctx->Array.VAO;
GLbitfield mask;
@ -1474,21 +1473,20 @@ void GLAPIENTRY
_ae_ArrayElement(GLint elt)
{
GET_CURRENT_CONTEXT(ctx);
const struct _glapi_table * const disp = GET_DISPATCH();
struct gl_vertex_array_object *vao;
/* If PrimitiveRestart is enabled and the index is the RestartIndex
* then we call PrimitiveRestartNV and return.
*/
if (ctx->Array.PrimitiveRestart && (elt == ctx->Array.RestartIndex)) {
CALL_PrimitiveRestartNV((struct _glapi_table *)disp, ());
CALL_PrimitiveRestartNV(GET_DISPATCH(), ());
return;
}
vao = ctx->Array.VAO;
_mesa_vao_map_arrays(ctx, vao, GL_MAP_READ_BIT);
_mesa_array_element(ctx, (struct _glapi_table *)disp, elt);
_mesa_array_element(ctx, elt);
_mesa_vao_unmap_arrays(ctx, vao);
}

3
src/mesa/main/api_arrayelt.h
View file

@ -32,8 +32,7 @@
struct _glapi_table;
extern void _mesa_array_element(struct gl_context *ctx,
struct _glapi_table *disp, GLint elt);
extern void _mesa_array_element(struct gl_context *ctx, GLint elt);
extern void GLAPIENTRY _ae_ArrayElement( GLint elt );
extern void

17
src/mesa/vbo/vbo_save_api.c
View file

@ -1331,7 +1331,7 @@ _save_OBE_DrawArrays(GLenum mode, GLint start, GLsizei count)
vbo_save_NotifyBegin(ctx, mode, true);
for (i = 0; i < count; i++)
_mesa_array_element(ctx, GET_DISPATCH(), start + i);
_mesa_array_element(ctx, start + i);
CALL_End(GET_DISPATCH(), ());
_mesa_vao_unmap_arrays(ctx, vao);
@ -1373,7 +1373,7 @@ _save_OBE_MultiDrawArrays(GLenum mode, const GLint *first,
static void
array_element(struct gl_context *ctx, struct _glapi_table *disp,
array_element(struct gl_context *ctx,
GLint basevertex, GLuint elt, unsigned index_size)
{
/* Section 10.3.5 Primitive Restart:
@ -1387,11 +1387,11 @@ array_element(struct gl_context *ctx, struct _glapi_table *disp,
*/
if (ctx->Array._PrimitiveRestart &&
elt == _mesa_primitive_restart_index(ctx, index_size)) {
CALL_PrimitiveRestartNV(disp, ());
CALL_PrimitiveRestartNV(GET_DISPATCH(), ());
return;
}
_mesa_array_element(ctx, disp, basevertex + elt);
_mesa_array_element(ctx, basevertex + elt);
}
@ -1440,18 +1440,15 @@ _save_OBE_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
switch (type) {
case GL_UNSIGNED_BYTE:
for (i = 0; i < count; i++)
array_element(ctx, GET_DISPATCH(), basevertex,
((GLubyte *) indices)[i], 1);
array_element(ctx, basevertex, ((GLubyte *) indices)[i], 1);
break;
case GL_UNSIGNED_SHORT:
for (i = 0; i < count; i++)
array_element(ctx, GET_DISPATCH(), basevertex,
((GLushort *) indices)[i], 2);
array_element(ctx, basevertex, ((GLushort *) indices)[i], 2);
break;
case GL_UNSIGNED_INT:
for (i = 0; i < count; i++)
array_element(ctx, GET_DISPATCH(), basevertex,
((GLuint *) indices)[i], 4);
array_element(ctx, basevertex, ((GLuint *) indices)[i], 4);
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)");