Warning clean-ups.

diff --git a/src/mesa/drivers/dri/i830/i830_debug.c b/src/mesa/drivers/dri/i830/i830_debug.c
index 56940e223cf030977ee532f176b5309c0e61a8a7..84f3216dc045ca72ba367f985b513dafa51b35e4 100644 (file)
--- a/src/mesa/drivers/dri/i830/i830_debug.c
+++ b/src/mesa/drivers/dri/i830/i830_debug.c
@@ -325,15 +325,15 @@ void i830EmitHwStateLockedDebug( i830ContextPtr imesa )
         switch( i ) {
         case 0:
         case 1:
-           TexState = & imesa->sarea->TexState[i];
+           TexState = imesa->sarea->TexState[i];
            break;
 
         case 2:
-           TexState = & imesa->sarea->TexState2;
+           TexState = imesa->sarea->TexState2;
            break;
 
         case 3:
-           TexState = & imesa->sarea->TexState3;
+           TexState = imesa->sarea->TexState3;
            break;
         }
 

diff --git a/src/mesa/drivers/dri/i830/i830_state.c b/src/mesa/drivers/dri/i830/i830_state.c
index 9bd97379cac2312514549528e14d14ab5989400e..8bfe392682b788fac12c06341d750064df0903bc 100644 (file)
--- a/src/mesa/drivers/dri/i830/i830_state.c
+++ b/src/mesa/drivers/dri/i830/i830_state.c
@@ -1410,7 +1410,7 @@ void i830DDInitState( GLcontext *ctx )
 {
    i830ContextPtr imesa = I830_CONTEXT(ctx);   
    i830ScreenPrivate *i830Screen = imesa->i830Screen;
-   int i, j;
+   int i;
 
    imesa->clear_red = 0;
    imesa->clear_green = 0;