diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-06 19:47:46 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2012-01-06 19:47:46 +0100 |
| commit | 2d52fd67e716caae85bce150b01bc5c284b12de7 (patch) | |
| tree | 2a641392a6affe99603cbaf169c1ab5173879d27 /mesalib/src/mesa/main/texgetimage.c | |
| parent | d515b895dc5151d102f33b577cafbf63473bbafa (diff) | |
| parent | 7e9f4ea970e8f7008c212d7d3918a974eb0066da (diff) | |
| download | vcxsrv-2d52fd67e716caae85bce150b01bc5c284b12de7.tar.gz vcxsrv-2d52fd67e716caae85bce150b01bc5c284b12de7.tar.bz2 vcxsrv-2d52fd67e716caae85bce150b01bc5c284b12de7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/link_uniforms.cpp
mesalib/src/mesa/drivers/dri/common/drisw_util.c
Diffstat (limited to 'mesalib/src/mesa/main/texgetimage.c')
| -rw-r--r-- | mesalib/src/mesa/main/texgetimage.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index 738c18112..f848aa89d 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -603,10 +603,9 @@ _mesa_get_teximage(struct gl_context *ctx, * All error checking will have been done before this routine is called. */ void -_mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level, - GLvoid *img, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) +_mesa_get_compressed_teximage(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLvoid *img) { const GLuint row_stride = _mesa_format_row_stride(texImage->TexFormat, texImage->Width); @@ -981,8 +980,7 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, _mesa_lock_texture(ctx, texObj); { - ctx->Driver.GetCompressedTexImage(ctx, target, level, img, - texObj, texImage); + ctx->Driver.GetCompressedTexImage(ctx, texImage, img); } _mesa_unlock_texture(ctx, texObj); } |