diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2009-12-02 14:52:51 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-12-02 14:52:51 +0100 |
| commit | 0c75854cc1650dc870e042aa66a053e70b3d4556 (patch) | |
| tree | 72eb2c040bd10b6210bdc7f2b25df5e8c405095f /src/mesa/drivers/dri/r200/r200_context.c | |
| parent | 4598942b1b88a2a7d5af7febae7e79eedf00e385 (diff) | |
| parent | 2b5618fc5bdcbee3434f8b5aa3a31eb06fb479c0 (diff) | |
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index e3ae839235..5f985d624d 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -325,9 +325,9 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual, _mesa_init_driver_functions(&functions); r200InitDriverFuncs(&functions); r200InitIoctlFuncs(&functions); - r200InitStateFuncs(&functions, screen->kernel_mm); + r200InitStateFuncs(&functions); r200InitTextureFuncs(&functions); - r200InitShaderFuncs(&functions); + r200InitShaderFuncs(&functions); radeonInitQueryObjFunctions(&functions); if (!radeonInitContext(&rmesa->radeon, &functions, |