Pushed, though for some reason your second patch didn't apply cleanly & had to be done by hand.
Keith On Wed, Sep 24, 2008 at 6:04 AM, Tobias Jakobi <[EMAIL PROTECTED]> wrote: > Keith Whitwell wrote: >> >> On Tue, Sep 23, 2008 at 9:11 PM, Keith Whitwell >> <[EMAIL PROTECTED]> wrote: >>> >>> Sorry, this is my fault. I thought I'd wound back my commits & fixed >>> this before pushing, but by way of various git interactions I ended up >>> getting it wrong & pushing the broken version. I'll push some fixes >>> shortly. >>> >> >> OK, for at least linux-debug and linux-x86 targets, it is compiling & >> running gears fine. How are you building mesa? >> >> Keith >> > Hi Keith, > > I'm using a mesa-9999.ebuild from the gentoo x11 overlay. The configure > string generated from the ebuild is: > > ./configure --prefix=/usr --host=i686-pc-linux-gnu --mandir=/usr/share/man > --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc > --localstatedir=/var/lib --with-driver=dri --enable-glx-tls > --with-dri-drivers=swrast,i915 --enable-asm --disable-glut --without-demos > --disable-xcb --disable-glw --build=i686-pc-linux-gnu > > I think the --enable-asm and --enable-glx-tls settings are the interesting > bits. > > I'm attaching my two remaining patches that let glapi_getproc.c compile for > me. Again this is only copy&paste from glapi.c > > Greets, > Tobias > > >From 750d38ee1247f0123412fe87b54f9acbe7576f49 Mon Sep 17 00:00:00 2001 > From: Tobias Jakobi <[EMAIL PROTECTED]> > Date: Tue, 23 Sep 2008 21:38:19 -0500 > Subject: glapi: add gl_dispatch_functions_start and end > > --- > src/mesa/glapi/glapi.c | 10 ++++++++++ > 1 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c > index 09aaea3..c92b096 100644 > --- a/src/mesa/glapi/glapi.c > +++ b/src/mesa/glapi/glapi.c > @@ -290,6 +290,16 @@ _glapi_get_context(void) > #endif > } > > +#ifdef USE_X86_ASM > + > +#if defined( GLX_USE_TLS ) > +extern GLubyte gl_dispatch_functions_start[]; > +extern GLubyte gl_dispatch_functions_end[]; > +#else > +extern const GLubyte gl_dispatch_functions_start[]; > +#endif > + > +#endif /* USE_X86_ASM */ > > > #if defined(PTHREADS) || defined(GLX_USE_TLS) > -- > 1.5.6.4 > > > >From 406b095533e05cb7334fc8c44ff445237dd4033e Mon Sep 17 00:00:00 2001 > From: Tobias Jakobi <[EMAIL PROTECTED]> > Date: Tue, 23 Sep 2008 21:44:14 -0500 > Subject: glapi: add DISPATCH_FUNCTION_SIZE > > --- > src/mesa/glapi/glapi.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c > index c92b096..c3ebf60 100644 > --- a/src/mesa/glapi/glapi.c > +++ b/src/mesa/glapi/glapi.c > @@ -302,6 +302,20 @@ extern const GLubyte gl_dispatch_functions_start[]; > #endif /* USE_X86_ASM */ > > > +#if defined(USE_X64_64_ASM) && defined(GLX_USE_TLS) > +# define DISPATCH_FUNCTION_SIZE 16 > +#elif defined(USE_X86_ASM) > +# if defined(THREADS) && !defined(GLX_USE_TLS) > +# define DISPATCH_FUNCTION_SIZE 32 > +# else > +# define DISPATCH_FUNCTION_SIZE 16 > +# endif > +#endif > + > +#if !defined(DISPATCH_FUNCTION_SIZE) && !defined(XFree86Server) && > !defined(XGLServer) > +# define NEED_FUNCTION_POINTER > +#endif > + > #if defined(PTHREADS) || defined(GLX_USE_TLS) > /** > * Perform platform-specific GL API entry-point fixups. > -- > 1.5.6.4 > > > ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
