Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread José Fonseca
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 change

Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread Leif Delgass
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

Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread José Fonseca
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. On 2002.02.26 21:01 Leif Delgass wrote: > On Tue, 26 Feb 2002, José Fonseca wrote: > > > Leif, > > > > On 2002.02.26 19:35 Leif Delgass wrote

[Dri-devel] Re: [Mesa3d-dev] Mesa 3.4.2 in XFree86 4.2.0 OpenGL support

2002-02-26 Thread Brian Paul
"Mike A. Harris" wrote: > > On Tue, 26 Feb 2002, Brian Paul wrote: > > >> what I understood, 3.3.6 doesn't use GLX, which is why it didn't > >> work. I'm not quite clear on all of this however, so please > >> correct me if I'm wrong. > > > >Hi Mike, > > > >Sorry for not replying sooner. XFree8

Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread Leif Delgass
On Tue, 26 Feb 2002, José Fonseca wrote: > Leif, > > On 2002.02.26 19:35 Leif Delgass wrote: > > So the mach64-0-0-3-branch is the DRI trunk with the new mahc64 dirs and > > files added and changes from mach64-0-0-2-branch manually merged, right? > > > > For now it's just equal to the trunk. B

Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread José Fonseca
Leif, On 2002.02.26 19:35 Leif Delgass wrote: > So the mach64-0-0-3-branch is the DRI trunk with the new mahc64 dirs and > files added and changes from mach64-0-0-2-branch manually merged, right? > For now it's just equal to the trunk. But my local copy is as you described. > Is the branch up

Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread Leif Delgass
So the mach64-0-0-3-branch is the DRI trunk with the new mahc64 dirs and files added and changes from mach64-0-0-2-branch manually merged, right? Is the branch up to date with your working tree or do you still have local changes? I'd like to hack on this too, but I don't want to get in your way

[Dri-devel] Re: [Mesa3d-dev] Mesa 3.4.2 in XFree86 4.2.0 OpenGL support

2002-02-26 Thread Mike A. Harris
On Tue, 26 Feb 2002, Brian Paul wrote: >> what I understood, 3.3.6 doesn't use GLX, which is why it didn't >> work. I'm not quite clear on all of this however, so please >> correct me if I'm wrong. > >Hi Mike, > >Sorry for not replying sooner. XFree86 4.2 does not support libGL >rendering to 3.

[Dri-devel] Re: Update #2 (was R128PutImage eating too much CPU, round 2 :-])

2002-02-26 Thread Michel Dänzer
On Die, 2002-02-26 at 18:07, Peter Surda wrote: > On Tue, Feb 26, 2002 at 04:32:25PM +0100, Michel Dänzer wrote: > > > > > Hmm.. Michel, Peter, is it possible that "poll" function in DRM driver is > > > > > screwed up ? Though I thought that texture transfer goes through an ioctl.. > > > > It does

Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread Jose Fonseca
Well, I'm answering to my own question, just in case someone is also interested! I've finished merging and I'm now compiling. It's clear now that although making a 'cvs update' for everything would be quicker to get a merge, there would be several cases where the code wouldn't be properly merged

[Dri-devel] Re: [GATOS]Re: Update #2 (was R128PutImage eating too much CPU, round 2 :-])

2002-02-26 Thread Peter Surda
On Tue, Feb 26, 2002 at 04:32:25PM +0100, Michel Dänzer wrote: > > > > Hmm.. Michel, Peter, is it possible that "poll" function in DRM driver is > > > > screwed up ? Though I thought that texture transfer goes through an ioctl.. > > > It does, and Peter says the cycles are wasted in user space, or

Re: [Dri-devel] CVS merge question again..

2002-02-26 Thread Jose Fonseca
I'm in the process of merging the files from mach64-0-0-2-branch into the recently created mach64-0-0-3-branch from the trunk. The way I'm doing is (on a directory basis): - make a diff of the entire directory to get the global picture of the differences - update the files that are only in the

[Dri-devel] Re: Update #2 (was R128PutImage eating too much CPU, round 2 :-])

2002-02-26 Thread Michel Dänzer
On Die, 2002-02-26 at 15:34, Vladimir Dergachev wrote: > > > On 26 Feb 2002, Michel [ISO-8859-1] Dänzer wrote: > > > On Son, 2002-02-24 at 16:26, Vladimir Dergachev wrote: > > > > > > > > > On Fri, 22 Feb 2002, Peter Surda wrote: > > > > > > > On Fri, Feb 22, 2002 at 01:38:36AM +0100, Michel Dä

[Dri-devel] Matrox G400,latest Xfree CVS and Quake III problem

2002-02-26 Thread Panagiotis Papadakos
I am using the latest CVS from Xfree and the introduction of Quake III is not working.I have changed xc/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c line 220 from __driMesaMessage(...) to __driUtilMessage(...) as Klaus Rose suggested and although I can play the game, the introduction renders the first f

[Dri-devel] Re: [Mesa3d-dev] Mesa 3.4.2 in XFree86 4.2.0 OpenGL support

2002-02-26 Thread Brian Paul
"Mike A. Harris" wrote: > > On Tue, 26 Feb 2002, Andree Borrmann wrote: > > >On Tue, Feb 26, 2002 at 06:21:01AM -0500, Mike A. Harris wrote: > >> Does the Mesa 3.4.2 that is part of XFree86 4.2.0 support OpenGL > >> with XFree86 3.3.6 servers? > > > >GLX indirect mode should work. I recently (ac

Re: [Dri-devel] Re: Update #2 (was R128PutImage eating too much CPU,round 2 :-])

2002-02-26 Thread Vladimir Dergachev
On 26 Feb 2002, Michel [ISO-8859-1] Dänzer wrote: > On Son, 2002-02-24 at 16:26, Vladimir Dergachev wrote: > > > > > > On Fri, 22 Feb 2002, Peter Surda wrote: > > > > > On Fri, Feb 22, 2002 at 01:38:36AM +0100, Michel Dänzer wrote: > > > > > BEFORE the "if", X load sinks by about 20% during vid

Re: [Dri-devel] CVS merge question

2002-02-26 Thread José Fonseca
On 2002.02.26 13:41 Alan Hourihane wrote: > On Tue, Feb 26, 2002 at 01:32:39PM +, José Fonseca wrote: > > On 2002.02.26 13:19 Alan Hourihane wrote: > > >... > > >Your better off creating a branch from the trunk and merging your work > > >over that way. Seeing as the mach64-0-0-1 branch is stil

Re: [Dri-devel] CVS merge question

2002-02-26 Thread José Fonseca
On 2002.02.26 13:19 Alan Hourihane wrote: > On Tue, Feb 26, 2002 at 01:06:17PM +, José Fonseca wrote: > > I have just merged the trunk into my mach64-0-0-2-branch making > > > > cvs update -kk -d -P -j HEAD > > > > and I solved most of the conflicts, but I noticed that this is still > not

[Dri-devel] CVS merge question

2002-02-26 Thread José Fonseca
I have just merged the trunk into my mach64-0-0-2-branch making cvs update -kk -d -P -j HEAD and I solved most of the conflicts, but I noticed that this is still not enough for a proper merge. There are several directories unrelated to mach64 that aren't in synch with the trunk because

Re: [Dri-devel] Compliance v. Performance (and mach64)

2002-02-26 Thread Michel Dänzer
On Mon, 2002-02-25 at 19:50, Ian Romanick wrote: > On Sun, Feb 24, 2002 at 07:58:14PM -0500, Leif Delgass wrote: > > > Given this hardware limitation, most GL_MODULATE cases can produce > > incorrect results with alpha blending enabled. Using software fallbacks > > for these cases could serious

[Dri-devel] Re: Update #2 (was R128PutImage eating too much CPU, round 2 :-])

2002-02-26 Thread Michel Dänzer
On Son, 2002-02-24 at 16:26, Vladimir Dergachev wrote: > > > On Fri, 22 Feb 2002, Peter Surda wrote: > > > On Fri, Feb 22, 2002 at 01:38:36AM +0100, Michel Dänzer wrote: > > > > BEFORE the "if", X load sinks by about 20% during video playing, BOTH when > > > > using dri (25->5) or not using DR