diff options
author | Marek Olšák <[email protected]> | 2017-11-15 23:53:04 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2017-11-25 17:18:22 +0100 |
commit | 78942e7dbfd234ce080b2773b9317a61deb77788 (patch) | |
tree | 71a93812dcc3229abee231c51ec40f39aa1aeb51 /src/mesa/vbo | |
parent | 43abaf2ad0c1c42e56e47732395cc98912a050e8 (diff) |
mesa: shrink VERT_ATTRIB bitfields to 32 bits
There are only 32 vertex attribs now.
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
-rw-r--r-- | src/mesa/vbo/vbo_exec_array.c | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_exec_draw.c | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save_draw.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index e3421fa9b51..024d4d6c80e 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -299,7 +299,7 @@ recalculate_input_bindings(struct gl_context *ctx) const struct gl_array_attributes *array = ctx->Array.VAO->VertexAttrib; struct gl_vertex_array *vertexAttrib = ctx->Array.VAO->_VertexAttrib; const struct gl_vertex_array **inputs = &exec->array.inputs[0]; - GLbitfield64 const_inputs = 0x0; + GLbitfield const_inputs = 0x0; GLuint i; switch (get_program_mode(ctx)) { diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index df34f059b30..34cb4ff72e6 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -177,7 +177,7 @@ vbo_exec_bind_arrays( struct gl_context *ctx ) struct gl_vertex_array *arrays = exec->vtx.arrays; const GLuint *map; GLuint attr; - GLbitfield64 varying_inputs = 0x0; + GLbitfield varying_inputs = 0x0; bool swap_pos = false; /* Install the default (ie Current) attributes first, then overlay diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 8a4b6599554..2a20bb8f05c 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -141,7 +141,7 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, GLuint attr; GLubyte node_attrsz[VBO_ATTRIB_MAX]; /* copy of node->attrsz[] */ GLenum node_attrtype[VBO_ATTRIB_MAX]; /* copy of node->attrtype[] */ - GLbitfield64 varying_inputs = 0x0; + GLbitfield varying_inputs = 0x0; memcpy(node_attrsz, node->attrsz, sizeof(node->attrsz)); memcpy(node_attrtype, node->attrtype, sizeof(node->attrtype)); |