[PATCH] add -DIN_DRI_DRIVER to xorg-6.9 build [was Re: problem found with new xorg-6.9RC2 on savage with DRI enabled]

[Sergio Monteiro Basto]

Hi,
After analyze how build Mesa from CVS with "make linux-x86-dri" and how
xorg built same Mesa source with "make World".

Ian Romanick has point that Mesa code should have IN_DRI_DRIVER Define.
So, I found on xc/lib/GL/mesa all subdirs: shader swrast tnl x86 main
math and tnl_dd have missing at least -DIN_DRI_DRIVER

Xorg build also misses -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DHAVE_ALIAS
Ian, and those ones are needed ? 

As side note I haven't the minimum idea, what side effect this could
cause on non Linux or BSD systems. 

--- xc/lib/GL/mesa/Imakefile.orig       2005-11-17 23:46:56.000000000 +0000
+++ xc/lib/GL/mesa/Imakefile    2005-11-17 23:04:00.000000000 +0000
@@ -50,7 +50,7 @@
  MATH_DEFINES = -DCCPML
 #endif

-      DEFINES = $(ALLOC_DEFINES) GlxDefines \
+      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER \
                $(MESA_ASM_DEFINES) $(MATH_DEFINES)
      INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
                -I$(GLXLIBSRC)/dri \

On Tue, 2005-11-15 at 15:15 -0800, Ian Romanick wrote:
> >>>>>Program received signal SIGFPE, Arithmetic exception.
> >>>>>[Switching to Thread -1208801600 (LWP 12723)]
> >>>>>0x00ec8a80 in _mesa_test_os_sse_exception_support () from /usr/X11R6/lib/modules/dri/savage_dri.so
> >>>>
> >>>>What platform are you running on?  Properly built drivers on Linux or
> >>>>BSD should *NEVER* encounter this code.  That code has been removed from
> >>>>the Linux builds for almost a year.  I suspect that you're either
> >>>>picking up a very old savage_dri.so or something is not right with your
> >>>>build.
> >>>>
> >>>>The code is #ifdef'ed out at line 186 of src/mesa/x86/x86_common.c:
> >>>>
> >>>>#if defined(__linux__) && !defined(IN_DRI_DRIVER)
> >>>>
> >>>>Clearly, IN_DRI_DRIVER should be defined when building the Savage DRI
> >>>>driver! :)
> > 
> > Well I downgrade to xorg-6.9RC1 and the problem disappears, so is a very
> > recent regression.
> > About IN_DRI_DRIVE, yes it is defined at all the places.
> 
> Impossible.  Edit src/mesa/x86/x86_common.c and put a '#warning Got
> here' before and after the '#if defined(__linux__) &&
> !defined(IN_DRI_DRIVER)' at line 186.  Rebuild and grep the build output
> for '#warning'.
> 
> > With RC1 I still get this "Arithmetic exception"
> > but 3D apps works without problems.
> > If I recall correctly this "Arithmetic exception" is not new at all.
> 
> Re-read my original reply.  It was *removed* from the Linux builds about
> a year ago.
> 
> I still stand by the problem being somewhere in your build.

thanks,
-- 
Sérgio M.B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 2166 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20051118/426ffdc7/attachment.bin>