diff options
| author | Xavier Chantry <chantry.xavier@gmail.com> | 2010-05-02 23:25:43 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-05-02 17:46:43 -0400 |
| commit | b44c52870dc2eec9a41e984d4dceca22ea83d334 (patch) | |
| tree | 64905e5efda33da8390f97ba112721ba58285cd8 /src | |
| parent | 6edb18ee35fb15c501d8ff786830ef49ccbf2952 (diff) | |
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 <jakob@vmware.com>
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/common/drisw_util.c | 3 | ||||
| -rw-r--r-- | 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 8d08b93bfb..1529c23b16 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 08d5a116e9..2b54b2281f 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); |