Re: [Dri-devel] Merge fixups

2003-09-16 Thread José Fonseca
On Tue, Sep 16, 2003 at 01:17:47PM +, Martin Spott wrote: > Alan Hourihane <[EMAIL PROTECTED]> wrote: > > O.k. I've completed the merge fixups and doing a test build now. > > Great. > > > I'm going to tag the trunk with trunk-20030916 if everything goes well. > > It would be helpful if Jose

Re: [Dri-devel] Merge fixups

2003-09-16 Thread Martin Spott
Alan Hourihane <[EMAIL PROTECTED]> wrote: > O.k. I've completed the merge fixups and doing a test build now. Great. > I'm going to tag the trunk with trunk-20030916 if everything goes well. It would be helpful if Jose would update his mirror so other people could test as well, Martin. -- Unix

Re: [Dri-devel] Merge into 2.5.x kernel tree..

2003-03-30 Thread Keith Whitwell
Linus Torvalds wrote: I just finished a merge of the current DRI CVS tree kernel parts into 2.5.x. I've not done one of these in a while, so sadly the merge ends up being several totally unrelated things (i830 irq updates, the lock context fixes, and various random smaller things). I've pushed

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

2003-01-28 Thread Martin Spott
[ Ian wrote ] > There have been rumblings on [EMAIL PROTECTED] about problems with > Radeon in 4.2.99.4, but I didn't think that those problems had > propogated into DRI CVS yet. That's a shame. :( I think it's the other way round: The DRI stuff that got merged into XFree86 4.2.99.x 'releases'

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

2003-01-28 Thread Ian Romanick
Martin Spott wrote: Unfortunately the result of the merge is less stable with FlightGear on my Radeon7500 than 'xc-texmem-0-0-1-20030123-trunk-premerge' - it's quite as stable (or unstable) as the 'trunk' itself. Would it make sense to split the merge up into a set of patches ? This way I could r

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

2003-01-28 Thread Martin Spott
> The merge is finally done. I actually finished it on Sunday. The tag > is texmem-0-0-1-20030125-trunk-merge. Unfortunately the result of the merge is less stable with FlightGear on my Radeon7500 than 'xc-texmem-0-0-1-20030123-trunk-premerge' - it's quite as stable (or unstable) as the 'trunk'

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

2003-01-27 Thread Ian Romanick
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.

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-25 Thread Dieter Nützel
Am Sonntag, 24. November 2002 16:17 schrieb Brian Paul: > From the various emails I gather that there may be an X server > lock-up problem independant of the DRI, with both the trunk and > mesa-41 branch. If that's incorrect, let me know. > > Then, it appears that the r200 driver on the mesa-41 b

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-25 Thread Brian Paul
David Dawes wrote: On Mon, Nov 25, 2002 at 09:44:46AM +, Keith Whitwell wrote: I think I found the problem. usleep() gets defined as a macro to xf86usleep() in xf86_ansi.h (via radeon_regs.h) and needs to be #undefined. Do we know why xf86_ansi.h is getting included in the client-side mo

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-25 Thread David Dawes
On Mon, Nov 25, 2002 at 09:44:46AM +, Keith Whitwell wrote: > >>>I think I found the problem. usleep() gets defined as a macro to xf86usleep() >>>in xf86_ansi.h (via radeon_regs.h) and needs to be #undefined. >> >> >> Do we know why xf86_ansi.h is getting included in the client-side module?

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-25 Thread Keith Whitwell
I think I found the problem. usleep() gets defined as a macro to xf86usleep() in xf86_ansi.h (via radeon_regs.h) and needs to be #undefined. Do we know why xf86_ansi.h is getting included in the client-side module? It's only intended for X server modules. It'd be better to not include it in

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-24 Thread David Dawes
On Sat, Nov 23, 2002 at 07:51:08AM -0700, Brian Paul wrote: >Adam K Kirchhoff wrote: >> On Fri, 22 Nov 2002, Brian Paul wrote: >> >> >>>Adam K Kirchhoff wrote: >>> I would be worried that whatever is causing the server from the mesa-41 branch to crash under FreeBSD is going to make it way

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-24 Thread Alan Hourihane
On Sun, Nov 24, 2002 at 10:45:48 +, Alan Hourihane wrote: > On Sun, Nov 24, 2002 at 10:11:12 +, Alan Hourihane wrote: > > > > I've found a crash with the current trunk code using indirect GLX mode. > > > > I'll post a few more details soon. > > Having built a debug server it shows that t

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-24 Thread Alan Hourihane
On Sun, Nov 24, 2002 at 10:11:12 +, Alan Hourihane wrote: > > I've found a crash with the current trunk code using indirect GLX mode. > > I'll post a few more details soon. Having built a debug server it shows that the last checkin to swrast/s_context.c which adds a _mesa_pb_flush(ctx); cal

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-24 Thread Alan Hourihane
I've found a crash with the current trunk code using indirect GLX mode. I'll post a few more details soon. Alan. --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-24 Thread Brian Paul
From the various emails I gather that there may be an X server lock-up problem independant of the DRI, with both the trunk and mesa-41 branch. If that's incorrect, let me know. Then, it appears that the r200 driver on the mesa-41 branch may have a problem too. If you've got both trunk and mesa-

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-24 Thread Adam K Kirchhoff
Well, I rebuilt the X server, commenting out the DoLoadableServer NO line from host.def. And, once again, the server crashed as soon as I tried to run gkrellm, though I had no problems running gkrellm or kde with the static server. I took Eric suggestion and built gdb52 from the ports tree. Run

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-24 Thread Adam K Kirchhoff
On 23 Nov 2002, Eric Anholt wrote: > On Sat, 2002-11-23 at 16:16, Adam K Kirchhoff wrote: > > > > On Sat, 23 Nov 2002, Brian Paul wrote: > > > > > Adam K Kirchhoff wrote: > > > > > > > Alright... That fixed the xf86usleep error, but the server crashes are > > > > still happening. > > > > > > Cou

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-23 Thread Eric Anholt
On Sat, 2002-11-23 at 16:16, Adam K Kirchhoff wrote: > > On Sat, 23 Nov 2002, Brian Paul wrote: > > > Adam K Kirchhoff wrote: > > > > > Alright... That fixed the xf86usleep error, but the server crashes are > > > still happening. > > > > Could you possibly build a static server and find where it

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-23 Thread Adam K Kirchhoff
On Sat, 23 Nov 2002, Brian Paul wrote: > Adam K Kirchhoff wrote: > > > Alright... That fixed the xf86usleep error, but the server crashes are > > still happening. > > Could you possibly build a static server and find where it crashes > with gdb? > > I can explain the process if needed. Well, I'

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-23 Thread Brian Paul
Adam K Kirchhoff wrote: Alright... That fixed the xf86usleep error, but the server crashes are still happening. Could you possibly build a static server and find where it crashes with gdb? I can explain the process if needed. -Brian ---

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-23 Thread Adam K Kirchhoff
> Adam K Kirchhoff wrote: > > On Fri, 22 Nov 2002, Brian Paul wrote: > > > > > >>Adam K Kirchhoff wrote: > >> > >>>I would be worried that whatever is causing the server from the > > > > mesa-41 > >>>branch to crash under FreeBSD is going to make it way into the > > > > trunk. > >> > >>Can you upda

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-23 Thread Brian Paul
Adam K Kirchhoff wrote: On Fri, 22 Nov 2002, Brian Paul wrote: Adam K Kirchhoff wrote: I would be worried that whatever is causing the server from the mesa-41 branch to crash under FreeBSD is going to make it way into the trunk. Can you update your mesa-41 branch and rebuild? I just did an

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Adam K Kirchhoff
On Fri, 22 Nov 2002, Brian Paul wrote: > Adam K Kirchhoff wrote: > > I would be worried that whatever is causing the server from the mesa-41 > > branch to crash under FreeBSD is going to make it way into the trunk. > > Can you update your mesa-41 branch and rebuild? I just did another > merge fr

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Garry Reisky
I would like to see this. The visuals are looking terrific. I really like this branch. I just updated and built/instaled this and I really like. The only thing that bothers me is that there is a bad stutter in things. I think the best example of this is in Unreal Tournament. You will have good f

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Brian Paul
Adam K Kirchhoff wrote: I would be worried that whatever is causing the server from the mesa-41 branch to crash under FreeBSD is going to make it way into the trunk. Can you update your mesa-41 branch and rebuild? I just did another merge from the trunk which picked up a few updates. -Brain

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Jens Owen
Adam K Kirchhoff wrote: On Fri, 22 Nov 2002, Jens Owen wrote: Brian Paul wrote: Adam K Kirchhoff wrote: > On Fri, 22 Nov 2002, Brian Paul wrote: > >>My plan is to merge the mesa-41 branch into the DRI trunk this >>weekend. Let me know if there are any concerns. > > I would be worried that wh

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Adam K Kirchhoff
On Fri, 22 Nov 2002, Jens Owen wrote: > Brian Paul wrote: > > Adam K Kirchhoff wrote: > > > On Fri, 22 Nov 2002, Brian Paul wrote: > > > > > >>My plan is to merge the mesa-41 branch into the DRI trunk this > > >>weekend. Let me know if there are any concerns. > > > > > > I would be worried

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Jens Owen
Brian Paul wrote: Adam K Kirchhoff wrote: > On Fri, 22 Nov 2002, Brian Paul wrote: > >>My plan is to merge the mesa-41 branch into the DRI trunk this >>weekend. Let me know if there are any concerns. > > I would be worried that whatever is causing the server from the mesa-41 branch to cra

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Brian Paul
Adam K Kirchhoff wrote: > On Fri, 22 Nov 2002, Brian Paul wrote: > >>My plan is to merge the mesa-41 branch into the DRI trunk this >>weekend. Let me know if there are any concerns. > > I would be worried that whatever is causing the server from the mesa-41 branch to crash under FreeBSD is going

Re: [Dri-devel] Merge of mesa-41 branch to trunk

2002-11-22 Thread Adam K Kirchhoff
I would be worried that whatever is causing the server from the mesa-41 branch to crash under FreeBSD is going to make it way into the trunk. Adam On Fri, 22 Nov 2002, Brian Paul wrote: > > My plan is to merge the mesa-41 branch into the DRI trunk this > weekend. Let me know if there are any

Re: [Dri-devel] Merge Complete

2002-10-25 Thread Michel Dänzer
On Sam, 2002-10-26 at 01:03, David Dawes wrote: > On Fri, Oct 25, 2002 at 01:15:15PM +0200, Michel Dänzer wrote: > >On Don, 2002-10-24 at 14:25, David Dawes wrote: > >> On Thu, Oct 24, 2002 at 02:00:48PM +0200, Michel Dänzer wrote: > >> >On Don, 2002-10-24 at 13:52, Alan Hourihane wrote: > >> >> O

Re: [Dri-devel] Merge Complete

2002-10-25 Thread David Dawes
On Fri, Oct 25, 2002 at 01:15:15PM +0200, Michel Dänzer wrote: >On Don, 2002-10-24 at 14:25, David Dawes wrote: >> On Thu, Oct 24, 2002 at 02:00:48PM +0200, Michel Dänzer wrote: >> >On Don, 2002-10-24 at 13:52, Alan Hourihane wrote: >> >> On Thu, Oct 24, 2002 at 01:47:01PM +0200, Michel Dänzer wro

Re: [Dri-devel] Merge Complete

2002-10-25 Thread Michel Dänzer
On Don, 2002-10-24 at 14:25, David Dawes wrote: > On Thu, Oct 24, 2002 at 02:00:48PM +0200, Michel Dänzer wrote: > >On Don, 2002-10-24 at 13:52, Alan Hourihane wrote: > >> On Thu, Oct 24, 2002 at 01:47:01PM +0200, Michel Dänzer wrote: > >> > > That certainly shouldn't be needed for shared entities

Re: [Dri-devel] Merge Complete

2002-10-24 Thread David Dawes
On Thu, Oct 24, 2002 at 02:00:48PM +0200, Michel Dänzer wrote: >On Don, 2002-10-24 at 13:52, Alan Hourihane wrote: >> On Thu, Oct 24, 2002 at 01:47:01PM +0200, Michel Dänzer wrote: >> > > That certainly shouldn't be needed for shared entities. Where exactly >> > > was it crashing ? >> > >> > XAA d

Re: [Dri-devel] Merge Complete

2002-10-24 Thread Alan Hourihane
On Thu, Oct 24, 2002 at 02:00:48PM +0200, Michel Dänzer wrote: > On Don, 2002-10-24 at 13:52, Alan Hourihane wrote: > > On Thu, Oct 24, 2002 at 01:47:01PM +0200, Michel Dänzer wrote: > > > > That certainly shouldn't be needed for shared entities. Where exactly > > > > was it crashing ? > > > > > >

Re: [Dri-devel] Merge Complete

2002-10-24 Thread Michel Dänzer
On Don, 2002-10-24 at 13:52, Alan Hourihane wrote: > On Thu, Oct 24, 2002 at 01:47:01PM +0200, Michel Dänzer wrote: > > > That certainly shouldn't be needed for shared entities. Where exactly > > > was it crashing ? > > > > XAA dereferences pScrn->pScreen to track the state of shared entities. > >

Re: [Dri-devel] Merge Complete

2002-10-24 Thread Alan Hourihane
On Thu, Oct 24, 2002 at 01:47:01PM +0200, Michel Dänzer wrote: > > That certainly shouldn't be needed for shared entities. Where exactly > > was it crashing ? > > XAA dereferences pScrn->pScreen to track the state of shared entities. > RADEONScreenInit() calls other radeon driver functions which c

Re: [Dri-devel] Merge Complete

2002-10-24 Thread Michel Dänzer
On Mit, 2002-10-23 at 15:08, Alan Hourihane wrote: > On Wed, Oct 23, 2002 at 02:59:21PM +0200, Michel Dänzer wrote: > > On Mit, 2002-10-23 at 01:37, Alan Hourihane wrote: > > > > > > I'm committing the final part of the merge now. I have build tested > > > it and it does build fine, although I've

Re: [Dri-devel] Merge Complete

2002-10-23 Thread Kevin E Martin
On Wed, Oct 23, 2002 at 02:08:13PM +0100, Alan Hourihane wrote: > On Wed, Oct 23, 2002 at 02:59:21PM +0200, Michel Dänzer wrote: > > On Mit, 2002-10-23 at 01:37, Alan Hourihane wrote: > > > > > > I'm committing the final part of the merge now. I have build tested > > > it and it does build fine, a

Re: [Dri-devel] Merge Complete

2002-10-23 Thread Alan Hourihane
On Wed, Oct 23, 2002 at 02:59:21PM +0200, Michel Dänzer wrote: > On Mit, 2002-10-23 at 01:37, Alan Hourihane wrote: > > > > I'm committing the final part of the merge now. I have build tested > > it and it does build fine, although I've not tested the drivers. > > > > The radeon was indeed the mo

Re: [Dri-devel] Merge Complete

2002-10-23 Thread Michel Dänzer
On Mit, 2002-10-23 at 01:37, Alan Hourihane wrote: > > I'm committing the final part of the merge now. I have build tested > it and it does build fine, although I've not tested the drivers. > > The radeon was indeed the most difficult in this merge due to > the divergence of the Clone modes in th

Re: [Dri-devel] Merge

2002-10-22 Thread Ian Romanick
On Tue, Oct 22, 2002 at 11:31:00AM +0100, José Fonseca wrote: > On Tue, Oct 22, 2002 at 10:34:58AM +0100, Alan Hourihane wrote: > >I'm about to start a merge of the XFree86 CVS and bring that into > >the DRI CVS trunk. No doubt with the trees diverging quite a bit, that > >there will undoubtably be

Re: [Dri-devel] Merge

2002-10-22 Thread José Fonseca
On Tue, Oct 22, 2002 at 10:34:58AM +0100, Alan Hourihane wrote: I'm about to start a merge of the XFree86 CVS and bring that into the DRI CVS trunk. No doubt with the trees diverging quite a bit, that there will undoubtably be some build bustage along the way. I'll be bringing it across in stages

Re: [Dri-devel] Merge

2002-10-22 Thread Michel Dänzer
On Die, 2002-10-22 at 11:34, Alan Hourihane wrote: > I'm about to start a merge of the XFree86 CVS and bring that into > the DRI CVS trunk. No doubt with the trees diverging quite a bit, that > there will undoubtably be some build bustage along the way. > > I'll be bringing it across in stages to

Re: [Dri-devel] merge with Gatos

2002-06-22 Thread Christophe Saout
Am Fre, 2002-06-21 um 22.37 schrieb Sergey V. Udaltsov: > I recently asked the question about merging Mach64 DRI with Gatos > project - and got no answer. So, now I am trying to use xine - and found > that mach64 dri snapshots do not properly support XVideo extension (at > least in YUV overlay a