summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/varray.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/varray.c')
-rw-r--r--src/mesa/main/varray.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 2e27a16a99b..e1675ff5135 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -141,7 +141,7 @@ update_attribute_map_mode(const struct gl_context *ctx,
if (ctx->API != API_OPENGL_COMPAT)
return;
/* The generic0 attribute superseeds the position attribute */
- const GLbitfield enabled = vao->_Enabled;
+ const GLbitfield enabled = vao->Enabled;
if (enabled & VERT_BIT_GENERIC0)
vao->_AttributeMapMode = ATTRIBUTE_MAP_MODE_GENERIC0;
else if (enabled & VERT_BIT_POS)
@@ -177,7 +177,7 @@ _mesa_vertex_attrib_binding(struct gl_context *ctx,
array->BufferBindingIndex = bindingIndex;
- vao->NewArrays |= vao->_Enabled & array_bit;
+ vao->NewArrays |= vao->Enabled & array_bit;
if (vao == ctx->Array.VAO)
ctx->NewState |= _NEW_ARRAY;
}
@@ -213,7 +213,7 @@ _mesa_bind_vertex_buffer(struct gl_context *ctx,
else
vao->VertexAttribBufferMask |= binding->_BoundArrays;
- vao->NewArrays |= vao->_Enabled & binding->_BoundArrays;
+ vao->NewArrays |= vao->Enabled & binding->_BoundArrays;
if (vao == ctx->Array.VAO)
ctx->NewState |= _NEW_ARRAY;
}
@@ -236,7 +236,7 @@ vertex_binding_divisor(struct gl_context *ctx,
if (binding->InstanceDivisor != divisor) {
binding->InstanceDivisor = divisor;
- vao->NewArrays |= vao->_Enabled & binding->_BoundArrays;
+ vao->NewArrays |= vao->Enabled & binding->_BoundArrays;
if (vao == ctx->Array.VAO)
ctx->NewState |= _NEW_ARRAY;
}
@@ -347,7 +347,7 @@ _mesa_update_array_format(struct gl_context *ctx,
array->RelativeOffset = relativeOffset;
array->_ElementSize = elementSize;
- vao->NewArrays |= vao->_Enabled & VERT_BIT(attrib);
+ vao->NewArrays |= vao->Enabled & VERT_BIT(attrib);
if (vao == ctx->Array.VAO)
ctx->NewState |= _NEW_ARRAY;
}
@@ -605,7 +605,7 @@ update_array(struct gl_context *ctx,
* to the VAO. But but that is done already unconditionally in
* _mesa_update_array_format called above.
*/
- assert((vao->NewArrays | ~vao->_Enabled) & VERT_BIT(attrib));
+ assert((vao->NewArrays | ~vao->Enabled) & VERT_BIT(attrib));
array->Ptr = ptr;
/* Update the vertex buffer binding */
@@ -1082,7 +1082,7 @@ _mesa_enable_vertex_array_attrib(struct gl_context *ctx,
/* was disabled, now being enabled */
vao->VertexAttrib[attrib].Enabled = GL_TRUE;
const GLbitfield array_bit = VERT_BIT(attrib);
- vao->_Enabled |= array_bit;
+ vao->Enabled |= array_bit;
vao->NewArrays |= array_bit;
if (vao == ctx->Array.VAO)
@@ -1169,7 +1169,7 @@ _mesa_disable_vertex_array_attrib(struct gl_context *ctx,
/* was enabled, now being disabled */
vao->VertexAttrib[attrib].Enabled = GL_FALSE;
const GLbitfield array_bit = VERT_BIT(attrib);
- vao->_Enabled &= ~array_bit;
+ vao->Enabled &= ~array_bit;
vao->NewArrays |= array_bit;
if (vao == ctx->Array.VAO)