fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 19:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: avoid redundant VBO updates

Browse source 
Avoids re-emitting unchanged VBO state, which is a big chunk of the
state updates in gfxbench driver2

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4619>
This commit is contained in:
Rob Clark 2020-04-16 09:46:04 -07:00 • committed by Marge Bot
parent 155bb74ea9
commit 7e1b57a6d9
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -627,14 +627,21 @@ _mesa_update_array_format(struct gl_context *ctx,
GLuint relativeOffset)
{
struct gl_array_attributes *const array = &vao->VertexAttrib[attrib];
struct gl_vertex_format new_format;
assert(!vao->SharedAndImmutable);
assert(size <= 4);
array->RelativeOffset = relativeOffset;
_mesa_set_vertex_format(&array->Format, size, type, format,
_mesa_set_vertex_format(&new_format, size, type, format,
normalized, integer, doubles);
if ((array->RelativeOffset == relativeOffset) &&
!memcmp(&new_format, &array->Format, sizeof(new_format)))
return;
array->RelativeOffset = relativeOffset;
array->Format = new_format;
vao->NewArrays |= vao->Enabled & VERT_BIT(attrib);
}
@ -891,13 +898,11 @@ update_array(struct gl_context *ctx,
/* The Stride and Ptr fields are not set by update_array_format() */
struct gl_array_attributes *array = &vao->VertexAttrib[attrib];
array->Stride = stride;
/* For updating the pointer we would need to add the vao->NewArrays flag
* 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));
array->Ptr = ptr;
if ((array->Stride != stride) || (array->Ptr != ptr)) {
array->Stride = stride;
array->Ptr = ptr;
vao->NewArrays |= vao->Enabled & VERT_BIT(attrib);
}
/* Update the vertex buffer binding */
GLsizei effectiveStride = stride != 0 ?

7
src/mesa/vbo/vbo_private.h
View file

@ -243,12 +243,7 @@ _vbo_set_attrib_format(struct gl_context *ctx,
size /= 2;
_mesa_update_array_format(ctx, vao, attr, size, type, GL_RGBA,
GL_FALSE, integer, doubles, offset);
/* Ptr for userspace arrays.
* For updating the pointer we would need to add the vao->NewArrays flag
* to the VAO. But but that is done already unconditionally in
* _mesa_update_array_format called above.
*/
assert((vao->NewArrays | ~vao->Enabled) & VERT_BIT(attr));
vao->NewArrays |= vao->Enabled & VERT_BIT(attr);
vao->VertexAttrib[attr].Ptr = ADD_POINTERS(buffer_offset, offset);
}