diff options
author | marha <marha@users.sourceforge.net> | 2011-05-02 06:49:56 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-05-02 06:49:56 +0000 |
commit | e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61 (patch) | |
tree | 115901d752ba4f277ef82564bad209082f1feb2e /mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | |
parent | e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (diff) | |
parent | 34f1ddbb272a5ad55f56d54e2f861da6360db04f (diff) | |
download | vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.tar.gz vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.tar.bz2 vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.zip |
svn merge ^/branches/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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 9cc40c3d9..c568db2bc 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -419,7 +419,6 @@ make_texture(struct st_context *st, gl_format mformat;
struct pipe_resource *pt;
enum pipe_format pipeFormat;
- GLuint cpp;
GLenum baseFormat, intFormat;
baseFormat = base_format(format);
@@ -431,7 +430,6 @@ make_texture(struct st_context *st, pipeFormat = st_mesa_format_to_pipe_format(mformat);
assert(pipeFormat);
- cpp = util_format_get_blocksize(pipeFormat);
pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
if (!pixels)
|