diff options
| author | Roland Scheidegger <rscheidegger@gmx.ch> | 2005-10-13 14:30:20 +0000 |
|---|---|---|
| committer | Roland Scheidegger <rscheidegger@gmx.ch> | 2005-10-13 14:30:20 +0000 |
| commit | 30daa7529331057ecb470efb500152e9c4aa1ae5 (patch) | |
| tree | 40faf1f7190d9d06b046f4706601a5659a1ad32c /src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c | |
| parent | ed2f8635f006886a16da07c77bcab8094229042c (diff) | |
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.)
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c b/src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c index d1cf1979f1..529e79065e 100644 --- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c +++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c @@ -351,6 +351,7 @@ struct dynfn *radeon_makeX86TexCoord2f( GLcontext *ctx, int key ) __FUNCTION__, rmesa->vb.texcoordptr[0] ); } +#if 0 /* Temporarily disabled - probably needs adjustments for more than 2 tex units -rs */ struct dynfn *radeon_makeX86MultiTexCoord2fvARB( GLcontext *ctx, int key ) { struct dynfn *dfn = MALLOC_STRUCT( dynfn ); @@ -395,7 +396,7 @@ struct dynfn *radeon_makeX86MultiTexCoord2fARB( GLcontext *ctx, } return dfn; } - +#endif void radeonInitX86Codegen( struct dfn_generators *gen ) { @@ -407,8 +408,10 @@ void radeonInitX86Codegen( struct dfn_generators *gen ) gen->Normal3fv = radeon_makeX86Normal3fv; gen->TexCoord2f = radeon_makeX86TexCoord2f; gen->TexCoord2fv = radeon_makeX86TexCoord2fv; +#if 0 /* Temporarily disabled - probably needs adjustments for more than 2 tex units -rs */ gen->MultiTexCoord2fARB = radeon_makeX86MultiTexCoord2fARB; gen->MultiTexCoord2fvARB = radeon_makeX86MultiTexCoord2fvARB; +#endif gen->Color3f = radeon_makeX86Color3f; gen->Color3fv = radeon_makeX86Color3fv; |