Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/dri/common/texmem.c
	mesalib/src/mesa/main/context.c
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/debug.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/formats.h
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_texture.c

1 files changed, 3 insertions, 1 deletions

diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c
index fe8b6a269..7712ad780 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;