diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
| commit | 543c5ecf97b067fe5e0824f996c227e30ee693b0 (patch) | |
| tree | 7207e6216bd20423b473153e10d1975ca17700fd /mesalib/src/mesa/main/texstore.h | |
| parent | a411d3abb8352c0f65fd4f045d825c0b023dadf4 (diff) | |
| parent | b520df571e0a319eae5231d09f36b98f28b8914a (diff) | |
| download | vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.gz vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.bz2 vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texstore.h')
| -rw-r--r-- | mesalib/src/mesa/main/texstore.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/texstore.h b/mesalib/src/mesa/main/texstore.h index 24a254ac4..f956b0436 100644 --- a/mesalib/src/mesa/main/texstore.h +++ b/mesalib/src/mesa/main/texstore.h @@ -45,10 +45,9 @@ * \param dims either 1 or 2 or 3 * \param baseInternalFormat user-specified base internal format * \param dstFormat destination Mesa texture format - * \param dstAddr destination image address * \param dstX/Y/Zoffset destination x/y/z offset (ala TexSubImage), in texels * \param dstRowStride destination image row stride, in bytes - * \param dstImageOffsets offset of each 2D slice within 3D texture, in texels + * \param dstSlices array of addresses of image slices (for 3D, array texture) * \param srcWidth/Height/Depth source image size, in pixels * \param srcFormat incoming image format * \param srcType incoming image data type @@ -59,9 +58,9 @@ struct gl_context *ctx, GLuint dims, \ GLenum baseInternalFormat, \ gl_format dstFormat, \ - GLvoid *dstAddr, \ GLint dstXoffset, GLint dstYoffset, GLint dstZoffset, \ - GLint dstRowStride, const GLuint *dstImageOffsets, \ + GLint dstRowStride, \ + GLubyte **dstSlices, \ GLint srcWidth, GLint srcHeight, GLint srcDepth, \ GLenum srcFormat, GLenum srcType, \ const GLvoid *srcAddr, \ |