r600: warning fixes

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index c083862f369721a52faeed7a4694f0b93fda4c86..994463fa6d20165570e082a57ae535b02609c851 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -249,7 +249,6 @@ void r700SetupVTXConstants(GLcontext  * ctx,
                           unsigned int count)     /* number of vectors in stream */
 {
     context_t *context = R700_CONTEXT(ctx);
-    uint32_t *dest;
     struct radeon_aos * paos = (struct radeon_aos *)pAos;
     offset_modifiers offset_mod = {NO_SHIFT, 0, 0xFFFFFFFF};
 
@@ -417,7 +416,7 @@ GLboolean r700SendContextStates(context_t *context)
     return GL_TRUE;
 }
 
-GLboolean r700SendDepthTargetState(context_t *context, int id)
+GLboolean r700SendDepthTargetState(context_t *context)
 {
        R700_CHIP_CONTEXT *r700 = R700_CONTEXT_STATES(context);
        struct radeon_renderbuffer *rrb;
@@ -540,7 +539,6 @@ GLboolean r700SendRenderTargetState(context_t *context, int id)
 GLboolean r700SendPSState(context_t *context)
 {
        R700_CHIP_CONTEXT *r700 = R700_CONTEXT_STATES(context);
-       struct radeon_renderbuffer *rrb;
        struct radeon_bo * pbo;
        offset_modifiers offset_mod;
        BATCH_LOCALS(&context->radeon);
@@ -575,7 +573,6 @@ GLboolean r700SendPSState(context_t *context)
 GLboolean r700SendVSState(context_t *context)
 {
        R700_CHIP_CONTEXT *r700 = R700_CONTEXT_STATES(context);
-       struct radeon_renderbuffer *rrb;
        struct radeon_bo * pbo;
        offset_modifiers offset_mod;
        BATCH_LOCALS(&context->radeon);
@@ -609,7 +606,6 @@ GLboolean r700SendVSState(context_t *context)
 GLboolean r700SendFSState(context_t *context)
 {
        R700_CHIP_CONTEXT *r700 = R700_CONTEXT_STATES(context);
-       struct radeon_renderbuffer *rrb;
        struct radeon_bo * pbo;
        offset_modifiers offset_mod;
        BATCH_LOCALS(&context->radeon);
@@ -652,8 +648,6 @@ GLboolean r700SendFSState(context_t *context)
 GLboolean r700SendViewportState(context_t *context, int id)
 {
        R700_CHIP_CONTEXT *r700 = R700_CONTEXT_STATES(context);
-       struct radeon_renderbuffer *rrb;
-       offset_modifiers offset_mod;
        BATCH_LOCALS(&context->radeon);
 
        if (id > R700_MAX_VIEWPORTS)

diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
index a2e0ac338a4b86c2af0a7af299847b88d8ea82f3..8048069619558bc6b1ce6f42c227cbf28b020fd7 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_render.c
+++ b/src/mesa/drivers/dri/r600/r700_render.c
@@ -282,7 +282,6 @@ unsigned int r700PrimitiveType(int prim)
 void r700RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim)
 {
        context_t *context = R700_CONTEXT(ctx);
-       R700_CHIP_CONTEXT *r700 = (R700_CHIP_CONTEXT*)(&context->hw);
        BATCH_LOCALS(&context->radeon);
        int type, i, total_emit;
        int num_indices = end - start;
@@ -339,7 +338,6 @@ static GLboolean r700RunRender(GLcontext * ctx,
                                           struct tnl_pipeline_stage *stage)
 {
     context_t *context = R700_CONTEXT(ctx);
-    int lastIndex = 0;
     unsigned int i;
     TNLcontext *tnl = TNL_CONTEXT(ctx);
     struct vertex_buffer *vb = &tnl->vb;