Mesa (master): egl_dri2: Refactor dereference of dri2_ctx_shared
Ian Romanick
idr at kemper.freedesktop.org
Mon Aug 6 22:38:49 UTC 2012
Module: Mesa
Branch: master
Commit: cb77f5dd1f6658fca671454c9b5be9a23c3bf3e4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb77f5dd1f6658fca671454c9b5be9a23c3bf3e4
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Jul 18 14:37:28 2012 -0700
egl_dri2: Refactor dereference of dri2_ctx_shared
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Chad Versace <chad.versace at linux.intel.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..ffef3bf 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);
}
More information about the mesa-commit
mailing list