svn merge ^/branches/released .

2 files changed, 0 insertions, 12 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
index e0a1cba2b..9b44d1a71 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -195,18 +195,8 @@ get_pixel_transfer_program(struct gl_context *ctx, const struct state_key *key)
          { STATE_INTERNAL, STATE_PT_SCALE, 0, 0, 0 };

       static const gl_state_index bias_state[STATE_LENGTH] =

          { STATE_INTERNAL, STATE_PT_BIAS, 0, 0, 0 };

-      GLfloat scale[4], bias[4];

       GLint scale_p, bias_p;

 

-      scale[0] = ctx->Pixel.RedScale;

-      scale[1] = ctx->Pixel.GreenScale;

-      scale[2] = ctx->Pixel.BlueScale;

-      scale[3] = ctx->Pixel.AlphaScale;

-      bias[0] = ctx->Pixel.RedBias;

-      bias[1] = ctx->Pixel.GreenBias;

-      bias[2] = ctx->Pixel.BlueBias;

-      bias[3] = ctx->Pixel.AlphaBias;

-

       scale_p = _mesa_add_state_reference(params, scale_state);

       bias_p = _mesa_add_state_reference(params, bias_state);

 

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)