On Sat, 2004-01-31 at 22:34, Roland Scheidegger wrote:
> > 
> >>now that the lighting bugs are finally mostly gone, I've just gone ahead 
> >>and changed the lighting code a bit more... (patch against cvs, without 
> >>the earlier colormat fix).

Good work! This fixes neverball and neverputt here, and improves
trackballs a lot (in foggy levels, the ground used to be mostly
invisible; now it's visible, but white (the fog colour) instead of the
correct colour about half the time).


> [...] some whitespace trouble, should be fixed with this patch. It 
> has also some initialization ugliness fixed, and there is some new code 
> (but it's outcommented as I can't test it right now and I'm not sure if 
> it's needed or if will just lock up the chip...) which might fix some 
> shininess trouble [...]

Any news on that?


> @@ -2130,29 +2177,10 @@
>     r200VtxfmtInvalidate( ctx );
>  }
>  
> -/* A hack.  The r200 can actually cope just fine with materials
> - * between begin/ends, so fix this.
> - */
> -static GLboolean check_material( GLcontext *ctx )
> -{
> -   TNLcontext *tnl = TNL_CONTEXT(ctx);
> -   GLint i;
> -
> -   for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT; 
> -     i < _TNL_ATTRIB_MAT_BACK_INDEXES; 
> -     i++)
> -      if (tnl->vb.AttribPtr[i] &&
> -       tnl->vb.AttribPtr[i]->stride)
> -      return GL_TRUE;
> -
> -   return GL_FALSE;
> -}
> -      
>  
>  static void r200WrapRunPipeline( GLcontext *ctx )
>  {
>     r200ContextPtr rmesa = R200_CONTEXT(ctx);
> -   GLboolean has_material;
>  
>     if (0)
>        fprintf(stderr, "%s, newstate: %x\n", __FUNCTION__, rmesa->NewGLState);
> @@ -2162,19 +2190,11 @@
>     if (rmesa->NewGLState)
>        r200ValidateState( ctx );
>  
> -   has_material = (ctx->Light.Enabled && check_material( ctx ));
> -
> -   if (has_material) {
> -      TCL_FALLBACK( ctx, R200_TCL_FALLBACK_MATERIAL, GL_TRUE );
> -   }
>  
>     /* Run the pipeline.
>      */ 
>     _tnl_run_pipeline( ctx );
>  
> -   if (has_material) {
> -      TCL_FALLBACK( ctx, R200_TCL_FALLBACK_MATERIAL, GL_FALSE );
> -   }
>  }
>  
> 

Reverting this part (which you suspect causes a viewperf segfault,
right?) returns trackballs to the old, very broken behaviour, so there
seems to be some good to it after all. :)


About keeping track of your patches: I wonder what others think about
giving you write access?


-- 
Earthling Michel DÃnzer      |     Debian (powerpc), X and DRI developer
Libre software enthusiast    |   http://svcs.affero.net/rm.php?r=daenzer



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
--
_______________________________________________
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to