Re: [Dri-devel] Merge from trunk to texmem-0-0-1

[Ian R. <id...@us...>]

Ian Romanick wrote:
> Just to let you all know, I'm doing a merge from the trunk to the 
> texmem-0-0-1 branch.  I've tagged the branch with 
> texmem-0-0-1-20030123-trunk-premerge.  After the merge is done I will 
> tag it with texmem-0-0-1-20030123-trunk-merge.  I'll send a message to 
> the list as well.

The merge is finally done.  I actually finished it on Sunday.  The tag 
is texmem-0-0-1-20030125-trunk-merge.

Sometime this week I'm going to generate a patch of innocuous changes to 
merge from the branch to the trunk.  There are quite a few changes that 
are just changes to comments or printf statements.  A lot of these 
changes were made to make it easier to do diffs between the radeon and 
r200 drivers.  I'd like to merge them into the trunk now to make future 
trunk-to-branch merges less painful.

I'd also like to set some sort of a timeline to finish this up and merge 
everything into the trunk.  Now that a design for texmem-0-0-2 is 
starting to take shape, I'd like to see texmem-0-0-1 wind down.  There 
are two things that *need* to happen, and a third optional thing, to 
accomplish this.

1. I will send out my GLX work this week for discussion.  It will be 
sent as a patch to the texmem branch.  My plan is to send it out in two 
parts.  The first part will be the device independent work, and the 
other part will be the device dependent work (for radeon & mga).

2. We need to either finish up the r128 work or back-out all the 
changes.  I know a couple people were working on getting the driver 
working, but I haven't heard anything since before the new year.  I'm 
assuming that life has gotten in the way, and work on that driver has 
stopped.  Now would be a good time to speak up if you care about seeing 
this driver updated.  I don't have the hardware, or I would have done 
it.  Perhaps we can discuss this in  the #dri-devel meeting today.

3. I would still like to see one or both of the Intel chipset drivers 
updated.  Judging from the messages on the XFree86 list, I believe that 
a lot of users are going to be using either i830M or i845G/GL/GE based 
systems in the near future.  Porting the i830 driver to the texmem 
interface (and some of the other utility interfaces in the texmem 
branch) should make it easier to add support for some of that chips 
other features (cube maps, FXT1, etc.).

There are also a couple minor changes to the mga driver that I will 
commit later this week (support for 2Kx2K textures & full mipmap support 
for G400).  This will go in either today or Wednesday.

Work that will NOT make it into the texmem branch before the merge 
includes the cube map, texture rectangle, and MESA_ycbcr_texture support 
in the radeon driver that I've been working on from time to time.

My current guess is that all of this should be able to be completed by 
Valentine's Day (Friday, February 14th).  That gives 3 weeks.  I would 
then like to use the week of the 17th to the final trunk-to-branch & 
branch-to-trunk merges and create the texmem-0-0-2 branch.

Comments?