remove unneeded parameter from radeonUploadTexMatrix.

diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c
index b5c6f12248c6fd3654f40a6e16a9f7a450699d93..b2cd90c869332291a9c677ff5190b49bd29ce3c2 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c
@@ -550,7 +550,7 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
         GLuint swaptexmatcol = (VB->TexCoordPtr[0]->size - 3);
         if ((rmesa->NeedTexMatrix & 1) &&
                (swaptexmatcol != (rmesa->TexMatColSwap & 1)))
-           radeonUploadTexMatrix( rmesa, rmesa->tmpmat[0].m, 0, swaptexmatcol ) ;
+           radeonUploadTexMatrix( rmesa, 0, swaptexmatcol ) ;
       }
       component[nr++] = &rmesa->tcl.tex[0];
    }
@@ -575,7 +575,7 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
         GLuint swaptexmatcol = (VB->TexCoordPtr[1]->size - 3);
         if (((rmesa->NeedTexMatrix >> 1) & 1) &&
                (swaptexmatcol != ((rmesa->TexMatColSwap >> 1) & 1)))
-           radeonUploadTexMatrix( rmesa, rmesa->tmpmat[1].m, 1, swaptexmatcol ) ;
+           radeonUploadTexMatrix( rmesa, 1, swaptexmatcol ) ;
       }
       component[nr++] = &rmesa->tcl.tex[1];
    }

diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
index f3221e60d8fb7984e7dae2c2b27f8f044d95caf7..ac82a33732b2d59feee9924c5f626be0fc7411b2 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
@@ -277,7 +277,7 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
         GLuint swaptexmatcol = (VB->TexCoordPtr[0]->size - 3);
         if ((rmesa->NeedTexMatrix & 1) &&
                (swaptexmatcol != (rmesa->TexMatColSwap & 1)))
-           radeonUploadTexMatrix( rmesa, rmesa->tmpmat[0].m, 0, swaptexmatcol ) ;
+           radeonUploadTexMatrix( rmesa, 0, swaptexmatcol ) ;
       }
    }
 
@@ -295,7 +295,7 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
         GLuint swaptexmatcol = (VB->TexCoordPtr[1]->size - 3);
         if (((rmesa->NeedTexMatrix >> 1) & 1) &&
                (swaptexmatcol != ((rmesa->TexMatColSwap >> 1) & 1)))
-           radeonUploadTexMatrix( rmesa, rmesa->tmpmat[1].m, 1, swaptexmatcol ) ;
+           radeonUploadTexMatrix( rmesa, 1, swaptexmatcol ) ;
       }
    }
 

diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index d99a2f4c203ad8fb27aec1212e958a5d8dc2cba0..4a8dea39716bd5465c03b75884c05f7fc6185b1a 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -2045,7 +2045,7 @@ static void texmat_fixup_texrect( radeonContextPtr rmesa,
    }}
 
 
-void radeonUploadTexMatrix( radeonContextPtr rmesa, GLfloat *src,
+void radeonUploadTexMatrix( radeonContextPtr rmesa,
                            int unit, GLboolean swapcols )
 {
 /* Here's how this works: on r100, only 3 tex coords can be submitted, so the
@@ -2072,6 +2072,7 @@ void radeonUploadTexMatrix( radeonContextPtr rmesa, GLfloat *src,
    float *dest = ((float *)RADEON_DB_STATE( mat[idx] )) + MAT_ELT_0;
    int i;
    struct gl_texture_unit tUnit = rmesa->glCtx->Texture.Unit[unit];
+   GLfloat *src = rmesa->tmpmat[unit].m;
 
    rmesa->TexMatColSwap &= ~(1 << unit);
    if ((tUnit._ReallyEnabled & (TEXTURE_3D_BIT | TEXTURE_CUBE_BIT)) == 0) {
@@ -2195,7 +2196,7 @@ static void update_texturematrix( GLcontext *ctx )
         }
         if (needMatrix) {
            rmesa->NeedTexMatrix |= 1 << unit;
-           radeonUploadTexMatrix( rmesa, rmesa->tmpmat[unit].m, unit,
+           radeonUploadTexMatrix( rmesa, unit,
                        !ctx->Texture.Unit[unit].TexGenEnabled );
         }
       }

diff --git a/src/mesa/drivers/dri/radeon/radeon_state.h b/src/mesa/drivers/dri/radeon/radeon_state.h
index a1afa500076c84df3b374281299a14f83a8b704c..ad7db3b677b7b48cbbedf9053a37928244959045 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_state.h
+++ b/src/mesa/drivers/dri/radeon/radeon_state.h
@@ -50,8 +50,8 @@ extern void radeonRecalcScissorRects( radeonContextPtr rmesa );
 extern void radeonUpdateViewportOffset( GLcontext *ctx );
 extern void radeonUpdateWindow( GLcontext *ctx );
 extern void radeonUpdateDrawBuffer( GLcontext *ctx );
-extern void radeonUploadTexMatrix( radeonContextPtr rmesa, GLfloat *src,
-                                      int unit, GLboolean swapcols );
+extern void radeonUploadTexMatrix( radeonContextPtr rmesa,
+                                  int unit, GLboolean swapcols );
 
 extern void radeonValidateState( GLcontext *ctx );