Re: [Mesa3d-dev] broken build on windows

2009-09-04 Thread Ian Romanick
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Brian Paul wrote: > I'll fix these. > > Perhaps we should prefix or suffix all the lexer tokens with "T_" or > something like that to avoid collisions. Ian? Could we just fix it to not include broken Windows header files? They really assumed nobo

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Ian Romanick
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 tom fogal wrote: > FWIW, git includes an overview of how git.git runs in gitworkflows(7). I'll give that a read. Thanks for the pointer. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigm

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread tom fogal
Ian Romanick writes: > Keith Whitwell wrote: > > On Thu, 2009-09-03 at 15:13 -0700, Michel Dänzer wrote: > >> On Thu, 2009-09-03 at 14:43 -0700, Ian Romanick wrote: > >>> 2. It becomes increasing difficult to merge (as opposed to cherry-pick) > >>> from one branch to the other as the branches div

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Ian Romanick
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Keith Whitwell wrote: > On Thu, 2009-09-03 at 15:13 -0700, Michel Dänzer wrote: >> On Thu, 2009-09-03 at 14:43 -0700, Ian Romanick wrote: >>> 2. It becomes increasing difficult to merge (as opposed to cherry-pick) >>> from one branch to the other as t

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Alex Deucher
On Fri, Sep 4, 2009 at 1:53 PM, Corbin Simpson wrote: > On 09/03/2009 03:57 PM, Alex Deucher wrote: >> On Thu, Sep 3, 2009 at 6:51 PM, Dave Airlie wrote: >>> I've been holding off, its the problem with merging code from 3 drivers >>> with different white space into one set of common code, you get b

Re: [Mesa3d-dev] Doco: top level map of Mesa3D source

2009-09-04 Thread Corbin Simpson
On 09/04/2009 07:52 AM, Brian Paul wrote: > Hugh Fisher wrote: >> This is my attempt at explaining the top level structure >> of the Mesa3D source code: >> >> >> >> If anyone thinks it would be useful, feel free to take a >> copy and do wh

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Corbin Simpson
On 09/03/2009 03:57 PM, Alex Deucher wrote: > On Thu, Sep 3, 2009 at 6:51 PM, Dave Airlie wrote: >> I've been holding off, its the problem with merging code from 3 drivers >> with different white space into one set of common code, you get bits >> of the style of all 3 drivers. > > heh, 4 now and r

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Nicolai Hähnle
Am Friday 04 September 2009 00:48:19 schrieb Brian Paul: > Michel Dänzer wrote: > > On Thu, 2009-09-03 at 14:43 -0700, Ian Romanick wrote: > >> 2. It becomes increasing difficult to merge (as opposed to cherry-pick) > >> from one branch to the other as the branches diverge. Michel has run > >> int

Re: [Mesa3d-dev] broken build on windows

2009-09-04 Thread Brian Paul
michal wrote: > C:\src\mesa>scons platform=windows debug=1 > scons: Reading SConscript files ... > scons: done reading SConscript files. > scons: Building targets ... > Compiling src\mesa\shader\program_parse.tab.c ... > program_parse.tab.c > program_parse.tab.c(254) : error C2365: 'POINT' : rede

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Brian Paul
Keith Whitwell wrote: > On Thu, 2009-09-03 at 15:13 -0700, Michel Dänzer wrote: >> On Thu, 2009-09-03 at 14:43 -0700, Ian Romanick wrote: >>> 2. It becomes increasing difficult to merge (as opposed to cherry-pick) >>> from one branch to the other as the branches diverge. Michel has run >>> into t

Re: [Mesa3d-dev] Doco: top level map of Mesa3D source

2009-09-04 Thread Brian Paul
Hugh Fisher wrote: > This is my attempt at explaining the top level structure > of the Mesa3D source code: > > > > If anyone thinks it would be useful, feel free to take a > copy and do what you like with it. (If you find any serious > e

[Mesa3d-dev] broken build on windows

2009-09-04 Thread michal
C:\src\mesa>scons platform=windows debug=1 scons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... Compiling src\mesa\shader\program_parse.tab.c ... program_parse.tab.c program_parse.tab.c(254) : error C2365: 'POINT' : redefinition; previous definit

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Keith Whitwell
> > > > Firstly, I'll just say that (3) hasn't been true in my experience. I'm > > sure branches that are allowed to grow infinitely far apart will be hard > > to merge, but the repeated merge from 7.5->master has had the effect of > > making each individual merge very easy. In fact, it seems ea

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Zack Rusin
On Friday 04 September 2009 05:08:48 Keith Whitwell wrote: > On Thu, 2009-09-03 at 15:13 -0700, Michel Dänzer wrote: > > On Thu, 2009-09-03 at 14:43 -0700, Ian Romanick wrote: > > > 2. It becomes increasing difficult to merge (as opposed to cherry-pick) > > > from one branch to the other as the bra

Re: [Mesa3d-dev] Mesa 7.6 branch coming

2009-09-04 Thread Keith Whitwell
On Thu, 2009-09-03 at 15:13 -0700, Michel Dänzer wrote: > On Thu, 2009-09-03 at 14:43 -0700, Ian Romanick wrote: > > > > 2. It becomes increasing difficult to merge (as opposed to cherry-pick) > > from one branch to the other as the branches diverge. Michel has run > > into this. > > At least i

[Mesa3d-dev] Doco: top level map of Mesa3D source

2009-09-04 Thread Hugh Fisher
This is my attempt at explaining the top level structure of the Mesa3D source code: If anyone thinks it would be useful, feel free to take a copy and do what you like with it. (If you find any serious errors, please let me know!) I pla