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/state_tracker/st_cb_drawpixels.c | |
| 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/state_tracker/st_cb_drawpixels.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 390c51869..74e87f0e4 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -494,7 +494,6 @@ make_texture(struct st_context *st, { struct pipe_transfer *transfer; - static const GLuint dstImageOffsets = 0; GLboolean success; GLubyte *dest; const GLbitfield imageTransferStateSave = ctx->_ImageTransferState; @@ -517,10 +516,9 @@ make_texture(struct st_context *st, success = _mesa_texstore(ctx, 2, /* dims */ baseInternalFormat, /* baseInternalFormat */ mformat, /* gl_format */ - dest, /* dest */ 0, 0, 0, /* dstX/Y/Zoffset */ transfer->stride, /* dstRowStride, bytes */ - &dstImageOffsets, /* dstImageOffsets */ + &dest, /* destSlices */ width, height, 1, /* size */ format, type, /* src format/type */ pixels, /* data source */ |