diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-30 08:04:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-30 08:08:15 +0200 |
| commit | 82ce0534a7bc89f1ed93b4b952b30ceb3d94210d (patch) | |
| tree | a2b73894a436b1158cf0e8e2f2ea946478529d12 /mesalib/src/mesa/drivers | |
| parent | 01df5d59e56a1b060568f8cad2e89f7eea22fc70 (diff) | |
| download | vcxsrv-82ce0534a7bc89f1ed93b4b952b30ceb3d94210d.tar.gz vcxsrv-82ce0534a7bc89f1ed93b4b952b30ceb3d94210d.tar.bz2 vcxsrv-82ce0534a7bc89f1ed93b4b952b30ceb3d94210d.zip | |
mesa git update 30 aug 2011
Diffstat (limited to 'mesalib/src/mesa/drivers')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/driverfuncs.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/texmem.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c index a6174ee2f..78caa0542 100644 --- a/mesalib/src/mesa/drivers/common/driverfuncs.c +++ b/mesalib/src/mesa/drivers/common/driverfuncs.c @@ -111,7 +111,9 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->NewTextureObject = _mesa_new_texture_object; driver->DeleteTexture = _mesa_delete_texture_object; driver->NewTextureImage = _mesa_new_texture_image; - driver->FreeTexImageData = _mesa_free_texture_image_data; + driver->FreeTextureImageBuffer = _mesa_free_texture_image_data; + driver->MapTextureImage = _swrast_map_teximage; + driver->UnmapTextureImage = _swrast_unmap_teximage; driver->MapTexture = NULL; driver->UnmapTexture = NULL; driver->TextureMemCpy = memcpy; diff --git a/mesalib/src/mesa/drivers/dri/common/texmem.c b/mesalib/src/mesa/drivers/dri/common/texmem.c index e927cf0ad..798ef1ee8 100644 --- a/mesalib/src/mesa/drivers/dri/common/texmem.c +++ b/mesalib/src/mesa/drivers/dri/common/texmem.c @@ -1310,7 +1310,6 @@ gl_format _dri_texformat_argb4444 = MESA_FORMAT_NONE; gl_format _dri_texformat_argb1555 = MESA_FORMAT_NONE; gl_format _dri_texformat_al88 = MESA_FORMAT_NONE; gl_format _dri_texformat_a8 = MESA_FORMAT_A8; -gl_format _dri_texformat_ci8 = MESA_FORMAT_CI8; gl_format _dri_texformat_i8 = MESA_FORMAT_I8; gl_format _dri_texformat_l8 = MESA_FORMAT_L8; /*@}*/ |