diff options
| author | Roland Scheidegger <rscheidegger@gmx.ch> | 2005-10-15 23:45:53 +0000 |
|---|---|---|
| committer | Roland Scheidegger <rscheidegger@gmx.ch> | 2005-10-15 23:45:53 +0000 |
| commit | 247f3b3e81fffa86c50531070fab573e26ffb452 (patch) | |
| tree | 7656b736e6faf1b4d31722752c0634927f23c17c /src/mesa/drivers/dri/radeon/radeon_maos_arrays.c | |
| parent | ccf13781319b5b9d7ba306728f74b4ae2d099ad0 (diff) | |
enable cube maps on radeon (#2241 on bugzilla). No vtxfmt code yet (just generates vfmt fallback). Code by Andreas Stenglein, some small adjustments by me.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_maos_arrays.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_maos_arrays.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c index 1602464011..76ad1f3cd4 100644 --- a/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c +++ b/src/mesa/drivers/dri/radeon/radeon_maos_arrays.c @@ -542,13 +542,13 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs ) /* assume we need the 3rd coord if texgen is active for r/q OR at least 3 coords are submitted. This may not be 100% correct */ if (VB->TexCoordPtr[unit]->size >= 3) { - /* tcl_vtx and vc_frmt values are identical */ vtx |= RADEON_Q_BIT(unit); vfmt |= RADEON_Q_BIT(unit); } if ( (ctx->Texture.Unit[unit].TexGenEnabled & (R_BIT | Q_BIT)) ) vtx |= RADEON_Q_BIT(unit); - else if (VB->TexCoordPtr[unit]->size >= 3) { + else if ((VB->TexCoordPtr[unit]->size >= 3) && + ((ctx->Texture.Unit[unit]._ReallyEnabled & (TEXTURE_CUBE_BIT)) == 0)) { GLuint swaptexmatcol = (VB->TexCoordPtr[unit]->size - 3); if (((rmesa->NeedTexMatrix >> unit) & 1) && (swaptexmatcol != ((rmesa->TexMatColSwap >> unit) & 1))) |