OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: do (inputs_read & enabled_arrays) outside setup_arrays

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27198>
This commit is contained in:
Marek Olšák
2024-01-03 21:34:28 -05:00
committed by Marge Bot
parent 000f4c710c
commit c4ba65a33b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/state_tracker/st_atom_array.cpp
View File

@@ -81,15 +81,13 @@ setup_arrays(struct st_context *st,
const struct gl_vertex_array_object *vao,
const GLbitfield dual_slot_inputs,
const GLbitfield inputs_read,
const GLbitfield enabled_arrays,
GLbitfield mask,
struct cso_velems_state *velements,
struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers)
{
struct gl_context *ctx = st->ctx;
/* Process attribute array data. */
GLbitfield mask = inputs_read & enabled_arrays;
if (vao->IsDynamic) {
while (mask) {
const gl_vert_attrib attr = (gl_vert_attrib)u_bit_scan(&mask);
@@ -183,7 +181,8 @@ st_setup_arrays(struct st_context *st,
setup_arrays<POPCNT_NO, UPDATE_ALL>
(st, ctx->Array._DrawVAO, vp->Base.DualSlotInputs,
vp_variant->vert_attrib_mask, enabled_arrays,
vp_variant->vert_attrib_mask,
vp_variant->vert_attrib_mask & enabled_arrays,
velements, vbuffer, num_vbuffers);
}
@@ -326,7 +325,7 @@ st_update_array_templ(struct st_context *st,
/* Setup arrays */
setup_arrays<POPCNT, UPDATE>
(st, ctx->Array._DrawVAO, dual_slot_inputs, inputs_read,
enabled_arrays, &velements, vbuffer, &num_vbuffers);
inputs_read & enabled_arrays, &velements, vbuffer, &num_vbuffers);
/* _NEW_CURRENT_ATTRIB */
/* Setup zero-stride attribs. */