diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-05-04 15:58:29 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-05-04 15:58:29 +0200 |
| commit | 0ae2f59c0287f4baec6c7de5f2f0fdf736fba26d (patch) | |
| tree | ee14bf3e8bba80649541c4e13fc07c60baf6c248 /src/mesa/drivers/dri/tdfx | |
| parent | 7662e3519bef3802024da3050b886068281e02b1 (diff) | |
| parent | 1c920c61764b17fd9fb4a89d2db7355fbe1d7565 (diff) | |
Merge commit 'origin/master' into gallium-msaa
Diffstat (limited to 'src/mesa/drivers/dri/tdfx')
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_context.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c index edb1875f76..c30fcf3a6f 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_context.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c @@ -164,7 +164,8 @@ static const struct dri_debug_control debug_control[] = { NULL, 0 } }; -GLboolean tdfxCreateContext( const __GLcontextModes *mesaVis, +GLboolean tdfxCreateContext( gl_api api, + const __GLcontextModes *mesaVis, __DRIcontext *driContextPriv, void *sharedContextPrivate ) { diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.h b/src/mesa/drivers/dri/tdfx/tdfx_context.h index 6e25cac301..29b0876f9f 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_context.h +++ b/src/mesa/drivers/dri/tdfx/tdfx_context.h @@ -937,7 +937,8 @@ struct tdfx_context { extern GLboolean -tdfxCreateContext( const __GLcontextModes *mesaVis, +tdfxCreateContext( gl_api api, + const __GLcontextModes *mesaVis, __DRIcontext *driContextPriv, void *sharedContextPrivate ); |