enable 3rd texture unit on radeon (default still 2 enabled units). Disable some multitexcoord codegen stuff noone understands to make it work. Replace most code testing explicitly for unit 0 and 1 with loops instead of adding test for unit 2, smaller/more readable code at the cost of maybe some slight performance hit. (Code provided by Andreas Stenglein, some adjustments by me.)

1 files changed, 4 insertions, 0 deletions

diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt_sse.c b/src/mesa/drivers/dri/radeon/radeon_vtxfmt_sse.c
index cb5d840116..0f0fc9e065 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt_sse.c
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt_sse.c
@@ -170,6 +170,7 @@ static struct dynfn *radeon_makeSSETexCoord2f( GLcontext *ctx, int key )
 				     __FUNCTION__, rmesa->vb.texcoordptr[0] );
 }
 
+#if 0 /* Temporarily disabled - probably needs adjustments for more than 2 tex units -rs */
 static struct dynfn *radeon_makeSSEMultiTexCoord2fv( GLcontext *ctx, int key )
 {
    struct dynfn *dfn = MALLOC_STRUCT( dynfn );
@@ -207,6 +208,7 @@ static struct dynfn *radeon_makeSSEMultiTexCoord2f( GLcontext *ctx, int key )
    }
    return dfn;
 }
+#endif
 
 void radeonInitSSECodegen( struct dfn_generators *gen )
 {
@@ -217,8 +219,10 @@ void radeonInitSSECodegen( struct dfn_generators *gen )
       gen->Color3f = (void *) radeon_makeSSEColor3f;
       gen->TexCoord2fv = (void *) radeon_makeSSETexCoord2fv;
       gen->TexCoord2f = (void *) radeon_makeSSETexCoord2f;
+#if 0 /* Temporarily disabled - probably needs adjustments for more than 2 tex units -rs */
       gen->MultiTexCoord2fvARB = (void *) radeon_makeSSEMultiTexCoord2fv;
       gen->MultiTexCoord2fARB = (void *) radeon_makeSSEMultiTexCoord2f;
+#endif
    }
 }