Would the attached patch be ok with you? Or do you have a better idea?

Marek

On Thu, Apr 28, 2011 at 11:29 AM, Jon TURNEY
<jon.tur...@dronecode.org.uk> wrote:
>
> On 23/04/2011 09:48, Marek Olšák wrote:
> > On Fri, Apr 22, 2011 at 1:29 PM, Jose Fonseca <jfons...@vmware.com> wrote:
> >
> >> The Mesa state tracker uses SWTNL for GL selection/feedback regardless of
> >> the driver. Some SPECviewperf viewsets and CAD apps use it. So using LLVM
> >> speeds up selection/feedback for all gallium drivers.
> >>
> >> We have only tested LLVM with x86/x86_64. So indeed, using it/requiring it
> >> on other platforms is not advisable.
> >>
> >
> > I take the first patch back. Here's an updated r300g patch that requires
> > LLVM on x86 and x86_64 only:
> >
> >
> >     configure.ac: require LLVM to build r300g on x86 and x86_64
> >
> > diff --git a/configure.ac b/configure.ac
> > index d8c50ce..1012ca5 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -1780,9 +1780,16 @@ dnl Gallium Radeon r300g configuration
> >  dnl
> >  AC_ARG_ENABLE([gallium-r300],
> >      [AS_HELP_STRING([--enable-gallium-r300],
> > -        [build gallium r300 @<:@default=DRI-only@:>@])],
> > +        [build gallium r300 @<:@default=build DRI driver only@:>@])],
> >      [enable_gallium_r300="$enableval"],
> >      [enable_gallium_r300=auto])
> > +if test "x$enable_gallium_r300" != xno; then
> > +    if test "x$MESA_LLVM" = x0; then
> > +        case "$host_cpu" in
> > +        i*86|x86_64) AC_MSG_ERROR([LLVM is required to build Gallium R300
> > on x86 and x86_64]);;
> > +        esac
> > +    fi
> > +fi
> >  if test "x$enable_gallium_r300" = xauto; then
> >      GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
> >      gallium_check_st "radeon/drm" "dri-r300"
>
> This error is triggering in the default (--with-driver=xlib) configuration on
> cygwin, see [1].
>
> [1] 
> http://tinderbox.freedesktop.org/builds/2011-04-27-0005/logs/libGL/#configure
From eceb9f95ccf8b3b8a263a4e34c42d567c5b9452d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <mar...@gmail.com>
Date: Thu, 28 Apr 2011 12:46:07 +0200
Subject: [PATCH] configure.ac: do not build r300g by default on non-Linux platforms

---
 configure.ac |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3b05ca3..e4a4479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1784,6 +1784,17 @@ AC_ARG_ENABLE([gallium-r300],
         [build gallium r300 @<:@default=build DRI driver only@:>@])],
     [enable_gallium_r300="$enableval"],
     [enable_gallium_r300=auto])
+dnl Only build by default on Linux
+if test "x$enable_gallium_r300" = xauto; then
+    case "$host_os" in
+    linux*)
+        ;;
+    *)
+        enable_gallium_r300=no
+        ;;
+    esac
+fi
+dnl Require LLVM on x86 and x86_64
 if test "x$enable_gallium_r300" != xno; then
     if test "x$MESA_LLVM" = x0; then
         case "$host_cpu" in
-- 
1.7.4.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to