summaryrefslogtreecommitdiffstats
path: root/src/mesa/vbo/vbo_exec_draw.c
diff options
context:
space:
mode:
authorMathias Fröhlich <[email protected]>2018-11-17 07:13:11 +0100
committerMathias Fröhlich <[email protected]>2018-11-21 06:27:19 +0100
commit73d2d313e9fafc8e8a6ac54af1da18d476821e7a (patch)
tree90a160575b5cddae9b439bbc3cae3c1460fd735f /src/mesa/vbo/vbo_exec_draw.c
parentea9f95e2a67eca90bb84eea24e7b4b804b3b1345 (diff)
mesa: Rename gl_vertex_array_object::_Enabled -> Enabled.
Mark the up to now derived bitfield value now as primary value by removing the underscore. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Signed-off-by: Mathias Fröhlich <[email protected]>
Diffstat (limited to 'src/mesa/vbo/vbo_exec_draw.c')
-rw-r--r--src/mesa/vbo/vbo_exec_draw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index dc6e8d3b8a4..db95dbbc34e 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -191,12 +191,12 @@ vbo_exec_bind_arrays(struct gl_context *ctx)
GLbitfield vao_enabled = _vbo_get_vao_enabled_from_vbo(mode, exec->vtx.enabled);
/* At first disable arrays no longer needed */
- GLbitfield mask = vao->_Enabled & ~vao_enabled;
+ GLbitfield mask = vao->Enabled & ~vao_enabled;
while (mask) {
const int vao_attr = u_bit_scan(&mask);
_mesa_disable_vertex_array_attrib(ctx, vao, vao_attr);
}
- assert((~vao_enabled & vao->_Enabled) == 0);
+ assert((~vao_enabled & vao->Enabled) == 0);
/* Bind the buffer object */
const GLuint stride = exec->vtx.vertex_size*sizeof(GLfloat);
@@ -222,13 +222,13 @@ vbo_exec_bind_arrays(struct gl_context *ctx)
/* Set and enable */
_vbo_set_attrib_format(ctx, vao, vao_attr, buffer_offset,
size, type, offset);
- if ((vao->_Enabled & VERT_BIT(vao_attr)) == 0)
+ if ((vao->Enabled & VERT_BIT(vao_attr)) == 0)
_mesa_enable_vertex_array_attrib(ctx, vao, vao_attr);
/* The vao is initially created with all bindings set to 0. */
assert(vao->VertexAttrib[vao_attr].BufferBindingIndex == 0);
}
- assert(vao_enabled == vao->_Enabled);
+ assert(vao_enabled == vao->Enabled);
assert(!_mesa_is_bufferobj(exec->vtx.bufferobj) ||
(vao_enabled & ~vao->VertexAttribBufferMask) == 0);