Re: [Dri-devel] Re: Patch: mach64 hw cursor bugfix

[Leif D. <lde...@re...>]

On 6 Feb 2002, Jose Fonseca wrote:

> Leif,
>=20
> On Wed, 2002-02-06 at 10:20, Jos=E9 Fonseca wrote:

[snip]

> I also have 4.2.0 installed and my mach64 tree works fine with it so,
> unless there is an immediate advantage in updating (like improvements i=
n
> mesa), I think is better to wait a little more for Frank.

I agree, esp.  if you're not having problems running against 4.2.0 with=20
the current branch.

> Anyway, I would like to know how one merges the trunk with a branch.
> Could you briefly tell me the steps required?

I have the branch checked out (so sticky tag is set), so to merge, I did=20
this:

cvs update -kk -dP -j HEAD > 2002-02-05-merge 2>&1 & tail -f=20
2002-02-05-merge

"-j HEAD" means to merge (join) changes from the specified tag, in this=20
case changes on the trunk since the branchpoint.  I saved the output to a=
=20
logfile so I could check to see where conflicts were reported (you can=20
also rgrep for "<<<<<<<").  Then you need to manually merge any conflicts=
=20
(I think I found 10 or fewer files with conflicts).  Each file that has=20
changes or conflicts will generate a dotfile (.#filename.revision) with=20
the original that you can remove when you're done.

> In the meanwhile I'm still going to see what can be done with the
> current tree as it is (more bugfixes, features,...).
>

Some things on my bug list (Mesa driver):

1. glLines doesn't work
2. GL_DECAL, GL_BLEND, GL_REPLACE texture modes not working (GL_MODULATE=20
seems to work).

I haven't looked at the Mesa driver in a lot of depth yet, but it seems=20
that lines could be hacked to use triangles.  I also remember there being=
=20
a lot of code in the driver disabled with #ifdef 0, so maybe I'll try=20
looking at some of those sections.
=20
> Regards,
>=20
> Jose Fonseca
>=20
> PS: You have a very nice and interesting homepage! Makes one wanting to
> go in a world trip too..!

Thanks!  As for the trip, round-the-world plane tickets are a great deal,=
=20
you should check into it if you're thinking about a long trip.

> I'm also adding a link in the FAQ to your mach64 section.

OK.  I'll try to keep it up to date, at least until the DRI site has an=20
updated compilation guide and status for mach64. :)

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