From 11f763f5057490477a2771febe8923682f6a5ada Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Wed, 5 Oct 2005 12:38:07 +0000 Subject: [PATCH] remove unneeded parameter from radeonUploadTexMatrix. --- src/mesa/drivers/dri/radeon/radeon_maos_arrays.c | 4 ++-- src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 4 ++-- src/mesa/drivers/dri/radeon/radeon_state.c | 5 +++-- src/mesa/drivers/dri/radeon/radeon_state.h | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c index b5c6f12248c..b2cd90c8693 100644 --- 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 f3221e60d8f..ac82a33732b 100644 --- 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 d99a2f4c203..4a8dea39716 100644 --- 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 a1afa500076..ad7db3b677b 100644 --- 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 ); -- 2.30.2