Module: Mesa Branch: master Commit: b44c52870dc2eec9a41e984d4dceca22ea83d334 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b44c52870dc2eec9a41e984d4dceca22ea83d334
Author: Xavier Chantry <[email protected]> Date: Sun May 2 23:25:43 2010 +0200 Update drisw state tracker to use new API aware context create Even though swrast defines its own __DriverAPIRec it still shares the driCreateNewContext() implementation from dri_util.c. So the CreateContext prototypes have to match in the two __DriverAPIRecs. Reviewed-by: Jakob Bornecrantz <[email protected]> Signed-off-by: Xavier Chantry <[email protected]> --- src/mesa/drivers/dri/common/drisw_util.c | 3 ++- src/mesa/drivers/dri/common/drisw_util.h | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/common/drisw_util.c b/src/mesa/drivers/dri/common/drisw_util.c index 8d08b93..1529c23 100644 --- a/src/mesa/drivers/dri/common/drisw_util.c +++ b/src/mesa/drivers/dri/common/drisw_util.c @@ -112,7 +112,8 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config, pcp->driDrawablePriv = NULL; pcp->driReadablePriv = NULL; - if (!driDriverAPI.CreateContext(&config->modes, pcp, shareCtx)) { + if (!driDriverAPI.CreateContext(API_OPENGL, + &config->modes, pcp, shareCtx)) { FREE(pcp); return NULL; } diff --git a/src/mesa/drivers/dri/common/drisw_util.h b/src/mesa/drivers/dri/common/drisw_util.h index 08d5a11..2b54b22 100644 --- a/src/mesa/drivers/dri/common/drisw_util.h +++ b/src/mesa/drivers/dri/common/drisw_util.h @@ -36,6 +36,8 @@ #ifndef _DRISW_UTIL_H #define _DRISW_UTIL_H +#include "mtypes.h" + #include <GL/gl.h> #include <GL/internal/glcore.h> #include <GL/internal/dri_interface.h> @@ -57,7 +59,8 @@ struct __DriverAPIRec { void (*DestroyScreen)(__DRIscreen *driScrnPriv); - GLboolean (*CreateContext)(const __GLcontextModes *glVis, + GLboolean (*CreateContext)(gl_api glapi, + const __GLcontextModes *glVis, __DRIcontext *driContextPriv, void *sharedContextPrivate); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
