fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-10 16:10:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

mesa: Make _mesa_primitive_restart_index a static inline in the header.

Browse source 
It's now basically a single expression, so it probably makes sense to
have it inlined into the callers.

Suggested by Marek.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Kenneth Graunke 2017-05-06 16:11:03 -07:00
parent db6f38cb6a
commit d4fa0a0fa6
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/main/varray.c
View file

@ -1949,24 +1949,6 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
}
unsigned
_mesa_primitive_restart_index(const struct gl_context *ctx,
unsigned index_size)
{
/* From the OpenGL 4.3 core specification, page 302:
* "If both PRIMITIVE_RESTART and PRIMITIVE_RESTART_FIXED_INDEX are
* enabled, the index value determined by PRIMITIVE_RESTART_FIXED_INDEX
* is used."
*/
if (ctx->Array.PrimitiveRestartFixedIndex) {
/* 1 -> 0xff, 2 -> 0xffff, 4 -> 0xffffffff */
return 0xffffffffu >> 8 * (4 - index_size);
}
return ctx->Array.RestartIndex;
}
/**
* GL_ARB_vertex_attrib_binding
*/

17
src/mesa/main/varray.h
View file

@ -343,9 +343,22 @@ _mesa_VertexAttribDivisor_no_error(GLuint index, GLuint divisor);
extern void GLAPIENTRY
_mesa_VertexAttribDivisor(GLuint index, GLuint divisor);
extern unsigned
static inline unsigned
_mesa_primitive_restart_index(const struct gl_context *ctx,
unsigned index_size);
unsigned index_size)
{
/* From the OpenGL 4.3 core specification, page 302:
* "If both PRIMITIVE_RESTART and PRIMITIVE_RESTART_FIXED_INDEX are
* enabled, the index value determined by PRIMITIVE_RESTART_FIXED_INDEX
* is used."
*/
if (ctx->Array.PrimitiveRestartFixedIndex) {
/* 1 -> 0xff, 2 -> 0xffff, 4 -> 0xffffffff */
return 0xffffffffu >> 8 * (4 - index_size);
}
return ctx->Array.RestartIndex;
}
extern void GLAPIENTRY
_mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset,