From d8f51bfcbf6755150a5d429161eca79b6b6cc84e Mon Sep 17 00:00:00 2001 From: Charmaine Lee Date: Tue, 11 Jul 2017 21:55:13 -0700 Subject: [PATCH] st/mesa: init winsys buffers list only if context creation succeeds Fixes piglit test crash when context creation fails. v2: As suggested by Brian, move the init to st_create_context_priv() Reviewed-by: Brian Paul --- src/mesa/state_tracker/st_context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 560d94ecd23..381ff9dae00 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -476,6 +476,9 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe, _mesa_initialize_vbo_vtxfmt(ctx); st_init_driver_flags(st); + /* Initialize context's winsys buffers list */ + LIST_INITHEAD(&st->winsys_buffers); + return st; } @@ -576,9 +579,6 @@ struct st_context *st_create_context(gl_api api, struct pipe_context *pipe, _mesa_destroy_context(ctx); } - /* Initialize context's winsys buffers list */ - LIST_INITHEAD(&st->winsys_buffers); - return st; } -- 2.30.2