diff options
| author | Roland Scheidegger <rscheidegger@gmx.ch> | 2005-09-26 17:11:16 +0000 |
|---|---|---|
| committer | Roland Scheidegger <rscheidegger@gmx.ch> | 2005-09-26 17:11:16 +0000 |
| commit | 84c9e671edcc1358307879491bddef9f7d96f14b (patch) | |
| tree | cfcad5352fa888713088f8dafc5e35355ad4e82e /src/mesa/drivers/dri/radeon/radeon_state.c | |
| parent | ad271b8c98021dc82c0714d768a6642aee10794f (diff) | |
fix projective texturing for (swtcl) texture rectangles. Fix wrong argument order for texgen/texmat matrix multiplication.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index c9ad1c84b0..3c7767768b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -2073,11 +2073,11 @@ static void update_texturematrix( GLcontext *ctx ) /* Need to preconcatenate any active texgen * obj/eyeplane matrices: */ - _math_matrix_mul_matrix( &rmesa->tmpmat, - &rmesa->TexGenMatrix[unit], - ctx->TextureMatrixStack[unit].Top ); + _math_matrix_mul_matrix( &rmesa->tmpmat, + ctx->TextureMatrixStack[unit].Top, + &rmesa->TexGenMatrix[unit] ); upload_matrix( rmesa, rmesa->tmpmat.m, TEXMAT_0+unit ); - } + } else { rmesa->TexMatEnabled |= (RADEON_TEXGEN_INPUT_TEXCOORD_0+unit) << inputshift; |