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, 20 insertions, 1 deletions

diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index 6a0e248a9..0faa334f4 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -479,7 +479,26 @@ struct dd_function_table {
    /** 

     * Called to free tImage->Data.

     */

-   void (*FreeTexImageData)( struct gl_context *ctx, struct gl_texture_image *tImage );

+   void (*FreeTextureImageBuffer)( struct gl_context *ctx, struct gl_texture_image *tImage );

+

+   /** Map a slice of a texture image into user space.

+    * \param texImage  the texture image

+    * \param slice  the 3D image slice or array texture slice

+    * \param x, y, w, h  region of interest

+    * \param mode  bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT

+    * \param mapOut  returns start of mapping of region of interest

+    * \param rowStrideOut  returns row stride (in bytes)

+    */

+   void (*MapTextureImage)(struct gl_context *ctx,

+			   struct gl_texture_image *texImage,

+			   GLuint slice,

+			   GLuint x, GLuint y, GLuint w, GLuint h,

+			   GLbitfield mode,

+			   GLubyte **mapOut, GLint *rowStrideOut);

+

+   void (*UnmapTextureImage)(struct gl_context *ctx,

+			     struct gl_texture_image *texImage,

+			     GLuint slice);

 

    /** Map texture image data into user space */

    void (*MapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );