KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: split _mesa_primitive_restart_index into a function without gl_context 

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4466>
This commit is contained in:
Marek Olšák 2020-03-20 23:58:33 -04:00
parent e6bc1702f4
commit e69e59778c
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/main/varray.h
View File

@ -321,10 +321,10 @@ extern void GLAPIENTRY
_mesa_VertexArrayVertexAttribDivisorEXT(GLuint vaobj, GLuint index, GLuint divisor);
static inline unsigned
_mesa_primitive_restart_index(const struct gl_context *ctx,
unsigned index_size)
_mesa_get_prim_restart_index(bool fixed_index, unsigned restart_index,
unsigned index_size)
{
/* The index_size parameter is menat to be in bytes. */
/* The index_size parameter is meant to be in bytes. */
assert(index_size == 1 || index_size == 2 || index_size == 4);
/* From the OpenGL 4.3 core specification, page 302:
@ -332,12 +332,20 @@ _mesa_primitive_restart_index(const struct gl_context *ctx,
* enabled, the index value determined by PRIMITIVE_RESTART_FIXED_INDEX
* is used."
*/
if (ctx->Array.PrimitiveRestartFixedIndex) {
if (fixed_index) {
/* 1 -> 0xff, 2 -> 0xffff, 4 -> 0xffffffff */
return 0xffffffffu >> 8 * (4 - index_size);
}
return ctx->Array.RestartIndex;
return restart_index;
}
static inline unsigned
_mesa_primitive_restart_index(const struct gl_context *ctx,
unsigned index_size)
{
return _mesa_get_prim_restart_index(ctx->Array.PrimitiveRestartFixedIndex,
ctx->Array.RestartIndex, index_size);
}
extern void GLAPIENTRY