From cb77f5dd1f6658fca671454c9b5be9a23c3bf3e4 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 18 Jul 2012 14:37:28 -0700 Subject: [PATCH] egl_dri2: Refactor dereference of dri2_ctx_shared MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ian Romanick Reviewed-by: Kristian Høgsberg Reviewed-by: Matt Turner Reviewed-by: Chad Versace --- src/egl/drivers/dri2/egl_dri2.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 480268f349a..ffef3bfff4f 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -648,6 +648,8 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, struct dri2_egl_context *dri2_ctx; struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_context *dri2_ctx_shared = dri2_egl_context(share_list); + __DRIcontext *shared = + dri2_ctx_shared ? dri2_ctx_shared->dri_context : NULL; struct dri2_egl_config *dri2_config = dri2_egl_config(conf); const __DRIconfig *dri_config; int api; @@ -713,15 +715,13 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, dri2_dpy->dri2->createNewContextForAPI(dri2_dpy->dri_screen, api, dri_config, - dri2_ctx_shared ? - dri2_ctx_shared->dri_context : NULL, + shared, dri2_ctx); } else if (api == __DRI_API_OPENGL) { dri2_ctx->dri_context = dri2_dpy->dri2->createNewContext(dri2_dpy->dri_screen, dri_config, - dri2_ctx_shared ? - dri2_ctx_shared->dri_context : NULL, + shared, dri2_ctx); } else { /* fail */ @@ -732,8 +732,7 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, dri2_dpy->swrast->createNewContextForAPI(dri2_dpy->dri_screen, api, dri_config, - dri2_ctx_shared ? - dri2_ctx_shared->dri_context : NULL, + shared, dri2_ctx); } -- 2.30.2