From 347fe24f82f01511b265aaa398f9607b2dee0e45 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 24 Apr 2017 15:59:24 +1000 Subject: mesa: use locked version of HashWalk for xfb objects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From Chapter 5 'Shared Objects and Multiple Contexts' of the OpenGL 4.5 spec: "Objects which contain references to other objects include framebuffer, program pipeline, query, transform feedback, and vertex array objects. Such objects are called container objects and are not shared" Reviewed-by: Nicolai Hähnle --- src/mesa/main/transformfeedback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c index 3c72674d6c1..c3aa61c2f6e 100644 --- a/src/mesa/main/transformfeedback.c +++ b/src/mesa/main/transformfeedback.c @@ -72,8 +72,8 @@ _mesa_transform_feedback_is_using_program(struct gl_context *ctx, callback_data.found = false; callback_data.prog = shProg->last_vert_prog; - _mesa_HashWalk(ctx->TransformFeedback.Objects, - active_xfb_object_references_program, &callback_data); + _mesa_HashWalkLocked(ctx->TransformFeedback.Objects, + active_xfb_object_references_program, &callback_data); /* Also check DefaultObject, as it's not in the Objects hash table. */ active_xfb_object_references_program(0, ctx->TransformFeedback.DefaultObject, -- cgit v1.2.3