[Mesa-dev] [PATCH 3/5] egl_dri2: Refactor dereference of dri2_ctx_shared

[Kristian Høgsberg]

On Wed, Aug 01, 2012 at 05:21:36PM -0700, Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Cc: Kristian Høgsberg <krh at bitplanet.net>
> Cc: Matt Turner <mattst88 at gmail.com>
> ---
>  src/egl/drivers/dri2/egl_dri2.c |   11 +++++------
>  1 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 480268f..90956a1 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 *const shared =
> +      dri2_ctx_shared ? dri2_ctx_shared->dri_context : NULL;

It makes sense to do this once and up front, but the use const here is
a little out of place.  Nothing else here uses const like that, so I'd
rather stay consistent.

Other than that,

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

>     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);
>     }
>  
> -- 
> 1.7.6.5
>