mesa: Make _mesa_primitive_restart_index a static inline in the header.
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:
@@ -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
|
* GL_ARB_vertex_attrib_binding
|
||||||
*/
|
*/
|
||||||
|
@@ -343,9 +343,22 @@ _mesa_VertexAttribDivisor_no_error(GLuint index, GLuint divisor);
|
|||||||
extern void GLAPIENTRY
|
extern void GLAPIENTRY
|
||||||
_mesa_VertexAttribDivisor(GLuint index, GLuint divisor);
|
_mesa_VertexAttribDivisor(GLuint index, GLuint divisor);
|
||||||
|
|
||||||
extern unsigned
|
static inline unsigned
|
||||||
_mesa_primitive_restart_index(const struct gl_context *ctx,
|
_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
|
extern void GLAPIENTRY
|
||||||
_mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset,
|
_mesa_BindVertexBuffer(GLuint bindingIndex, GLuint buffer, GLintptr offset,
|
||||||
|
Reference in New Issue
Block a user