From: F. <j_r...@ya...> - 2002-02-27 01:43:50
|
On 2002.02.27 01:23 Leif Delgass wrote: > On Tue, 26 Feb 2002, José Fonseca wrote: > > > It's done. At least, the trivial changes are made. There is still > problems > > in the DDX due to changes in the XFree 4.2.0 tree, and in the Mesa 3D > > driver. > > I thought there were only mininal changes to the mach64 (ati) DDX driver > 4.2.0. I didn't run into many conflicts when I merged 4.2.0. What sort > of problems are you seeing? The Mesa driver will have many more changes I though it was changes in the XFree 4.2.0, but it was just my incompetence... This was fixed on my last commit. > of course. I'm trying to track down the cause of the segfaults I'm > getting with glean, which I think may be a problem in the mach64 Mesa > driver. One thing I noticed already about Mesa 4 is that the vertex > buffer > / rasterization setup template in [driver]vb.c is quite different. I'm > hoping this isn't a problem since I had to premultiply texture > coordinates > with the homogenous coordinate to get multitexture working, and this > might > not work with the new template. > Tomorrow I'll start looking a that (it's 2am here). The first thing we need to hack is the different context structures, and then propagate the changes into the code. > [snip] > > > > OK, so you have to do 'cvs add' on all the new dirs/files before > checking > > > in, right? > > > > > > > It wasn't necessary because I updated directly from the > > mach64-0-0-2-branch. Like: > > > > cvs update -j mach64-0-0-2-branch .... > > I see, so you're merging changes on the mach64 branch from the > branchpoint > into the trunk code rather than vice versa. That gives you a much > smaller > changeset and fewer conflicts. Looking at the web cvs it looks like > Manuel did the same thing when he created the mach64-0-0-2-branch. Of > course if I had bothered to reread the cvs policies page... > I have to thank to Alan Hourihane for his tips, advices and reference to the cvs policies page (which I had never noticed its existence before). I surely wouldn't have done it properly without his help. > -- > Leif Delgass > http://www.retinalburn.net > > Regards, José Fonseca _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com |