Actually 1 and 2 are correct for unit 0 and 1, since they are bitflags.  
However, this switch/case isn't needed at all here since the flags are
updated elsewhere.  The default was hit with a value of zero because
t->base.bound isn't actually set until after this (in update_tex_common in
r128_texstate.c -- the same place where the upload flags are set).

I committed a fix for this as well as a missing check for new texture 
state in r128RunPipeline (r128_tris.c).  Since is needed because of the 
removal of R128_NEW_TEXTURE from the rmesa->new_state flags.

There are still texture problems though, particularly with multitexture.  
Try multiarb.

On Thu, 5 Dec 2002, Alan Hourihane wrote:

> CVSROOT:      /cvsroot/dri
> Module name:  xc
> Repository:   xc/xc/lib/GL/mesa/src/drv/r128/
> Changes by:   alanh@sc8-pr-cvs1.      02/12/05 16:22:45
> 
> Log message:
>   texture units are 0 and 1, not 1 and 2.
>   Textures are still a bit funky yet....
> 
> Modified files:
>       xc/xc/lib/GL/mesa/src/drv/r128/:        Tag: texmem-0-0-1
>         r128_texmem.c r128_tris.c 
>   
>   Revision      Changes    Path
>   1.3.36.4      +3 -3      xc/xc/lib/GL/mesa/src/drv/r128/r128_texmem.c
>   1.20.10.3     +3 -0      xc/xc/lib/GL/mesa/src/drv/r128/r128_tris.c
> 
> 
> 
> -------------------------------------------------------
> This sf.net email is sponsored by:ThinkGeek
> Welcome to geek heaven.
> http://thinkgeek.com/sf
> _______________________________________________
> Dri-patches mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/dri-patches
> 

-- 
Leif Delgass 
http://www.retinalburn.net





-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to