fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Only update enabled VAO gl_vertex_array entries.

Browse source 
Instead of updating all modified gl_vertex_array_object::_VertexArray
entries just update those that are modified and enabled.
Also release buffer object from the _VertexArray that belong
to disabled attributes.

v2: Also set Ptr and Size to zero.

Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Mathias Fröhlich 2018-02-04 17:13:06 +01:00
parent 437cae411e
commit 77cb2fc0bd
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/main/varray.c
View file

@ -178,7 +178,7 @@ vertex_attrib_binding(struct gl_context *ctx,
array->BufferBindingIndex = bindingIndex;
vao->NewArrays |= array_bit;
vao->NewArrays |= vao->_Enabled & array_bit;
}
}
@ -213,7 +213,7 @@ _mesa_bind_vertex_buffer(struct gl_context *ctx,
else
vao->VertexAttribBufferMask |= binding->_BoundArrays;
vao->NewArrays |= binding->_BoundArrays;
vao->NewArrays |= vao->_Enabled & binding->_BoundArrays;
}
}
@ -234,7 +234,7 @@ vertex_binding_divisor(struct gl_context *ctx,
if (binding->InstanceDivisor != divisor) {
FLUSH_VERTICES(ctx, _NEW_ARRAY);
binding->InstanceDivisor = divisor;
vao->NewArrays |= binding->_BoundArrays;
vao->NewArrays |= vao->_Enabled & binding->_BoundArrays;
}
}
@ -344,7 +344,7 @@ _mesa_update_array_format(struct gl_context *ctx,
array->RelativeOffset = relativeOffset;
array->_ElementSize = elementSize;
vao->NewArrays |= VERT_BIT(attrib);
vao->NewArrays |= vao->_Enabled & VERT_BIT(attrib);
ctx->NewState |= _NEW_ARRAY;
}

29
src/mesa/main/varray.h
View file

@ -58,17 +58,24 @@ _mesa_update_vertex_array(struct gl_context *ctx,
const struct gl_array_attributes *attribs,
const struct gl_vertex_buffer_binding *binding)
{
dst->Size = attribs->Size;
dst->Type = attribs->Type;
dst->Format = attribs->Format;
dst->StrideB = binding->Stride;
dst->Ptr = _mesa_vertex_attrib_address(attribs, binding);
dst->Normalized = attribs->Normalized;
dst->Integer = attribs->Integer;
dst->Doubles = attribs->Doubles;
dst->InstanceDivisor = binding->InstanceDivisor;
dst->_ElementSize = attribs->_ElementSize;
_mesa_reference_buffer_object(ctx, &dst->BufferObj, binding->BufferObj);
if (attribs->Enabled) {
dst->Size = attribs->Size;
dst->Type = attribs->Type;
dst->Format = attribs->Format;
dst->StrideB = binding->Stride;
dst->Ptr = _mesa_vertex_attrib_address(attribs, binding);
dst->Normalized = attribs->Normalized;
dst->Integer = attribs->Integer;
dst->Doubles = attribs->Doubles;
dst->InstanceDivisor = binding->InstanceDivisor;
dst->_ElementSize = attribs->_ElementSize;
_mesa_reference_buffer_object(ctx, &dst->BufferObj, binding->BufferObj);
} else {
/* Disabled arrays shall not be consumed */
dst->Size = 0;
dst->Ptr = NULL;
_mesa_reference_buffer_object(ctx, &dst->BufferObj, NULL);
}
}