fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-23 18:10:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: remove the NewVAO flag, set directly what we need to set

Browse source 
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19953>
This commit is contained in:
Marek Olšák 2022-11-21 08:20:24 -05:00 • committed by Marge Bot
parent ee308fb9ae
commit 76a214f390
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/main/draw.c
View file

@ -111,7 +111,8 @@ _mesa_set_draw_vao(struct gl_context *ctx, struct gl_vertex_array_object *vao)
if (*ptr != vao) {
_mesa_reference_vao_(ctx, ptr, vao);
_mesa_update_edgeflag_state_vao(ctx);
ctx->Array.NewVAO = true;
ctx->NewDriverState |= ST_NEW_VERTEX_ARRAYS;
ctx->Array.NewVertexElements = true;
}
}
@ -137,7 +138,8 @@ _mesa_restore_draw_vao(struct gl_context *ctx,
_mesa_reference_vao(ctx, &ctx->Array._DrawVAO, NULL);
ctx->Array._DrawVAO = saved;
_mesa_update_edgeflag_state_vao(ctx);
ctx->Array.NewVAO = true;
ctx->NewDriverState |= ST_NEW_VERTEX_ARRAYS;
ctx->Array.NewVertexElements = true;
}
/**
@ -149,10 +151,7 @@ void
_mesa_update_vao_state(struct gl_context *ctx, GLbitfield filter)
{
struct gl_vertex_array_object *vao = ctx->Array._DrawVAO;
bool new_vertex_buffers, new_vertex_elements;
new_vertex_buffers = new_vertex_elements = ctx->Array.NewVAO;
ctx->Array.NewVAO = false;
bool new_vertex_buffers = false, new_vertex_elements = false;
if (vao->NewVertexBuffers || vao->NewVertexElements) {
if (!vao->IsDynamic)

5
src/mesa/main/mtypes.h
View file

@ -1765,11 +1765,6 @@ struct gl_array_attrib
*/
bool _PolygonModeAlwaysCulls;
/**
* Whether the VAO has been changed.
*/
bool NewVAO;
/**
* If gallium vertex buffers are dirty, this flag indicates whether gallium
* vertex elements are dirty too. If this is false, GL states corresponding