Mesa (master): st/mesa: init winsys buffers list only if context creation succeeds

Charmaine Lee charmainel at kemper.freedesktop.org
Mon Jul 17 18:46:33 UTC 2017


Module: Mesa
Branch: master
Commit: d8f51bfcbf6755150a5d429161eca79b6b6cc84e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8f51bfcbf6755150a5d429161eca79b6b6cc84e

Author: Charmaine Lee <charmainel at vmware.com>
Date:   Tue Jul 11 21:55:13 2017 -0700

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 <brianp at vmware.com>

---

 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 560d94ecd2..381ff9dae0 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;
 }
 




More information about the mesa-commit mailing list