i965: use cut index to handle primitive restart when possible

If the primitive restart index and the primitive type can be handled by the cut index feature, then use the hardware to handle the primitive restart feature. The VBO module's software handling of primitive restart is used as a fall back. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
i965: add flag to enable cut_index
2012-05-17 10:55:00 -07:00 · 2012-05-17 10:55:00 -07:00 · 2012-05-17 10:55:00 -07:00
6311 changed files with 657867 additions and 1139693 deletions
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,13 +0,0 @@
 ((prog-mode
  (indent-tabs-mode . nil)
  (tab-width . 8)
  (c-basic-offset . 3)
  (c-file-style . "stroustrup")
  (fill-column . 78)
  (eval . (progn
 	    (c-set-offset 'case-label '0)
 	    (c-set-offset 'innamespace '0)
 	    (c-set-offset 'inline-open '0)))
  )
 (makefile-mode (indent-tabs-mode . t))
 )
--- a/.emacs-dirvars
+++ b/.emacs-dirvars
@@ -0,0 +1,10 @@
 ;; -*- emacs-lisp -*-
 ;;
 ;; This file is processed by the dirvars emacs package.  Each variable
 ;; setting below is performed when this dirvars file is loaded.
 ;;
 indent-tabs-mode: nil
 tab-width: 8
 c-basic-offset: 3
 kde-emacs-after-parent-string: ""
 evaluate: (c-set-offset 'inline-open '0)
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 *.ilk
 *.la
 *.lo
 *.log
 *.o
 *.obj
 *.os
@@ -18,8 +17,6 @@
 *.tar
 *.tar.bz2
 *.tar.gz
 *.tar.xz
 *.trs
 *.zip
 *~
 depend
@@ -34,18 +31,12 @@ aclocal.m4
 config.log
 config.status
 cscope*
 tags
 .scon*
 config.py
 build
 libtool
 manifest.txt
 Makefile.in
 .dir-locals.el
 .deps/
 .dirstamp
 .libs/
 Makefile
 Makefile.in
 .install-mesa-links
 .install-gallium-links
 /src/git_sha1.h
--- a/.mailmap
+++ b/.mailmap
@@ -1,460 +0,0 @@
 Aapo Tahkola <aet@rasterburn.org> <aapo@aapo-desktop.(none)>
 Adam Jackson <ajax@redhat.com> <ajax@benzedrine.nwnk.net>
 Adam Jackson <ajax@redhat.com> <ajax@freedesktop.org>
 Adrian Marius Negreanu <adrian.m.negreanu@intel.com> Adrian Negreanu <adrian.m.negreanu@intel.com>
 Adrian Marius Negreanu <adrian.m.negreanu@intel.com> Negreanu Marius Adrian <adrian.m.negreanu@intel.com>
 Dave Airlie <airlied@redhat.com> <airliedfreedesktop.org>
 Dave Airlie <airlied@redhat.com> airlied <airlied@unused-12-215.bne.redhat.com>
 Dave Airlie <airlied@redhat.com> <airlied@dhcp-1-203.bne.redhat.com>
 Dave Airlie <airlied@redhat.com> <airlied@gmail.com>
 Dave Airlie <airlied@redhat.com> <airlied@itt42.(none)>
 Dave Airlie <airlied@redhat.com> <airlied@linux.ie>
 Dave Airlie <airlied@redhat.com> <airlied@nx6125b.(none)>
 Dave Airlie <airlied@redhat.com> <airlied@panoply-rh.(none)>
 Dave Airlie <airlied@redhat.com> <airlied@ppcg5.localdomain>
 Alan Coopersmith <alan.coopersmith@oracle.com> <alan.coopersmith@sun.com>
 Alan Hourihane <alanh@vmware.com> <alanh@tungstengraphics.com>
 Alan Hourihane <alanh@vmware.com> <alanh@fairlite.demon.co.uk>
 Alan Hourihane <alanh@vmware.com> <alanh@jetpack.(none)>
 Alexander Monakov <amonakov@gmail.com> <amonakov@ispras.ru>
 Alexander von Gluck IV <kallisti5@unixzen.com> Alexander von Gluck <kallisti5@unixzen.com>
 Alex Corscadden <alexc@vmware.com> <alexc@alexc-dev1.prom.eng.vmware.com>
 Alex Corscadden <alexc@vmware.com> <alexc@alexc-dev1.vmware.com>
 Alex Deucher <alexdeucher@gmail.com> <alexander.deucher@amd.com>
 Alex Deucher <alexdeucher@gmail.com> <agd5f@yahoo.com>
 Alex Deucher <alexdeucher@gmail.com> <alex@botch2.com>
 Alex Deucher <alexdeucher@gmail.com> <alex@botch2.(none)>
 Alex Deucher <alexdeucher@gmail.com> <alex@cube.(none)>
 Alex Deucher <alexdeucher@gmail.com> <alex@samba.(none)>
 Andreas Fänger <a.faenger@e-sign.com> <a.faenger@e-sign.com>
 Andreas Hartmetz <ahartmetz@gmail.com> <andreas.hartmetz@kdab.com>
 Andre Heider <a.heider@gmail.com>
 Andreas Heider <andreas@heider.io>
 Andreas Pokorny <andreas.pokorny@canonical.com> <andreas.pokorny@elektrobit.com>
 Andrew Randrianasulu <randrianasulu@gmail.com> <randrik_a@yahoo.com>
 Andrew Randrianasulu <randrianasulu@gmail.com> <randrik@mail.ru>
 Arthur Huillet <arthur.huillet@free.fr> Arthur HUILLET <arthur.huillet@free.fr>
 Benjamin Franzke <benjaminfranzke@googlemail.com> ben <benjaminfranzke@googlemail.com>
 Ben Skeggs <bskeggs@redhat.com> <darktama@beleth.(none)>
 Ben Skeggs <bskeggs@redhat.com> <darktama@iinet.net.au>
 Ben Skeggs <bskeggs@redhat.com> <darktama@nisroch.keine.ath.cx>
 Ben Skeggs <bskeggs@redhat.com> <skeggsb-at-gmail.com>
 Ben Skeggs <bskeggs@redhat.com> <skeggsb@gmail.com>
 Ben Skeggs <bskeggs@redhat.com> <skeggsb@localhost.localdomain>
 Ben Skeggs <bskeggs@redhat.com> <skeggsb@nisroch.keine.ath.cx>
 Ben Widawsky <benjamin.widawsky@intel.com> Ben Widawsky <ben@bwidawsk.net>
 Blair Sadewitz <blair.sadewitz@gmail.com> Blair Sadewitz <blair.sadewitz.gmail.com>
 Boris Peterbarg <reist@users.sourceforge.net> reist <reist>
 Brian Paul <brianp@vmware.com> Brian <brian.paul@tungstengraphics.com>
 Brian Paul <brianp@vmware.com> <brian.paul@tungstengraphics.com>
 Brian Paul <brianp@vmware.com> <brian.e.paul@gmail.com>
 Brian Paul <brianp@vmware.com> <brianp@kemper.freedesktop.org>
 Brian Paul <brianp@vmware.com> brian <brian@cvp965.(none)>
 Brian Paul <brianp@vmware.com> Brian <brian@i915.localnet.net>
 Brian Paul <brianp@vmware.com> Brian <brian@nostromo.localnet.net>
 Brian Paul <brianp@vmware.com> Brian <brian@poulsbo.localnet.net>
 Brian Paul <brianp@vmware.com> Brian <brian@ps3.localnet.net>
 Brian Paul <brianp@vmware.com> Brian <brianp@vmware.com>
 Brian Paul <brianp@vmware.com> Brian <brian@yutani.localnet.net>
 Brian Paul <brianp@vmware.com> root <brian.paul@tungstengraphics.com>
 Brian Paul <brianp@vmware.com> root <root@i915.localnet.net>
 Brian Paul <brianp@vmware.com> root <root@nostromo.localnet.net>
 Brian Paul <brianp@vmware.com> root <root@i965.localnet.net>
 Bruce Merry <bmerry@users.sourceforge.net> <bmerry@gmail.com>
 Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <s3734770@mail.zih.tu-dresden.de>
 Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <carli@carli-laptop.(none)>
 Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <Carl-Philip.Haensch@mailbox.tu-dresden.de>
 Chad Versace <chad.versace@intel.com> <chad@chad-versace.us>
 Chad Versace <chad.versace@intel.com> <Chad Versace chad@chad-versace.us>
 Chad Versace <chad.versace@intel.com> <chad.versace@linux.intel.com>
 Chia-I Wu <olvaffe@gmail.com> <olv@lunarg.com>
 Chia-I Wu <olvaffe@gmail.com> Chia-Wu <olvaffe@gmail.com>
 Chih-Wei Huang <cwhuang@linux.org.tw> Chih-Wei Huang <cwhuang@android-x86.org>
 Christian König <christian.koenig@amd.com> Christian Koenig <christian.koenig@amd.com>
 Christian König <christian.koenig@amd.com> Christian König <christian.koenig at amd.com>
 Christian König <christian.koenig@amd.com> Christian König <deathsimple@vodafone.de>
 Christoph Brill <egore911@egore911.de> Christoph Bill <egore@gmx.de>
 Christoph Brill <egore911@egore911.de> <egore@gmx.de>
 Christoph Bumiller <christoph.bumiller@speed.at> <e0425955@student.tuwien.ac.at>
 Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Christopher James Halse Rogers <raof@ubuntu.com>
 Claudio Ciccani <klan@directfb.org> <klan@users.sf.net>
 Claudio Ciccani <klan@directfb.org> <klan@users.sourceforge.net>
 Connor Abbott <cwabbott0@gmail.com> <connor.w.abbott@intel.com>
 Connor Abbott <cwabbott0@gmail.com> <connor.abbott@intel.com>
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomed...@gmail.com>
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomedude@gmail.com>
 Courtney Goeltzenleuchter <courtney@lunarg.com> <courtney@LunarG.com>
 Daniel Skinner <sio@users.sourceforge.net> sio <sio>
 Daniel Stone <daniels@collabora.com> <daniel@fooishbar.org>
 David Miller <davem@davemloft.net> David S. Miller <davem@davemloft.net>
 David Miller <davem@davemloft.net> Dave Miller <davem@davemloft.net>
 David Miller <davem@davemloft.net> davem69 <davem69>
 David Heidelberger <david.heidelberger@ixit.cz> David Heidelberg <david@ixit.cz>
 David Heidelberger <david.heidelberger@ixit.cz> <d.okias@gmail.com>
 David Reveman <reveman@chromium.org> <c99drn@cs.umu.se>
 Dieter Nützel <Dieter@nuetzel-hh.de> Dieter Nützel <dieter@nuetzel-hh.de>
 Dmitry Cherkassov <dcherkassov@gmail.com> Dmitry Cherkasov <dcherkassov@gmail.com>
 Dylan Baker <dylanx.c.baker@intel.com> <baker.dylan.c@gmail.com>
 Emeric Grange <emeric.grange@gmail.com> Emeric <emeric.grange@gmail.com>
 Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>
 Eric Anholt <eric@anholt.net> Eric Anholt <anholt@FreeBSD.org>
 Eugeni Dodonov <eugeni.dodonov@intel.com> <eugeni@mandriva.com>
 Fabian Bieler <der.fabe@gmx.net> <fabianbieler@fastmail.fm>
 Fabian Bieler <der.fabe@gmx.net> <&lt;der.fabe@gmx.net&gt>
 Feng, Haitao <haitao.feng@intel.com> Haitao Feng <haitao.feng@intel.com>
 Frank Henigman <fjhenigman@google.com> <fjhenigman@chromium.org>
 George Sapountzis <gsapountzis@gmail.com> George Sapountzis <gsap7@yahoo.gr>
 Gwenole Beauchesne <gwenole.beauchesne@intel.com> <gb.devel@gmail.com>
 Hamish Marson <hmarson@users.sourceforge.net> hmarson <hmarson>
 Hans de Goede <hdegoede@redhat.com> Hans de Goede <j.w..r..degoede@hhs.nl>
 Homer Hsing <dongsheng.xing@intel.com> <homer.hsing@gmail.com>
 Hui Qi Tay <hqtay@vmware.com> <tayhuiqithq@gmail.com>
 Ian Romanick <ian.d.romanick@intel.com> <idr@freedesktop.org>
 Ian Romanick <ian.d.romanick@intel.com> <idr@us.ibm.com>
 Jakob Bornecrantz <wallbraker@gmail.com> <jakob@vmware.com>
 Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.(none)>
 Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.walkyrie.se>
 Jakob Bornecrantz <wallbraker@gmail.com> <jakob@tungstengraphics.com>
 Jakob Bornecrantz <wallbraker@gmail.com> <wallbraker 'at' gmail 'dot' com>
 Jakub Bogusz <qboosh@pld-linux.org> <gboosh@pld-linux.org>
 James Legg <jlegg@feralinteractive.com> <lankyleggy@gmail.com>
 Jan Vesely <jano.vesely@gmail.com> Jan Vesely <jan.vesely@rutgers.edu>
 Jason Ekstrand <jason@jlekstrand.net> <jason.ekstrand@intel.com>
 Jeremy Huddleston <jeremyhu@apple.com> <jeremyhu@freedesktop.org>
 Jeremy Huddleston <jeremyhu@apple.com> <jeremy@tifa.local>
 Jeremy Huddleston <jeremyhu@apple.com> <jeremy@vincent.local>
 Jeremy Huddleston <jeremyhu@apple.com> <jeremy@yuffie.local>
 Jeremy Huddleston <jeremyhu@apple.com> Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 Jeremy Kolb <jkolb@freedesktop.org> <jkolb@brandeis.edu>
 Jerome Glisse <jglisse@redhat.com> <glisse@freedesktop.org>
 Jerome Glisse <jglisse@redhat.com> <glisse@kemper.freedesktop.org>
 Jerome Glisse <jglisse@redhat.com> John Doe <glisse@barney.(none)>
 Jerome Glisse <jglisse@redhat.com> John Doe <glisse@localhost.localdomain>
 Jesse Barnes <jesse.barnes@intel.com> <jbarnes@hobbes.lan>
 Jesse Barnes <jesse.barnes@intel.com> <jbarnes@hobbes.(none)>
 Jesse Barnes <jesse.barnes@intel.com> <jbarnes@jbarnes-desktop.localdomain>
 Jesse Barnes <jesse.barnes@intel.com> <jbarnes@jbarnes-t61.(none)>
 Jesse Barnes <jesse.barnes@intel.com> <jbarnes@virtuousgeek.org>
 Joakim Sindholt <bacn@zhasha.com> <opensource@zhasha.com>
 Joakim Sindholt <bacn@zhasha.com> <zhasha@gallium-dev.(none)>
 Jochen Gerlach <jtg@users.sourceforge.net> jtg <jtg>
 Joel Bosveld <joel.bosveld@gmail.com> <Joel.Bosveld@gmail.com>
 Jonathan Adamczewski <jadamcze@utas.edu.au> <jadamcze@utas.edu.a>
 Jon Turney <jon.turney@dronecode.org.uk> Jon TURNEY <jon.turney@dronecode.org.uk>
 José Fonseca <jfonseca@vmware.com> Jose Fonseca <jfonseca@vmware.com>
 José Fonseca <jfonseca@vmware.com> Jose Fonseca <jrfonseca@tungstengraphics.com>
 José Fonseca <jfonseca@vmware.com> <jfonseca@pegasus.(none)>
 José Fonseca <jfonseca@vmware.com> <jfonseca@titan.(none)>
 José Fonseca <jfonseca@vmware.com> <jose.r.fonseca@gmail.com>
 José Fonseca <jfonseca@vmware.com> <jrfonseca@tungstengraphics.com>
 José Fonseca <jfonseca@vmware.com> <j_r_fonseca@yahoo.co.uk>
 Jouk Jansen <joukj@hrem.nano.tudelft.nl> Jouk Jansen <jouk@hrem.nano.tudelft.nl>
 Jouk Jansen <joukj@hrem.nano.tudelft.nl> Jouk Jansen <joukj@hrem.stm.tudelft.nl>
 Jouk Jansen <joukj@hrem.nano.tudelft.nl> joukj <joukj@tarantella.(none)>
 Jouk Jansen <joukj@hrem.nano.tudelft.nl> Jouk <joukj@tarantella.nano.tudelft.nl>
 Jouk Jansen <joukj@hrem.nano.tudelft.nl> Jouk <joukj@tarantella.(none)>
 Jouk Jansen <joukj@hrem.nano.tudelft.nl> J.Jansen <joukj@tarantella.nano.tudelft.nl>
 Juan Zhao <juan.j.zhao@intel.com> <juan.j.zhao@linux.intel.com>
 Julien Cristau <jcristau@debian.org> <julien.cristau@logilab.fr>
 Julien Isorce <j.isorce@samsung.com> <julien.isorce@gmail.com>
 Kalyan Kondapally <kalyan.kondapally@intel.com> <kondapallykalyancontribute@gmail.com>
 Karl Schultz <karl.w.schultz@gmail.com> Karl Schultze <k.w.schultz@comcast.net>
 Karl Schultz <karl.w.schultz@gmail.com> unknown <kwschult@.na.qualcomm.com>
 Karl Schultz <karl.w.schultz@gmail.com> <k.w.schultz@comcast.net>
 Karl Schultz <karl.w.schultz@gmail.com> <Karl.W.Schultz@gmail.com>
 Karl Schultz <karl.w.schultz@gmail.com> <kschultz@freedesktop.org>
 Keith Harrison <sio2@users.sourceforge.net> sio2 <sio2>
 Keith Packard <keithp@keithp.com> <keithp@koto.keithp.com>
 Keith Packard <keithp@keithp.com> <keithp@neko.keithp.com>
 Keith Whitwell <keithw@vmware.com> <keith@tungstengraphics.com>
 Keith Whitwell <keithw@vmware.com> keithw <keithw@keithw-laptop.(none)>
 Kristian Høgsberg <krh@bitplanet.net> <krh@redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <krh@hinata.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <krh@sasori.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <krh@temari.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <kristian.h.kristensen@intel.com>
 Krzesimir Nowak <qdlacz@gmail.com> <krzesimir@kinvolk.io>
 Li Peng <peng.li@intel.com> <peng.li@linux.intel.com>
 Lucas Stach <dev@lynxeye.de> <l.stach@pengutronix.de>
 Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <dev@mblankhorst.nl>
 Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <m.b.lankhorst@gmail.com>
 Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <maarten.lankhorst@canonical.com>
 Maciej Cencora <m.cencora@gmail.com> <maciej@osiris.(none)>
 Marc-André Lureau <marcandre.lureau@gmail.com> Marc-Andre Lureau <marcandre.lureau@gmail.com>
 Marc Dietrich <marvin24@gmx.de> Marc <marvin24@gmx.de>
 Marc Dietrich <marvin24@gmx.de> marvin24 <marvin24@gmx.de>
 Marcin Ślusarz <marcin.slusarz@gmail.com> Marcin Slusarz <marcin.slusarz@gmail.com>
 Marek Olšák <marek.olsak@amd.com> <maraeo@gmail.com>
 Mario Kleiner <mario.kleiner.de@gmail.com> kleinerm <mario.kleiner@tuebingen.mpg.de>
 Mario Kleiner <mario.kleiner.de@gmail.com> <mario.kleiner@tuebingen.mpg.de>
 Mark Mueller <markkmueller@gmail.com> <MarkKMueller@gmail.com>
 Marta Lofstedt <marta.lofstedt@intel.com> <marta.lofstedt@linux.intel.com>
 Martin Peres <martin.peres@linux.intel.com> <martin.peres@labri.fr>
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@gmx.net>
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@web.de>
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Frohlich <M.Froehlich@science-computing.de>
 Mathias Fröhlich <mathias.froehlich@gmx.net> <frohlich8@users.sourceforge.net>
 Mathias Fröhlich <mathias.froehlich@gmx.net> <Mathias.Froehlich@gmx.net>
 Mathias Fröhlich <mathias.froehlich@gmx.net> <Mathias.Froehlich@web.de>
 Mathias Fröhlich <mathias.froehlich@gmx.net> M.Froehlich@science-computing.de <M.Froehlich@science-computing.de>
 Matthew W. S. Bell <matthew@bells23.org.uk> Matthew Bell <matthew@bells23.org.uk>
 Maxence Le Doré <maxence.ledore@gmail.com> Maxence Le Dore <maxence.ledore@gmail.com>
 Micah Fedke <micah.fedke@collabora.co.uk> <M.Fedke@Astronautics.com>
 Michal Krol <michal@vmware.com> <michal@tungstengraphics.com>
 Michal Krol <michal@vmware.com> Michal Krol <michal@ubuntu-vbox.(none)>
 Michal Krol <michal@vmware.com> Michal Krol <mjkrol@gmail.org>
 Michal Krol <michal@vmware.com> michal <michal@capacitor.(none)>
 Michal Krol <michal@vmware.com> michal <michal@michal-laptop.(none)>
 Michal Krol <michal@vmware.com> michal <michal@quad.(none)>
 Michal Krol <michal@vmware.com> michal <michal@transistor.(none)>
 Michal Krol <michal@vmware.com> Michal <michal@tungstengraphics.com>
 Michal Krol <michal@vmware.com> michal <michal@wmvare.com>
 Michel Dänzer <michel@daenzer.net> <michel.daenzer@amd.com>
 Michel Dänzer <michel@daenzer.net> <daenzer@vmware.com>
 Michel Dänzer <michel@daenzer.net> <michel@tungstengraphics.com>
 Michel Dänzer <michel@daenzer.net> Michel Daenzer <michel.daenzer@amd.com>
 Michel Dänzer <michel@daenzer.net> Michel Daenzer <daenzer@localhost.(none)>
 Mike Kaplinskiy <mike.kaplinskiy@gmail.com> Mike Kaplinksiy <mike.kaplinskiy@gmail.com>
 Mike Kaplinskiy <mike.kaplinskiy@gmail.com> <mike.kaplinskiy@gmai.com>
 Mike Stroyan <mike@lunarg.com> <mike@LunarG.com>
 Nian Wu <nian.wu@intel.com> <nian@graphics.(none)>
 Nian Wu <nian.wu@intel.com> <nian@tinderbox.sh.intel.com>
 Nick Bowler <nbowler@draconx.ca>
 Nick Sarnie <commendsarnex@gmail.com>
 Nicolai Hähnle <nicolai.haehnle@amd.com> <nhaehnle@gmail.com>
 Nicolai Hähnle <nicolai.haehnle@amd.com> Nicolai Haehnle <nhaehnle@gmail.com>
 Nicolai Hähnle <nicolai.haehnle@amd.com> Nicolai Haehnle <prefect_@gmx.net>
 Nicolai Hähnle <nicolai.haehnle@amd.com> Nicolai Haehnle <prefect@upb.de>
 Nigel Stewart <nigels@users.sourceforge.net> <nigels@sourceforge.net>
 Nigel Stewart <nigels@users.sourceforge.net> <nstewart@nvidia.com>
 nobled <nobled@dreamwidth.org> <nobled2@nobled2-karmic.(none)>
 Oliver McFadden <oliver.mcfadden@linux.intel.com> <z3ro.geek@gmail.com>
 Owain Ainsworth <zerooa@googlemail.com> Owain G. Ainsworth <oga@openbsd.org>
 Owen W. Taylor <otaylor@fishsoup.net> Owen Taylor <otaylor@snell.localdomain>
 Patrice Mandin <patmandin@gmail.com> <patrice@manoir.racoon.city>
 Patrice Mandin <patmandin@gmail.com> <pmandin@caramail.com>
 Patrice Mandin <patmandin@gmail.com> <pmandin@freedesktop.org>
 Pauli Nieminen <pauli.nieminen@linux.intel.com> <suokkos@gmail.com>
 Paulo Zanoni <paulo.r.zanoni@intel.com> Paulo Zanoni <pzanoni@mandriva.com>
 Paul Seidler <sepek@exherbo.org> Paul Seidler <pl.seidler@googlemail.com>
 Pekka Paalanen <pekka.paalanen@collabora.co.uk> <ppaalanen@gmail.com>
 Pekka Paalanen <pekka.paalanen@collabora.co.uk> <pq@iki.fi>
 Peter Hutterer <peter.hutterer@who-t.net> <peter@cs.unisa.edu.au>
 Pierre-Eric Pelloux-Prayer <pelloux@gmail.com> pepp <pelloux@gmail.com>
 Pierre Willenbrock <pierre@pirsoft.de> Pierre Willenbrok <pierre@pirsoft.de>
 Quentin Glidic <sardemff7+git@sardemff7.net> <sardemff7@sardemff7.net>
 RALOVICH, Kristóf <tade60@freemail.hu> <kristof.ralovich@gmail.com>
 Richard Li <richardradeon@gmail.com> <RichardZ.Li@amd.com>
 # The next ones are not 100% sure
 Richard Li <richardradeon@gmail.com> richard <richard@richard-desktop3.(none)>
 Richard Li <richardradeon@gmail.com> richard <richard@richard-desktop.(none)>
 Richard Li <richardradeon@gmail.com> root <root@richard-desktop.(none)>
 Richard Sandiford <rsandifo@linux.vnet.ibm.com> <r.sandiford@uk.ibm.com>
 Rob Clark <robclark@freedesktop.org> <Rob Clark robdclark@freedesktop.org>
 Rob Clark <robclark@freedesktop.org> <robdclark@gmail.com>
 Robert Bragg <robert@sixbynine.org> <robert@linux.intel.com>
 Robert Ellison <papillo@vmware.com> <papillo@i965-laptop.(none)>
 Robert Ellison <papillo@vmware.com> <papillo@tungstengraphics.com>
 Robert Hooker <sarvatt@ubuntu.com> <robert.hooker@canonical.com>
 Roland Scheidegger <sroland@vmware.com> <rscheidegger@gmx.ch>
 Roland Scheidegger <sroland@vmware.com> <sroland@tungstengraphics.com>
 Roy Spliet <rspliet@eclipso.eu> <r.spliet@student.tudelft.nl>
 Rune Petersen <rune@megahurts.dk> Rune Peterson <rune@megahurts.dk>
 Ryan Houdek <sonicadvance1@gmail.com> <Sonicadvance1@gmail.com>
 Sam Hocevar <sam@hocevar.net> Sam Hocevar <sam@zoy.org>
 Samuel Iglesias Gonsálvez <siglesias@igalia.com> Samuel Iglesias Gonsalvez <siglesias@igalia.com>
 Sean D'Epagnier <sean@depagnier.com> <geckosenator@freedesktop.org>
 Serge Martin <edb+mesa@sigluy.net> Serge Martin (EdB) <edb+mesa@sigluy.net>
 Serge Martin <edb+mesa@sigluy.net> EdB <edb+mesa@sigluy.net>
 Sinclair Yeh <syeh@vmware.com> <sinclair.yeh@intel.com>
 Stefan Brüns <stefan.bruens@rwth-aachen.de> <Stefan.Bruens@rwth-aachen.de>
 Stéphane Marchesin <marcheu@chromium.org> Stephane Marchesin <marchesin@icps.u-strasbg.fr>
 Stéphane Marchesin <marcheu@chromium.org> Stephane Marchesin <stephane.marchesin@gmail.com>
 Sven M. Hallberg <pesco@users.sourceforge.net> pesco <pesco>
 Tapani Pälli <tapani.palli@intel.com> <tapani.palli@gmail.com>
 Tapani Pälli <tapani.palli@intel.com> Tapani <tapani.palli@intel.com>
 Thierry Reding <treding@nvidia.com> <thierry@gilfi.de>
 Thierry Reding <treding@nvidia.com> <thierry.reding@avionic-design.de>
 Thierry Vignaud <thierry.vignaud@gmail.com> <tvignaud@mandriva.com>
 Thomas Balling Sørensen <tball@io.dk> <tball@tball-laptop.(none)>
 Thomas Hellstrom <thellstrom@vmware.com> Thomas <thellstrom@vmware.com>
 Thomas Hellstrom <thellstrom@vmware.com> Thomas Hellstrom <thellstrom-at-vmware-dot-com>
 Thomas Hellstrom <thellstrom@vmware.com> Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
 Thomas Hellstrom <thellstrom@vmware.com> Thomas Hellstrom <thomas@tungstengraphics.com>
 Thomas Hellstrom <thellstrom@vmware.com> Thomas Hellström <thomas@tungstengraphics.com>
 Thomas Tanner <tanner@gmx.net> tanner <tanner>
 Tilman Sauerbeck <tilman@code-monkey.de> <tilman@freedesktop.org>
 Timothy Arceri <timothy.arceri@collabora.com> <t_arceri@yahoo.com.au>
 Timothy Arceri <timothy.arceri@collabora.com> Timothy <t_arceri@yahoo.com.au>
 Tom Fogal <tfogal@alumni.unh.edu> <tfogal@sci.utah.edu>
 Tom Stellard <thomas.stellard@amd.com> <tstellar@gmail.com>
 Tom Stellard <thomas.stellard@amd.com> Thomas Stellard <tom.stellard@amd.com>
 Tormod Volden <debian.tormod@gmail.com> <lists.tormod@gmail.com>
 Török Edwin <edwin+mesa@etorok.net> Török Edvin <edwintorok@gmail.com>
 Török Edwin <edwin+mesa@etorok.net> <edwintorok@gmail.com>
 Ville Syrjälä <ville.syrjala@linux.intel.com> Ville Syrjala <syrjala@freedesktop.org>
 Ville Syrjälä <ville.syrjala@linux.intel.com> Ville Syrjala <syrjala@sci.fi>
 Vincent Lejeune <vljn@ovi.com> <peluche.canard@gmail.com>
 Vinson Lee <vlee@freedesktop.org> <vlee@vmware.com>
 Zhenyu Wang <zhenyuw@linux.intel.com> Wang Zhenyu <zhenyu.z.wang@intel.com>
 Zack Rusin <zackr@vmware.com> <zack@kde.org>
 Zack Rusin <zackr@vmware.com> <zack@pixel.(none)>
 Zack Rusin <zackr@vmware.com> <zack@tungstengraphics.com>
 Zhang <zxpmyth@yahoo.com.cn> zhang <zxpmyth@yahoo.com.cn>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,101 +0,0 @@
 language: c
 sudo: false
 cache:
  directories:
    - $HOME/.ccache
 addons:
  apt:
    packages:
      - libdrm-dev
      - libudev-dev
      - x11proto-xf86vidmode-dev
      - libexpat1-dev
      - libxcb-dri2-0-dev
      - libx11-xcb-dev
      - llvm-3.4-dev
      - scons
 env:
  global:
    - XORG_RELEASES=http://xorg.freedesktop.org/releases/individual
    - XCB_RELEASES=http://xcb.freedesktop.org/dist
    - XORGMACROS_VERSION=util-macros-1.19.0
    - GLPROTO_VERSION=glproto-1.4.17
    - DRI2PROTO_VERSION=dri2proto-2.8
    - DRI3PROTO_VERSION=dri3proto-1.0
    - PRESENTPROTO_VERSION=presentproto-1.0
    - LIBPCIACCESS_VERSION=libpciaccess-0.13.4
    - LIBDRM_VERSION=libdrm-2.4.65
    - XCBPROTO_VERSION=xcb-proto-1.11
    - LIBXCB_VERSION=libxcb-1.11
    - LIBXSHMFENCE_VERSION=libxshmfence-1.2
    - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
  matrix:
    - BUILD=make
    - BUILD=scons
 install:
  - export PATH="/usr/lib/ccache:$PATH"
  - pip install --user mako
  # Install dependencies where we require specific versions (or where
  # disallowed by Travis CI's package whitelisting).
  - wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
  - tar -jxvf $XORGMACROS_VERSION.tar.bz2
  - (cd $XORGMACROS_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XORG_RELEASES/proto/$GLPROTO_VERSION.tar.bz2
  - tar -jxvf $GLPROTO_VERSION.tar.bz2
  - (cd $GLPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XORG_RELEASES/proto/$DRI2PROTO_VERSION.tar.bz2
  - tar -jxvf $DRI2PROTO_VERSION.tar.bz2
  - (cd $DRI2PROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XORG_RELEASES/proto/$DRI3PROTO_VERSION.tar.bz2
  - tar -jxvf $DRI3PROTO_VERSION.tar.bz2
  - (cd $DRI3PROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XORG_RELEASES/proto/$PRESENTPROTO_VERSION.tar.bz2
  - tar -jxvf $PRESENTPROTO_VERSION.tar.bz2
  - (cd $PRESENTPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XCB_RELEASES/$XCBPROTO_VERSION.tar.bz2
  - tar -jxvf $XCBPROTO_VERSION.tar.bz2
  - (cd $XCBPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XCB_RELEASES/$LIBXCB_VERSION.tar.bz2
  - tar -jxvf $LIBXCB_VERSION.tar.bz2
  - (cd $LIBXCB_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XORG_RELEASES/lib/$LIBPCIACCESS_VERSION.tar.bz2
  - tar -jxvf $LIBPCIACCESS_VERSION.tar.bz2
  - (cd $LIBPCIACCESS_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget http://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
  - tar -jxvf $LIBDRM_VERSION.tar.bz2
  - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix && make install)
  - wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
  - tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
  - (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make install)
 # Disabled LLVM (and therefore r300 and r600) because the build fails
 # with "undefined reference to `clock_gettime'" and "undefined
 # reference to `setupterm'" in llvmpipe.
 script:
  - if test "x$BUILD" = xmake; then
      ./autogen.sh --enable-debug
        --disable-gallium-llvm
        --with-egl-platforms=x11,drm
        --with-dri-drivers=i915,i965,radeon,r200,swrast,nouveau
        --with-gallium-drivers=svga,swrast,vc4,virgl
        ;
      make && make check;
    elif test x$BUILD = xscons; then
      scons;
    fi
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,81 +21,43 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 # use c99 compiler by default
 ifeq ($(LOCAL_CC),)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_CFLAGS += -D_GNU_SOURCE
+LOCAL_CC := $(HOST_CC) -std=c99
 else
 LOCAL_CC := $(TARGET_CC) -std=c99
 endif
 endif
 LOCAL_C_INCLUDES += \
 	$(MESA_TOP)/src \
 	$(MESA_TOP)/include
 MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 major := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
 minor := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
 LOCAL_CFLAGS += \
-	-Wno-unused-parameter \
+	-DANDROID_VERSION=0x0$(major)0$(minor)
 	-Wno-date-time \
 	-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
 	-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \
 	-DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 LOCAL_CFLAGS += \
-	-D__STDC_LIMIT_MACROS \
+	-DPTHREADS \
 	-DHAVE___BUILTIN_EXPECT \
 	-DHAVE___BUILTIN_FFS \
 	-DHAVE___BUILTIN_FFSLL \
 	-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
 	-DHAVE_FUNC_ATTRIBUTE_UNUSED \
 	-DHAVE_FUNC_ATTRIBUTE_FORMAT \
 	-DHAVE_FUNC_ATTRIBUTE_PACKED \
 	-DHAVE___BUILTIN_CTZ \
 	-DHAVE___BUILTIN_POPCOUNT \
 	-DHAVE___BUILTIN_POPCOUNTLL \
 	-DHAVE___BUILTIN_CLZ \
 	-DHAVE___BUILTIN_CLZLL \
 	-DHAVE___BUILTIN_UNREACHABLE \
 	-DHAVE_PTHREAD=1 \
 	-DHAVE_DLOPEN \
 	-fvisibility=hidden \
 	-Wno-sign-compare
 # mesa requires at least c99 compiler
 LOCAL_CONLYFLAGS += \
 	-std=c99
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
-	-DUSE_X86_ASM \
+	-DUSE_X86_ASM
 endif
 endif
 ifeq ($(MESA_ENABLE_LLVM),true)
 LOCAL_CFLAGS += \
 	-DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \
 	-D__STDC_CONSTANT_MACROS \
 	-D__STDC_FORMAT_MACROS \
 	-D__STDC_LIMIT_MACROS
 endif
 LOCAL_CPPFLAGS += \
 	$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
 	-Wno-error=non-virtual-dtor \
 	-Wno-non-virtual-dtor
 ifeq ($(MESA_LOLLIPOP_BUILD),true)
  LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
  LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
 else
  LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
 endif
 # uncomment to keep the debug symbols
 #LOCAL_STRIP_MODULE := false
 ifeq ($(strip $(LOCAL_MODULE_TAGS)),)
 LOCAL_MODULE_TAGS := optional
 endif
 # Quiet down the build system and remove any .h files from the sources
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
--- a/Android.mk
+++ b/Android.mk
@@ -24,33 +24,20 @@
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
 #   classic drivers: i915 i965
-#   gallium drivers: swrast freedreno i915g ilo nouveau r300g r600g radeonsi vc4 virgl vmwgfx
+#   gallium drivers: swrast i915g nouveau r300g r600g radeonsi vmwgfx
 #
 # The main target is libGLES_mesa.  For each classic driver enabled, a DRI
 # module will also be built.  DRI modules will be loaded by libGLES_mesa.
 MESA_TOP := $(call my-dir)
 MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
 MESA_ANDROID_MINOR_VERSION := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
 MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSION)
 ifeq ($(filter 1 2 3 4,$(MESA_ANDROID_MAJOR_VERSION)),)
 MESA_LOLLIPOP_BUILD := true
 else
 define local-generated-sources-dir
 $(call local-intermediates-dir)
 endef
 endif
 MESA_DRI_MODULE_REL_PATH := dri
 MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH)
 MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH)
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python
 DRM_TOP := external/drm
 DRM_GRALLOC_TOP := hardware/drm_gralloc
 classic_drivers := i915 i965
-gallium_drivers := swrast freedreno i915g ilo nouveau r300g r600g radeonsi vmwgfx vc4 virgl
+gallium_drivers := swrast i915g nouveau r300g r600g radeonsi vmwgfx
 MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
@@ -82,27 +69,26 @@ else
 MESA_BUILD_GALLIUM := false
 endif
 MESA_ENABLE_LLVM := $(if $(filter radeonsi,$(MESA_GPU_DRIVERS)),true,false)
 # add subdirectories
 ifneq ($(strip $(MESA_GPU_DRIVERS)),)
 SUBDIRS := \
 	src/gbm \
 	src/loader \
 	src/mapi \
-	src/compiler \
+	src/glsl \
 	src/mesa \
-	src/util \
+	src/egl/main
 	src/egl \
 	src/mesa/drivers/dri
-INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
+ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
 SUBDIRS += \
 	src/egl/drivers/dri2 \
 	src/mesa/drivers/dri
 endif
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
-INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
+SUBDIRS += src/gallium
 endif
-include $(INC_DIRS)
+mkfiles := $(patsubst %,$(MESA_TOP)/%/Android.mk,$(SUBDIRS))
 include $(mkfiles)
 endif
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -1,16 +0,0 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libmesa_*_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/i9*5_dri_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libglapi_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libGLES_mesa_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/mesa_*_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/glsl_compiler_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/STATIC_LIBRARIES/libmesa_glsl_utils_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/i9?5_dri_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libglapi_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libGLES_mesa_intermediates)
 $(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermediates)
 $(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates)
 $(call add-clean-step, rm -rf $(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)
--- a/271
+++ b/271
@@ -0,0 +1,271 @@
 # Top-level Mesa makefile
 TOP = .
 SUBDIRS = src
 # The git command below generates an empty string when we're not
 # building in a GIT tree (i.e., building from a release tarball).
 default: $(TOP)/configs/current
 	@$(TOP)/bin/extract_git_sha1
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE)) || exit 1 ; \
 		fi \
 	done
 all: default
 doxygen:
 	cd doxygen && $(MAKE)
 check:
 	make -C src/glsl/tests check
 	make -C tests check
 clean:
 	-@touch $(TOP)/configs/current
 	-@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE) clean) ; \
 		fi \
 	done
 	-@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current
 realclean: clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
 	-rm -f $(TOP)/configs/autoconf
 	-rm -rf autom4te.cache
 	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
 	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
 distclean: realclean
 install:
 	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE) install) || exit 1 ; \
 		fi \
 	done
 .PHONY: default doxygen clean realclean distclean install check
 # If there's no current configuration file
 $(TOP)/configs/current:
 	@echo
 	@echo
 	@echo "Please choose a configuration from the following list:"
 	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"
 	@echo
 	@echo "Then type 'make <config>' (ex: 'make linux-x86')"
 	@echo
 	@echo "Or, run './configure' then 'make'"
 	@echo "See './configure --help' for details"
 	@echo
 	@echo "(ignore the following error message)"
 	@exit 1
 # Rules to set/install a specific build configuration
 aix \
 aix-64 \
 aix-64-static \
 aix-gcc \
 aix-static \
 autoconf \
 bluegene-osmesa \
 bluegene-xlc-osmesa \
 catamount-osmesa-pgi \
 darwin \
 darwin-fat-32bit \
 darwin-fat-all \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
 freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
 hpux11-32 \
 hpux11-32-static \
 hpux11-32-static-nothreads \
 hpux11-64 \
 hpux11-64-static \
 hpux11-ia64 \
 hpux11-ia64-static \
 hpux9 \
 hpux9-gcc \
 irix6-64 \
 irix6-64-static \
 irix6-n32 \
 irix6-n32-static \
 irix6-o32 \
 irix6-o32-static \
 linux \
 linux-i965 \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
 linux-dri \
 linux-dri-debug \
 linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
 linux-dri-xcb \
 linux-egl \
 linux-indirect \
 linux-fbdev \
 linux-ia64-icc \
 linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
 linux-llvm \
 linux-llvm-debug \
 linux-opengl-es \
 linux-osmesa \
 linux-osmesa-static \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-profile \
 linux-sparc \
 linux-sparc5 \
 linux-static \
 linux-ultrasparc \
 linux-tcc \
 linux-x86 \
 linux-x86-debug \
 linux-x86-32 \
 linux-x86-64 \
 linux-x86-64-debug \
 linux-x86-64-profile \
 linux-x86-64-static \
 linux-x86-profile \
 linux-x86-static \
 netbsd \
 openbsd \
 osf1 \
 osf1-static \
 solaris-x86 \
 solaris-x86-gcc \
 solaris-x86-gcc-static \
 sunos4 \
 sunos4-gcc \
 sunos4-static \
 sunos5 \
 sunos5-gcc \
 sunos5-64-gcc \
 sunos5-smp \
 sunos5-v8 \
 sunos5-v8-static \
 sunos5-v9 \
 sunos5-v9-static \
 sunos5-v9-cc-g++ \
 ultrix-gcc:
 	@ if test -f configs/current -o -L configs/current; then \
 		if ! cmp configs/$@ configs/current > /dev/null; then \
 			echo "Please run 'make realclean' before changing configs" ; \
 			exit 1 ; \
 		fi ; \
 	else \
 		cd configs && rm -f current && ln -s $@ current ; \
 	fi
 	$(MAKE) default
 # Rules for making release tarballs
 PACKAGE_VERSION=8.1-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 EXTRA_FILES = \
 	aclocal.m4					\
 	configure					\
 	tests/Makefile.in				\
 	tests/glx/Makefile.in				\
 	src/glsl/glsl_parser.cpp			\
 	src/glsl/glsl_parser.h				\
 	src/glsl/glsl_lexer.cpp				\
 	src/glsl/glcpp/glcpp-lex.c			\
 	src/glsl/glcpp/glcpp-parse.c			\
 	src/glsl/glcpp/glcpp-parse.h			\
 	src/mesa/main/api_exec_es1.c			\
 	src/mesa/main/api_exec_es1_dispatch.h		\
 	src/mesa/main/api_exec_es1_remap_helper.h	\
 	src/mesa/main/api_exec_es2.c			\
 	src/mesa/main/api_exec_es2_dispatch.h		\
 	src/mesa/main/api_exec_es2_remap_helper.h	\
 	src/mesa/program/lex.yy.c			\
 	src/mesa/program/program_parse.tab.c		\
 	src/mesa/program/program_parse.tab.h
 IGNORE_FILES = \
 	-x autogen.sh
 parsers: configure
 	-@touch $(TOP)/configs/current
 	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
 	$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
 	$(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h
 # Everything for new a Mesa release:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \
 	$(PACKAGE_NAME).tar.bz2 \
 	$(PACKAGE_NAME).zip \
 tarballs: md5
 	rm -f ../$(PACKAGE_DIR) $(PACKAGE_NAME).tar
 # Helper for autoconf builds
 ACLOCAL = aclocal
 ACLOCAL_FLAGS =
 AUTOCONF = autoconf
 AC_FLAGS =
 aclocal.m4: configure.ac acinclude.m4
 	$(ACLOCAL) $(ACLOCAL_FLAGS)
 configure: configure.ac aclocal.m4 acinclude.m4
 	$(AUTOCONF) $(AC_FLAGS)
 manifest.txt: .git
 	( \
 		ls -1 $(EXTRA_FILES) ; \
 		git ls-files $(IGNORE_FILES) \
 	) | sed -e '/^\(.*\/\)\?\./d' -e "s@^@$(PACKAGE_DIR)/@" > $@
 ../$(PACKAGE_DIR):
 	ln -s $(PWD) $@
 $(PACKAGE_NAME).tar: parsers ../$(PACKAGE_DIR) manifest.txt
 	cd .. ; tar -cf $(PACKAGE_DIR)/$(PACKAGE_NAME).tar -T $(PACKAGE_DIR)/manifest.txt
 $(PACKAGE_NAME).tar.gz: $(PACKAGE_NAME).tar ../$(PACKAGE_DIR)
 	gzip --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.gz
 $(PACKAGE_NAME).tar.bz2: $(PACKAGE_NAME).tar
 	bzip2 --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.bz2
 $(PACKAGE_NAME).zip: parsers ../$(PACKAGE_DIR) manifest.txt
 	rm -f $(PACKAGE_NAME).zip ; \
 	cd .. ; \
 	zip -q -@ $(PACKAGE_NAME).zip < $(PACKAGE_DIR)/manifest.txt ; \
 	mv $(PACKAGE_NAME).zip $(PACKAGE_DIR)
 md5: $(ARCHIVES)
 	@-md5sum $(PACKAGE_NAME).tar.gz
 	@-md5sum $(PACKAGE_NAME).tar.bz2
 	@-md5sum $(PACKAGE_NAME).zip
 am--refresh:
 .PHONY: tarballs md5 am--refresh
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,72 +0,0 @@
 # Copyright © 2012 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice (including the next
 # paragraph) shall be included in all copies or substantial portions of the
 # Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 SUBDIRS = src
 AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-dri \
 	--enable-dri3 \
 	--enable-egl \
 	--enable-gallium-tests \
 	--enable-gallium-osmesa \
 	--enable-gallium-llvm \
 	--enable-gbm \
 	--enable-gles1 \
 	--enable-gles2 \
 	--enable-glx \
 	--enable-glx-tls \
 	--enable-nine \
 	--enable-opencl \
 	--enable-opengl \
 	--enable-va \
 	--enable-vdpau \
 	--enable-xa \
 	--enable-xvmc \
 	--disable-llvm-shared-libs \
 	--with-egl-platforms=x11,wayland,drm,surfaceless \
 	--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
 	--with-gallium-drivers=i915,ilo,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl \
 	--with-vulkan-drivers=intel
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = \
 	autogen.sh \
 	common.py \
 	docs \
 	doxygen \
 	scons \
 	SConstruct
 noinst_HEADERS = \
 	include/c99_alloca.h \
 	include/c99_compat.h \
 	include/c99_math.h \
 	include/c11 \
 	include/D3D9 \
 	include/HaikuGL \
 	include/no_extern_c.h \
 	include/pci_ids
 # We list some directories in EXTRA_DIST, but don't actually want to include
 # the .gitignore files in the tarball.
 dist-hook:
 	find $(distdir) -name .gitignore -exec $(RM) {} +
--- a/106
+++ b/106
@@ -1,106 +0,0 @@
 Overview:
 	This file is similar in syntax (or more precisly a subset) of what is
 	used by the MAINTAINERS file in the linux kernel.  Some fields do not
 	apply, for example, in all cases, send patches to:
 		mesa-dev@lists.freedesktop.org
 	and in all cases the patchwork instance is:
 		https://patchwork.freedesktop.org/project/mesa/
 	The purpose is not exactly the same the MAINTAINERS file in the linux
 	kernel, as there are not official/formal maintainers of different
 	subsystems in mesa, but is meant to give an idea of who to CC for
 	various patches for review, and to allow the use of
 	scripts/get_reviewer.pl as git --cc-cmd.
 Usage:
 	When sending patches:
 		git send-email --cc-cmd ./scripts/get_reviewer.pl ...
 	Or to configure as default:
 		git config sendemail.cccmd ./scripts/get_reviewer.pl
 Descriptions of section entries:
 	R: Designated reviewer: FullName <address@domain>
 	   These reviewers should be CCed on patches.
 	F: Files and directories with wildcard patterns.
 	   A trailing slash includes all files and subdirectory files.
 	   F:	drivers/net/	all files in and below drivers/net
 	   F:	drivers/net/*	all files in drivers/net, but not below
 	   F:	*/net/*		all files in "any top level directory"/net
 	   One pattern per line.  Multiple F: lines acceptable.
 	N: Files and directories with regex patterns.
 	   N:	[^a-z]tegra	all files whose path contains the word tegra
 	   One pattern per line.  Multiple N: lines acceptable.
 	   scripts/get_maintainer.pl has different behavior for files that
 	   match F: pattern and matches of N: patterns.  By default,
 	   get_maintainer will not look at git log history when an F: pattern
 	   match occurs.  When an N: match occurs, git log history is used
 	   to also notify the people that have git commit signatures.
 Maintainers List (try to look for most precise areas first)
 Note: this is an opt-in system, I have not tried to add anyone who hasn't
 either asked me or sent a patch to add themselves.
 		-----------------------------------
 NIR
 R:	Jason Ekstrand <jason@jlekstrand.net>
 F:	src/compiler/nir/
 DOCUMENTATION
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: docs/
 F: doxygen/
 COMPATIBILITY HEADERS
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: include/c99*
 DRI LOADER
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: src/loader/
 GALLIUM LOADER
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: src/gallium/auxiliary/pipe-loader/
 F: src/gallium/auxiliary/target-helpers/
 GALLIUM TARGETS
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: src/gallium/targets/
 AUTOCONF BUILD
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: configure.ac
 F: */Automake.inc
 F: */Makefile.*am
 F: */Makefile.sources
 SCONS BUILD
 F: scons/
 F: */SConscript*
 F: */Makefile.sources
 ANDROID BUILD
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: CleanSpec.mk
 F: */Android.*mk
 F: */Makefile.sources
 WAYLAND EGL SUPPORT
 R: Daniel Stone <daniels@collabora.com>
 F: src/egl/wayland/*
 F: src/egl/drivers/dri2/platform_wayland.c
 FREEDRENO
 R:	Rob Clark <robclark@freedesktop.org>
 F:	src/gallium/drivers/freedreno/
--- a/39
+++ b/39
@@ -1,7 +1,7 @@
 #######################################################################
 # Top-level SConstruct
 #
-# For example, invoke scons as
+# For example, invoke scons as 
 #
 #   scons build=debug llvm=yes machine=x86
 #
@@ -12,13 +12,13 @@
 #   build='debug'
 #   llvm=True
 #   machine='x86'
-#
+# 
 # Invoke
 #
 #   scons -h
 #
 # to get the full list of options. See scons manpage for more info.
-#
+#  
 import os
 import os.path
@@ -36,7 +36,7 @@ common.AddOptions(opts)
 env = Environment(
 	options = opts,
 	tools = ['gallium'],
-	toolpath = ['#scons'],
+	toolpath = ['#scons'],	
 	ENV = os.environ,
 )
@@ -53,22 +53,22 @@ else:
    print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
    print
    print '  scons %s' % ' '.join(targets)
-    print
+    print 
    COMMAND_LINE_TARGETS.append(targets)
 Help(opts.GenerateHelpText(env))
 # fail early for a common error on windows
 if env['gles']:
    try:
        import libxml2
    except ImportError:
        raise SCons.Errors.UserError, "GLES requires libxml2-python to build"
 #######################################################################
 # Environment setup
 with open("VERSION") as f:
  mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
    ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
 ])
 # Includes
 env.Prepend(CPPPATH = [
 	'#/include',
@@ -80,18 +80,16 @@ env.Append(CPPPATH = [
 	'#/src/gallium/winsys',
 ])
 if env['msvc']:
    env.Append(CPPPATH = ['#include/c99'])
 # for debugging
 #print env.Dump()
 # Add a check target for running tests
 check = env.Alias('check')
 env.AlwaysBuild(check)
 #######################################################################
-# Invoke host SConscripts
+# Invoke host SConscripts 
-#
+# 
 # For things that are meant to be run on the native host build machine, instead
 # of the target machine.
 #
@@ -117,6 +115,9 @@ if env['crosscompile'] and not env['embedded']:
    host_env['hostonly'] = True
    assert host_env['crosscompile'] == False
    if host_env['msvc']:
        host_env.Append(CPPPATH = ['#include/c99'])
    target_env = env
    env = host_env
    Export('env')
--- a/1
+++ b/1
@@ -1 +0,0 @@
 11.3.0-devel
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -0,0 +1,119 @@
 # A few convenience macros for Mesa, mostly to keep all the platform
 # specifics out of configure.ac.
 # MESA_PIC_FLAGS()
 #
 # Find out whether to build PIC code using the option --enable-pic and
 # the configure enable_static/enable_shared settings. If PIC is needed,
 # figure out the necessary flags for the platform and compiler.
 #
 # The platform checks have been shamelessly taken from libtool and
 # stripped down to just what's needed for Mesa. See _LT_COMPILER_PIC in
 # /usr/share/aclocal/libtool.m4 or
 # http://git.savannah.gnu.org/gitweb/?p=libtool.git;a=blob;f=libltdl/m4/libtool.m4;hb=HEAD
 #
 AC_DEFUN([MESA_PIC_FLAGS],
 [AC_REQUIRE([AC_PROG_CC])dnl
 AC_ARG_VAR([PIC_FLAGS], [compiler flags for PIC code])
 AC_ARG_ENABLE([pic],
    [AS_HELP_STRING([--disable-pic],
        [compile PIC objects @<:@default=enabled for shared builds
        on supported platforms@:>@])],
    [enable_pic="$enableval"
    test "x$enable_pic" = x && enable_pic=auto],
    [enable_pic=auto])
 # disable PIC by default for static builds
 if test "$enable_pic" = auto && test "$enable_static" = yes; then
    enable_pic=no
 fi
 # if PIC hasn't been explicitly disabled, try to figure out the flags
 if test "$enable_pic" != no; then
    AC_MSG_CHECKING([for $CC option to produce PIC])
    # allow the user's flags to override
    if test "x$PIC_FLAGS" = x; then
        # see if we're using GCC
        if test "x$GCC" = xyes; then
            case "$host_os" in
            aix*|beos*|cygwin*|irix5*|irix6*|osf3*|osf4*|osf5*)
                # PIC is the default for these OSes.
                ;;
            mingw*|os2*|pw32*)
                # This hack is so that the source file can tell whether
                # it is being built for inclusion in a dll (and should
                # export symbols for example).
                PIC_FLAGS="-DDLL_EXPORT"
                ;;
            darwin*|rhapsody*)
                # PIC is the default on this platform
                # Common symbols not allowed in MH_DYLIB files
                PIC_FLAGS="-fno-common"
                ;;
            hpux*)
                # PIC is the default for IA64 HP-UX and 64-bit HP-UX,
                # but not for PA HP-UX.
                case $host_cpu in
                hppa*64*|ia64*)
                    ;;
                *)
                    PIC_FLAGS="-fPIC"
                    ;;
                esac
                ;;
            *)
                # Everyone else on GCC uses -fPIC
                PIC_FLAGS="-fPIC"
                ;;
            esac
        else # !GCC
            case "$host_os" in
            hpux9*|hpux10*|hpux11*)
                # PIC is the default for IA64 HP-UX and 64-bit HP-UX,
                # but not for PA HP-UX.
                case "$host_cpu" in
                hppa*64*|ia64*)
                    # +Z the default
                    ;;
                *)
                    PIC_FLAGS="+Z"
                    ;;
                esac
                ;;
            linux*|k*bsd*-gnu)
                case `basename "$CC"` in
                icc*|ecc*|ifort*)
                    PIC_FLAGS="-KPIC"
                    ;;
                pgcc*|pgf77*|pgf90*|pgf95*)
                    # Portland Group compilers (*not* the Pentium gcc
                    # compiler, which looks to be a dead project)
                    PIC_FLAGS="-fpic"
                    ;;
                ccc*)
                    # All Alpha code is PIC.
                    ;;
                xl*)
                    # IBM XL C 8.0/Fortran 10.1 on PPC
                    PIC_FLAGS="-qpic"
                    ;;
                *)
                    case `$CC -V 2>&1 | sed 5q` in
                    *Sun\ C*|*Sun\ F*)
                        # Sun C 5.9 or Sun Fortran
                        PIC_FLAGS="-KPIC"
                        ;;
                    esac
                esac
                ;;
            solaris*)
                PIC_FLAGS="-KPIC"
                ;;
            sunos4*)
                PIC_FLAGS="-PIC"
                ;;
            esac
        fi # GCC
    fi # PIC_FLAGS
    AC_MSG_RESULT([$PIC_FLAGS])
 fi
 AC_SUBST([PIC_FLAGS])
 ])# MESA_PIC_FLAGS
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,76 +0,0 @@
 # http://www.appveyor.com/docs/appveyor-yml
 #
 # To setup AppVeyor for your own personal repositories do the following:
 # - Sign up
 # - Add a new project
 # - Select Git and fill in the Git clone URL
 # - Setup a Git hook as explained in
 #   https://github.com/appveyor/webhooks#installing-git-hook
 # - Check 'Settings > General > Skip branches without appveyor.yml'
 # - Check 'Settings > General > Rolling builds'
 # - Setup the global or project notifications to your liking
 #
 # Note that kicking (or restarting) a build via the web UI will not work, as it
 # will fail to find appveyor.yml .  The Git hook is the most practical way to
 # kick a build.
 #
 # See also:
 # - http://help.appveyor.com/discussions/problems/2209-node-grunt-build-specify-a-project-or-solution-file-the-directory-does-not-contain-a-project-or-solution-file
 # - http://help.appveyor.com/discussions/questions/1184-build-config-vs-appveyoryaml
 version: '{build}'
 branches:
  except:
  - /^travis.*$/
 # Don't download the full Mesa history to speed up cloning.  However the clone
 # depth must not be too small, otherwise builds might fail when lots of patches
 # are committed in succession, because the desired commit is not found on the
 # truncated history.
 #
 # See also:
 # - https://www.appveyor.com/blog/2014/06/04/shallow-clone-for-git-repositories
 clone_depth: 100
 cache:
 - win_flex_bison-2.4.5.zip
 - llvm-3.3.1-msvc2013-mtd.7z
 environment:
  WINFLEXBISON_ARCHIVE: win_flex_bison-2.4.5.zip
  LLVM_ARCHIVE: llvm-3.3.1-msvc2013-mtd.7z
 install:
 # Check pip
 - python --version
 - python -m pip --version
 # Install Mako
 - python -m pip install --egg Mako
 # Install SCons
 - python -m pip install --egg scons==2.4.1
 - scons --version
 # Install flex/bison
 - if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "http://downloads.sourceforge.net/project/winflexbison/%WINFLEXBISON_ARCHIVE%"
 - 7z x -y -owinflexbison\ "%WINFLEXBISON_ARCHIVE%" > nul
 - set Path=%CD%\winflexbison;%Path%
 - win_flex --version
 - win_bison --version
 # Download and extract LLVM
 - if not exist "%LLVM_ARCHIVE%" appveyor DownloadFile "https://people.freedesktop.org/~jrfonseca/llvm/%LLVM_ARCHIVE%"
 - 7z x -y "%LLVM_ARCHIVE%" > nul
 - mkdir llvm\bin
 - set LLVM=%CD%\llvm
 build_script:
 - scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=12.0 llvm=1
 after_build:
 - scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=12.0 llvm=1 check
 # It's possible to setup notification here, as described in
 # http://www.appveyor.com/docs/notifications#appveyor-yml-configuration , but
 # doing so would cause the notification settings to be replicated across all
 # repos, which is most likely undesired.  So it's better to rely on the
 # Appveyor global/project notification settings.
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,11 +3,17 @@
 srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 SRCDIR=`(cd "$srcdir" && pwd)`
 ORIGDIR=`pwd`
 cd "$srcdir"
-autoreconf --force --verbose --install || exit 1
+if test "x$SRCDIR" != "x$ORIGDIR"; then
-cd "$ORIGDIR" || exit $?
+	echo "Mesa cannot be built when srcdir != builddir" 1>&2
 	exit 1
 fi
 MAKEFLAGS=""
 autoreconf -v --install || exit 1
 if test -z "$NOCONFIGURE"; then
    "$srcdir"/configure "$@"
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -5,5 +5,3 @@ install-sh
 /missing
 ylwrap
 compile
 ar-lib
 /test-driver
--- a/bin/bugzilla_mesa.sh
+++ b/bin/bugzilla_mesa.sh
@@ -1,49 +0,0 @@
 #!/bin/bash
 # This script is used to generate the list of fixed bugs that
 # appears in the release notes files, with HTML formatting.
 #
 # Note: This script could take a while until all details have
 #       been fetched from bugzilla.
 #
 # Usage examples:
 #
 # $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3
 # $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 > bugfixes
 # $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 | tee bugfixes
 # $ DRYRUN=yes bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3
 # $ DRYRUN=yes bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 | wc -l
 # regex pattern: trim before bug number
 trim_before='s/.*show_bug.cgi?id=\([0-9]*\).*/\1/'
 # regex pattern: reconstruct the url
 use_after='s,^,https://bugs.freedesktop.org/show_bug.cgi?id=,'
 # extract fdo urls from commit log
 urls=$(git log $* | grep 'bugs.freedesktop.org/show_bug' | sed -e $trim_before | sort -n -u | sed -e $use_after)
 # if DRYRUN is set to "yes", simply print the URLs and don't fetch the
 # details from fdo bugzilla.
 #DRYRUN=yes
 if [ "x$DRYRUN" = xyes ]; then
 	for i in $urls
 	do
 		echo $i
 	done
 else
 	echo "<ul>"
 	echo ""
 	for i in $urls
 	do
 		id=$(echo $i | cut -d'=' -f2)
 		summary=$(wget --quiet -O - $i | grep -e '<title>.*</title>' | sed -e 's/ *<title>Bug [0-9]\+ &ndash; \(.*\)<\/title>/\1/')
 		echo "<li><a href=\"$i\">Bug $id</a> - $summary</li>"
 		echo ""
 	done
 	echo "</ul>"
 fi
--- a/bin/confdiff.sh
+++ b/bin/confdiff.sh
@@ -0,0 +1,48 @@
 #!/bin/bash -e
 usage()
 {
 	echo "Usage: $0 <target1> <target2>"
 	echo "Highlight differences between Mesa configs"
 	echo "Example:"
 	echo "  $0 linux linux-x86"
 }
 die()
 {
 	echo "$@" >&2
 	return 1
 }
 case "$1" in
 -h|--help) usage; exit 0;;
 esac
 [ $# -lt 2 ] && die 2 targets needed. See $0 --help
 target1=$1
 target2=$2
 topdir=$(cd "`dirname $0`"/..; pwd)
 cd "$topdir"
 [ -f "./configs/$target1" ] || die Missing configs/$target1
 [ -f "./configs/$target2" ] || die Missing configs/$target2
 trap 'rm -f "$t1" "$t2"' 0
 t1=$(mktemp)
 t2=$(mktemp)
 make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t1
 TOP = .
 include \$(TOP)/configs/$target1
 default:
 EOF
 make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t2
 TOP = .
 include \$(TOP)/configs/$target2
 default:
 EOF
 diff -pu -I'^#' $t1 $t2
--- a/bin/extract_git_sha1
+++ b/bin/extract_git_sha1
@@ -0,0 +1,20 @@
 #!/bin/sh
 if [ ! -f src/mesa/main/git_sha1.h ]; then
 	touch src/mesa/main/git_sha1.h
 fi
 if [ ! -d .git ]; then
 	exit
 fi
 if which git > /dev/null; then
    # Extract the 7-digit "short" SHA1 for the current HEAD, convert
    # it to a string, and wrap it in a #define.  This is used in
    # src/mesa/main/version.c to put the GIT SHA1 in the GL_VERSION string.
    git log -n 1 --oneline |\
 	sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
 	> src/mesa/main/git_sha1.h.tmp
    if ! cmp -s src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h; then
    	mv src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h
    fi
 fi
--- a/bin/get-extra-pick-list.sh
+++ b/bin/get-extra-pick-list.sh
@@ -1,35 +0,0 @@
 #!/bin/sh
 # Script for generating a list of candidates which fix commits that have been
 # previously cherry-picked to a stable branch.
 #
 # Usage examples:
 #
 # $ bin/get-extra-pick-list.sh
 # $ bin/get-extra-pick-list.sh > picklist
 # $ bin/get-extra-pick-list.sh | tee picklist
 # Use the last branchpoint as our limit for the search
 # XXX: there should be a better way for this
 latest_branchpoint=`git branch | grep \* | cut -c 3-`-branchpoint
 # Grep for commits with "cherry picked from commit" in the commit message.
 git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
 	grep "cherry picked from commit" |\
 	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' |\
 	cut -c -8 |\
 while read sha
 do
 	# Check if the original commit is referenced in master
 	git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\
 		cut -c -8 |\
 	while read candidate
 	do
 		# Check if the potential fix, hasn't landed in branch yet.
 		found=`git log -n1 --pretty=oneline --reverse --grep=$candidate $latest_branchpoint..HEAD |wc -l`
 		if test $found = 0
 		then
 			echo Commit $candidate might need to be picked, as it references $sha
 		fi
 	done
 done
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -1,35 +0,0 @@
 #!/bin/sh
 # Script for generating a list of candidates for cherry-picking to a stable branch
 #
 # Usage examples:
 #
 # $ bin/get-pick-list.sh
 # $ bin/get-pick-list.sh > picklist
 # $ bin/get-pick-list.sh | tee picklist
 # Grep for commits with "cherry picked from commit" in the commit message.
 git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
 	grep "cherry picked from commit" |\
 	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
 # Grep for commits that were marked as a candidate for the stable tree.
 git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE: .*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
 while read sha
 do
 	# Check to see whether the patch is on the ignore list.
 	if [ -f bin/.cherry-ignore ] ; then
 		if grep -q ^$sha bin/.cherry-ignore ; then
 			continue
 		fi
 	fi
 	# Check to see if it has already been picked over.
 	if grep -q ^$sha already_picked ; then
 		continue
 	fi
 	git log -n1 --pretty=oneline $sha | cat
 done
 rm -f already_picked
--- a/bin/installmesa
+++ b/bin/installmesa
@@ -0,0 +1,74 @@
 #!/bin/sh
 #
 # Simple shell script for installing Mesa's header and library files.
 # If the copy commands below don't work on a particular system (i.e. the
 # -f or -d flags), we may need to branch on `uname` to do the right thing.
 #
 TOP=.
 INCLUDE_DIR="/usr/local/include"
 LIB_DIR="/usr/local/lib"
 if [ "x$#" = "x0" ] ; then
 echo
 echo "***** Mesa installation - You may need root privileges to do this *****"
 echo
 echo "Default directory for header files is:" ${INCLUDE_DIR}
 echo "Enter new directory or press <Enter> to accept this default."
 read INPUT
 if [ "x${INPUT}" != "x" ] ; then
 	INCLUDE_DIR=${INPUT}
 fi
 echo
 echo "Default directory for library files is:" ${LIB_DIR}
 echo "Enter new directory or press <Enter> to accept this default."
 read INPUT
 if [ "x${INPUT}" != "x" ] ; then
 	LIB_DIR=${INPUT}
 fi
 echo
 echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
 echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
 echo "Press <Enter> to continue, or <ctrl>-C to abort."
 read INPUT
 else
 INCLUDE_DIR=$1/include
 LIB_DIR=$1/lib
 fi
 # flags:
 #  -f = force
 #  -d = preserve symlinks (does not work on BSD)
 if [ `uname` = "FreeBSD" ] ; then
 	CP_FLAGS="-f"
 elif [ `uname` = "Darwin" ] ; then
 	CP_FLAGS="-f"
 elif [ `uname` = "AIX" ] ; then
 	CP_FLAGS="-fh"
 else
 	CP_FLAGS="-fd"
 fi
 set -v
 mkdir -p ${INCLUDE_DIR}
 mkdir -p ${INCLUDE_DIR}/GL
 # NOT YET: mkdir -p ${INCLUDE_DIR}/GLES
 mkdir -p ${LIB_DIR}
 cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
 cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL
 # NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
 cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR}
 echo "Done."
--- a/bin/minstall
+++ b/bin/minstall
@@ -0,0 +1,112 @@
 #!/bin/sh
 # A minimal replacement for 'install' that supports installing symbolic links.
 # Only a limited number of options are supported:
 # -d dir          Create a directory
 # -m mode         Sets a file's mode when installing
 # If these commands aren't portable, we'll need some "if (arch)" type stuff
 SYMLINK="ln -s"
 MKDIR="mkdir -p"
 RM="rm -f"
 MODE=""
 if [ "$1" = "-d" ] ; then
 	# make a directory path
 	$MKDIR "$2"
 	exit 0
 fi
 if [ "$1" = "-m" ] ; then
 	# set file mode
 	MODE=$2
 	shift 2
 fi
 # install file(s) into destination
 if [ $# -ge 2 ] ; then
 	# Last cmd line arg is the dest dir
 	for FILE in $@ ; do
 		DESTDIR="$FILE"
 	done
 	# Loop over args, moving them to DEST directory
 	I=1
 	for FILE in $@ ; do
 		if [ $I = $# ] ; then
 			# stop, don't want to install $DEST into $DEST
 			exit 0
 		fi
                DEST=$DESTDIR
                # On CYGWIN, because DLLs are loaded by the native Win32 loader,
                # they are installed in the executable path.  Stub libraries used
                # only for linking are installed in the library path
                case `uname` in
                    CYGWIN*)
                        case $FILE in
                            *.dll)
                                DEST="$DEST/../bin"
                                ;;
                            *)
                                ;;
                        esac
 	                ;;
                    *)
                        ;;
                esac
 		PWDSAVE=`pwd`
 		# determine file's type
 		if [ -h "$FILE" ] ; then
 			#echo $FILE is a symlink
 			# Unfortunately, cp -d isn't universal so we have to
 			# use a work-around.
 			# Use ls -l to find the target that the link points to
 			LL=`ls -l "$FILE"`
 			for L in $LL ; do
 				TARGET=$L
 			done
 			#echo $FILE is a symlink pointing to $TARGET
 			FILE=`basename "$FILE"`
 			# Go to $DEST and make the link
 			cd "$DEST"        # pushd
 				$RM "$FILE"
 				$SYMLINK "$TARGET" "$FILE"
 			cd "$PWDSAVE"     # popd
 		elif [ -f "$FILE" ] ; then
 			#echo "$FILE" is a regular file
 			# Only copy if the files differ
 			if ! cmp -s $FILE $DEST/`basename $FILE`; then
 				$RM "$DEST/`basename $FILE`"
 				cp "$FILE" "$DEST"
 			fi
 			if [ $MODE ] ; then
 				FILE=`basename "$FILE"`
 				chmod $MODE "$DEST/$FILE"
 			fi
 		else
 			echo "Unknown type of argument: " "$FILE"
 			exit 1
 		fi
 		I=`expr $I + 1`
 	done
 	exit 0
 fi
 # If we get here, we didn't find anything to do
 echo "Usage:"
 echo "  install -d dir                      Create named directory"
 echo "  install [-m mode] file [...] dest   Install files in destination"
--- a/bin/mklib
+++ b/bin/mklib
--- a/bin/perf-annotate-jit
+++ b/bin/perf-annotate-jit
@@ -1,251 +0,0 @@
 #!/usr/bin/env python
 #
 # Copyright 2012 VMware Inc
 # Copyright 2008-2009 Jose Fonseca
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
 """Perf annotate for JIT code.
 Linux `perf annotate` does not work with JIT code.  This script takes the data
 produced by `perf script` command, plus the diassemblies outputed by gallivm
 into /tmp/perf-XXXXX.map.asm and produces output similar to `perf annotate`.
 See docs/llvmpipe.html for usage instructions.
 The `perf script` output parser was derived from the gprof2dot.py script.
 """
 import sys
 import os.path
 import re
 import optparse
 import subprocess
 class Parser:
    """Parser interface."""
    def __init__(self):
        pass
    def parse(self):
        raise NotImplementedError
 class LineParser(Parser):
    """Base class for parsers that read line-based formats."""
    def __init__(self, file):
        Parser.__init__(self)
        self._file = file
        self.__line = None
        self.__eof = False
        self.line_no = 0
    def readline(self):
        line = self._file.readline()
        if not line:
            self.__line = ''
            self.__eof = True
        else:
            self.line_no += 1
        self.__line = line.rstrip('\r\n')
    def lookahead(self):
        assert self.__line is not None
        return self.__line
    def consume(self):
        assert self.__line is not None
        line = self.__line
        self.readline()
        return line
    def eof(self):
        assert self.__line is not None
        return self.__eof
 mapFile = None
 def lookupMap(filename, matchSymbol):
    global mapFile
    mapFile = filename
    stream = open(filename, 'rt')
    for line in stream:
        start, length, symbol = line.split()
        start = int(start, 16)
        length = int(length,16)
        if symbol == matchSymbol:
            return start
    return None
 def lookupAsm(filename, desiredFunction):
    stream = open(filename + '.asm', 'rt')
    while stream.readline() != desiredFunction + ':\n':
        pass
    asm = []
    line = stream.readline().strip()
    while line:
        addr, instr = line.split(':', 1)
        addr = int(addr)
        asm.append((addr, instr))
        line = stream.readline().strip()
    return asm
 samples = {}
 class PerfParser(LineParser):
    """Parser for linux perf callgraph output.
    It expects output generated with
        perf record -g
        perf script
    """
    def __init__(self, infile, symbol):
        LineParser.__init__(self, infile)
 	self.symbol = symbol
    def readline(self):
        # Override LineParser.readline to ignore comment lines
        while True:
            LineParser.readline(self)
            if self.eof() or not self.lookahead().startswith('#'):
                break
    def parse(self):
        # read lookahead
        self.readline()
        while not self.eof():
            self.parse_event()
        asm = lookupAsm(mapFile, self.symbol)
        addresses = samples.keys()
        addresses.sort()
        total_samples = 0
 	sys.stdout.write('%s:\n' % self.symbol)
        for address, instr in asm:
            try:
                sample = samples.pop(address)
            except KeyError:
                sys.stdout.write(6*' ')
            else:
                sys.stdout.write('%6u' % (sample))
                total_samples += sample
            sys.stdout.write('%6u: %s\n' % (address, instr))
        print 'total:', total_samples
        assert len(samples) == 0
        sys.exit(0)
    def parse_event(self):
        if self.eof():
            return
        line = self.consume()
        assert line
        callchain = self.parse_callchain()
        if not callchain:
            return
    def parse_callchain(self):
        callchain = []
        while self.lookahead():
            function = self.parse_call(len(callchain) == 0)
            if function is None:
                break
            callchain.append(function)
        if self.lookahead() == '':
            self.consume()
        return callchain
    call_re = re.compile(r'^\s+(?P<address>[0-9a-fA-F]+)\s+(?P<symbol>.*)\s+\((?P<module>[^)]*)\)$')
    def parse_call(self, first):
        line = self.consume()
        mo = self.call_re.match(line)
        assert mo
        if not mo:
            return None
        if not first:
            return None
        function_name = mo.group('symbol')
        if not function_name:
            function_name = mo.group('address')
        module = mo.group('module')
        function_id = function_name + ':' + module
        address = mo.group('address')
        address = int(address, 16)
        if function_name != self.symbol:
            return None
        start_address = lookupMap(module, function_name)
        address -= start_address
        #print function_name, module, address
        samples[address] = samples.get(address, 0) + 1
        return True
 def main():
    """Main program."""
    optparser = optparse.OptionParser(
        usage="\n\t%prog [options] symbol_name")
    (options, args) = optparser.parse_args(sys.argv[1:])
    if len(args) != 1:
        optparser.error('wrong number of arguments')
    symbol = args[0]
    p = subprocess.Popen(['perf', 'script'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    parser = PerfParser(p.stdout, symbol)
    parser.parse()
 if __name__ == '__main__':
    main()
 # vim: set sw=4 et:
--- a/bin/shortlog_mesa.sh
+++ b/bin/shortlog_mesa.sh
@@ -1,29 +0,0 @@
 #!/bin/bash
 # This script is used to generate the list of changes that
 # appears in the release notes files, with HTML formatting.
 #
 # Usage examples:
 #
 # $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3
 # $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3 > changes
 # $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3 | tee changes
 typeset -i in_log=0
 git shortlog $* | while read l
 do
    if [ $in_log -eq 0 ]; then
 	echo '<p>'$l'</p>'
 	echo '<ul>'
 	in_log=1
    elif echo "$l" | egrep -q '^$' ; then
 	echo '</ul>'
 	echo
 	in_log=0
    else
        mesg=$(echo $l | sed 's/ (cherry picked from commit [0-9a-f]\+)//;s/\&/&amp;/g;s/</\&lt;/g;s/>/\&gt;/g')
 	echo '  <li>'${mesg}'</li>'
    fi
 done
--- a/bin/version.mk
+++ b/bin/version.mk
@@ -0,0 +1,17 @@
 #!/usr/bin/make -sf
 # Print the various Mesa version fields. This is mostly used to add the
 # version to configure.
 # This reflects that this script is usually called from the toplevel
 TOP = .
 include $(TOP)/configs/default
 version:
 	@echo $(MESA_VERSION)
 major:
 	@echo $(MESA_MAJOR)
 minor:
 	@echo $(MESA_MINOR)
 tiny:
 	@echo $(MESA_TINY)
--- a/common.py
+++ b/common.py
@@ -26,28 +26,28 @@ else:
    target_platform = host_platform
 _machine_map = {
-    'x86': 'x86',
+	'x86': 'x86',
-    'i386': 'x86',
+	'i386': 'x86',
-    'i486': 'x86',
+	'i486': 'x86',
-    'i586': 'x86',
+	'i586': 'x86',
-    'i686': 'x86',
+	'i686': 'x86',
-    'BePC': 'x86',
+	'BePC': 'x86',
-    'Intel': 'x86',
+	'Intel': 'x86',
-    'ppc': 'ppc',
+	'ppc' : 'ppc',
-    'BeBox': 'ppc',
+	'BeBox': 'ppc',
-    'BeMac': 'ppc',
+	'BeMac': 'ppc',
-    'AMD64': 'x86_64',
+	'AMD64': 'x86_64',
-    'x86_64': 'x86_64',
+	'x86_64': 'x86_64',
-    'sparc': 'sparc',
+	'sparc': 'sparc',
-    'sun4u': 'sparc',
+	'sun4u': 'sparc',
 }
 # find host_machine value
 if 'PROCESSOR_ARCHITECTURE' in os.environ:
-    host_machine = os.environ['PROCESSOR_ARCHITECTURE']
+	host_machine = os.environ['PROCESSOR_ARCHITECTURE']
 else:
-    host_machine = _platform.machine()
+	host_machine = _platform.machine()
 host_machine = _machine_map.get(host_machine, 'generic')
 default_machine = host_machine
@@ -65,8 +65,7 @@ else:
    default_llvm = 'no'
    try:
        if target_platform != 'windows' and \
-           subprocess.call(['llvm-config', '--version'],
+           subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
                           stdout=subprocess.PIPE) == 0:
            default_llvm = 'yes'
    except:
        pass
@@ -76,39 +75,28 @@ else:
 # Common options
 def AddOptions(opts):
-    try:
+	try:
-        from SCons.Variables.BoolVariable import BoolVariable as BoolOption
+		from SCons.Variables.BoolVariable import BoolVariable as BoolOption
-    except ImportError:
+	except ImportError:
-        from SCons.Options.BoolOption import BoolOption
+		from SCons.Options.BoolOption import BoolOption
-    try:
+	try:
-        from SCons.Variables.EnumVariable import EnumVariable as EnumOption
+		from SCons.Variables.EnumVariable import EnumVariable as EnumOption
-    except ImportError:
+	except ImportError:
-        from SCons.Options.EnumOption import EnumOption
+		from SCons.Options.EnumOption import EnumOption
-    opts.Add(EnumOption('build', 'build type', 'debug',
+	opts.Add(EnumOption('build', 'build type', 'debug',
-                        allowed_values=('debug', 'checked', 'profile',
+	                  allowed_values=('debug', 'checked', 'profile', 'release')))
-                                        'release')))
+	opts.Add(BoolOption('verbose', 'verbose output', 'no'))
-    opts.Add(BoolOption('verbose', 'verbose output', 'no'))
+	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
-    opts.Add(EnumOption('machine', 'use machine-specific assembly code',
+											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
-                        default_machine,
+	opts.Add(EnumOption('platform', 'target platform', host_platform,
-                        allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
+											 allowed_values=('linux', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8', 'haiku')))
-    opts.Add(EnumOption('platform', 'target platform', host_platform,
+	opts.Add(BoolOption('embedded', 'embedded build', 'no'))
-                        allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku',
+	opts.Add('toolchain', 'compiler toolchain', default_toolchain)
-                                        'linux', 'sunos', 'windows')))
+	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
-    opts.Add(BoolOption('embedded', 'embedded build', 'no'))
+	opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
-    opts.Add(BoolOption('analyze',
+	opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)', 'no'))
-                        'enable static code analysis where available', 'no'))
+	opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
-    opts.Add(BoolOption('asan', 'enable Address Sanitizer', 'no'))
+	opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
-    opts.Add('toolchain', 'compiler toolchain', default_toolchain)
+	opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
-    opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support',
+	if host_platform == 'windows':
-                        'no'))
+		opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
    opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
    opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)',
                        'no'))
    opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
    opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
    opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
    opts.Add(BoolOption('texture_float',
                        'enable floating-point textures and renderbuffers',
                        'no'))
    if host_platform == 'windows':
        opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version')
--- a/configs/.gitignore
+++ b/configs/.gitignore
@@ -0,0 +1,2 @@
 current
 autoconf
--- a/configs/aix
+++ b/configs/aix
@@ -0,0 +1,27 @@
 # Configuration for AIX, dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -O -DAIXV3 -DPTHREADS
 # Misc tools and flags
 MKLIB_OPTIONS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -lX11 -lXext -lpthread -lm
 GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
 GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11
 OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
--- a/configs/aix-64
+++ b/configs/aix-64
@@ -0,0 +1,24 @@
 # Configuration for AIX 64-bit, dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-64
 # Compiler and flags
 CC = xlc
 CXX = xlC
 CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11
--- a/configs/aix-64-static
+++ b/configs/aix-64-static
@@ -0,0 +1,21 @@
 # Configuration for AIX, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-64-static
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -q64 -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS
 MKLIB_OPTIONS = -static
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/aix-gcc
+++ b/configs/aix-gcc
@@ -0,0 +1,21 @@
 # Configuration for AIX with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = aix-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -DAIXV3
 CXXFLAGS = -O2 -DAIXV3
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 MKLIB_OPTIONS = -arch aix-gcc
 GL_LIB_DEPS = -lX11 -lXext -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
--- a/configs/aix-static
+++ b/configs/aix-static
@@ -0,0 +1,20 @@
 # Configuration for AIX, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-static
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -O -DAIXV3 -DPTHREADS
 CXXFLAGS = -O -DAIXV3 -DPTHREADS
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -0,0 +1,224 @@
 # Autoconf configuration
 # Pull in the defaults
 include $(TOP)/configs/default
 # This is generated by configure
 CONFIG_NAME = autoconf
 # Compiler and flags
 CC = @CC@
 CXX = @CXX@
 OPT_FLAGS = @OPT_FLAGS@
 ARCH_FLAGS = @ARCH_FLAGS@
 ASM_FLAGS = @ASM_FLAGS@
 PIC_FLAGS = @PIC_FLAGS@
 DEFINES = @DEFINES@
 API_DEFINES = @API_DEFINES@
 SHARED_GLAPI = @SHARED_GLAPI@
 CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
 CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@
 CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
 RADEON_CFLAGS = @RADEON_CFLAGS@
 RADEON_LIBS = @RADEON_LIBS@
 NOUVEAU_CFLAGS = @NOUVEAU_CFLAGS@
 NOUVEAU_LIBS = @NOUVEAU_LIBS@
 INTEL_LIBS = @INTEL_LIBS@
 INTEL_CFLAGS = @INTEL_CFLAGS@
 X11_LIBS = @X11_LIBS@
 X11_CFLAGS = @X11_CFLAGS@
 LLVM_BINDIR = @LLVM_BINDIR@
 LLVM_CFLAGS = @LLVM_CFLAGS@
 LLVM_CXXFLAGS = @LLVM_CXXFLAGS@
 LLVM_LDFLAGS = @LLVM_LDFLAGS@
 LLVM_LIBS = @LLVM_LIBS@
 LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@
 GLW_CFLAGS = @GLW_CFLAGS@
 GLX_TLS = @GLX_TLS@
 DRI_CFLAGS = @DRI_CFLAGS@
 DRI_CXXFLAGS = @DRI_CXXFLAGS@
 # dlopen
 DLOPEN_LIBS = @DLOPEN_LIBS@
 # Source selection
 MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
 GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
 # Misc tools and flags
 MAKE = @MAKE@
 SHELL = @SHELL@
 MKLIB_OPTIONS = @MKLIB_OPTIONS@
 MKDEP = @MKDEP@
 MKDEP_OPTIONS = @MKDEP_OPTIONS@
 INSTALL = @INSTALL@
 AWK = @AWK@
 GREP = @GREP@
 NM = @NM@
 # Perl
 PERL = @PERL@
 # Python and flags (generally only needed by the developers)
 PYTHON2 = @PYTHON2@
 PYTHON_FLAGS = -t -O -O
 # Flex and Bison for GLSL compiler
 FLEX = @LEX@
 BISON = @YACC@
 # Library names (base name)
 GL_LIB = @GL_LIB@
 GLU_LIB = @GLU_LIB@
 GLW_LIB = GLw
 OSMESA_LIB = @OSMESA_LIB@
 GLESv1_CM_LIB = GLESv1_CM
 GLESv2_LIB = GLESv2
 VG_LIB = OpenVG
 GLAPI_LIB = glapi
 # Library names (actual file names)
 GL_LIB_NAME = @GL_LIB_NAME@
 GLU_LIB_NAME = @GLU_LIB_NAME@
 GLW_LIB_NAME = @GLW_LIB_NAME@
 OSMESA_LIB_NAME = @OSMESA_LIB_NAME@
 EGL_LIB_NAME = @EGL_LIB_NAME@
 GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@
 GLESv2_LIB_NAME = @GLESv2_LIB_NAME@
 VG_LIB_NAME = @VG_LIB_NAME@
 GLAPI_LIB_NAME = @GLAPI_LIB_NAME@
 # Globs used to install the lib and all symlinks
 GL_LIB_GLOB = @GL_LIB_GLOB@
 GLU_LIB_GLOB = @GLU_LIB_GLOB@
 GLW_LIB_GLOB = @GLW_LIB_GLOB@
 OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@
 EGL_LIB_GLOB = @EGL_LIB_GLOB@
 GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@
 GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@
 VG_LIB_GLOB = @VG_LIB_GLOB@
 GLAPI_LIB_GLOB = @GLAPI_LIB_GLOB@
 # Directories to build
 LIB_DIR = @LIB_DIR@
 SRC_DIRS = @SRC_DIRS@
 GLU_DIRS = @GLU_DIRS@
 DRIVER_DIRS = @DRIVER_DIRS@
 GALLIUM_DIRS = @GALLIUM_DIRS@
 GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
 GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@
 GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@
 GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@
 GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 # Driver specific build vars
 DRI_DIRS = @DRI_DIRS@
 DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
 DRICORE_LIBS = @DRICORE_LIBS@
 DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@
 EGL_PLATFORMS = @EGL_PLATFORMS@
 EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
 # Dependencies
 X11_INCLUDES = @X11_INCLUDES@
 # GLw motif setup
 GLW_SOURCES = @GLW_SOURCES@
 MOTIF_CFLAGS = @MOTIF_CFLAGS@
 # Library/program dependencies
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
 	$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
 EGL_LIB_DEPS = $(EXTRA_LIB_PATH) @EGL_LIB_DEPS@
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
 	$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
 	$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
 GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@
 GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@
 VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
 GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@
 # DRI dependencies
 MESA_MODULES = @MESA_MODULES@
 DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
 LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
 LIBDRM_LIB = @LIBDRM_LIBS@
 DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
 GLPROTO_CFLAGS = @GLPROTO_CFLAGS@
 EXPAT_INCLUDES = @EXPAT_INCLUDES@
 # Autoconf directories
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
 includedir = @includedir@
 # Installation directories (for make install)
 INSTALL_DIR = $(prefix)
 INSTALL_LIB_DIR = $(libdir)
 INSTALL_INC_DIR = $(includedir)
 # DRI installation directories
 DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
 # EGL driver install directory
 EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@
 # XVMC library install directory
 XVMC_LIB_INSTALL_DIR=@XVMC_LIB_INSTALL_DIR@
 # VDPAU library install directory
 VDPAU_LIB_INSTALL_DIR=@VDPAU_LIB_INSTALL_DIR@
 # VA library install directory
 VA_LIB_INSTALL_DIR=@VA_LIB_INSTALL_DIR@
 # Xorg driver install directory (for xorg state-tracker)
 XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
 # pkg-config substitutions
 GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
 GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
 GL_PC_CFLAGS = @GL_PC_CFLAGS@
 DRI_PC_REQ_PRIV = @DRI_PC_REQ_PRIV@
 GLU_PC_REQ = @GLU_PC_REQ@
 GLU_PC_REQ_PRIV = @GLU_PC_REQ_PRIV@
 GLU_PC_LIB_PRIV = @GLU_PC_LIB_PRIV@
 GLU_PC_CFLAGS = @GLU_PC_CFLAGS@
 GLW_PC_REQ_PRIV = @GLW_PC_REQ_PRIV@
 GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@
 GLW_PC_CFLAGS = @GLW_PC_CFLAGS@
 OSMESA_PC_REQ = @OSMESA_PC_REQ@
 OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
 GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@
 GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
 EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
 EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
 EGL_PC_CFLAGS = @GL_PC_CFLAGS@
 XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
 XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
 LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
 LIBUDEV_LIBS = @LIBUDEV_LIBS@
 WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
 WAYLAND_LIBS = @WAYLAND_LIBS@
 MESA_LLVM = @MESA_LLVM@
 LLVM_VERSION = @LLVM_VERSION@
 HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
 GALLIUM_PIPE_LOADER_DEFINES = @GALLIUM_PIPE_LOADER_DEFINES@
 GALLIUM_PIPE_LOADER_LIBS = @GALLIUM_PIPE_LOADER_LIBS@
--- a/configs/bluegene-osmesa
+++ b/configs/bluegene-osmesa
@@ -0,0 +1,31 @@
 # Configuration for building only libOSMesa on BlueGene, no Xlib driver
 # This doesn't really have a lot of dependencies, so it should be usable
 # on other (gcc-based) systems too.
 # It uses static linking and disables multithreading.
 include $(TOP)/configs/default
 CONFIG_NAME = bluegene-osmesa
 # Compiler and flags
 CC = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-gcc
 CXX = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURC
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 MKLIB_OPTIONS = -static
 OSMESA_LIB_NAME = libOSMesa.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--- a/configs/bluegene-xlc-osmesa
+++ b/configs/bluegene-xlc-osmesa
@@ -0,0 +1,27 @@
 # Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
 # This doesn't really have a lot of dependencies, so it should be usable
 # on similar systems too.
 # It uses static linking and disables multithreading.
 include $(TOP)/configs/default
 CONFIG_NAME = bluegene-osmesa
 # Compiler and flags
 CC = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlc
 CXX = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlC
 CFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 CXXFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 OSMESA_LIB_NAME = libOSMesa.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--- a/configs/catamount-osmesa-pgi
+++ b/configs/catamount-osmesa-pgi
@@ -0,0 +1,30 @@
 # Configuration for building only libOSMesa on Cray Xt3
 # for the compute nodes running Catamount using the 
 # Portland Group compiler. The Portland Group toolchain has to be 
 # enabled before using "module switch PrgEnv-gnu PrgEnv-pgi" .
 # This doesn't really have a lot of dependencies, so it should be usable
 # on other similar systems too.
 # It uses static linking and disables multithreading.
 include $(TOP)/configs/default
 CONFIG_NAME = catamount-osmesa-pgi
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta   -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 CXXFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 OSMESA_LIB_NAME = libOSMesa.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--- a/configs/darwin
+++ b/configs/darwin
@@ -0,0 +1,61 @@
 # Configuration for Darwin / MacOS X, making dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = darwin
 INSTALL_DIR = /usr/X11
 X11_DIR = $(INSTALL_DIR)
 # Compiler and flags
 CC = $(shell xcrun -find cc)
 CXX = $(shell xcrun -find c++)
 PIC_FLAGS = -fPIC
 DEFINES =  -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
 	   -DGLX_ALIAS_UNSUPPORTED \
 	   -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
 # -DGLX_INDIRECT_RENDERING \
 # -D_GNU_SOURCE          - for src/mesa/main ...
 # -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx
 # -DGLX_USE_APPLEGL      - supposed to be used with GLX_DIRECT_RENDERING to use AGL rather than DRM, but doesn't compile
 # -DIN_DRI_DRIVER
 ARCH_FLAGS += $(RC_CFLAGS)
 INCLUDE_FLAGS = -I$(INSTALL_DIR)/include -I$(X11_DIR)/include
 OPT_FLAGS = -g3 -gdwarf-2 -Os -ffast-math -fno-strict-aliasing
 WARN_FLAGS = -Wall -Wmissing-prototypes
 CFLAGS = -std=c99 -fvisibility=hidden \
 	$(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS)
 CXXFLAGS = -fvisibility=hidden \
 	$(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS)
 # Library names (actual file names)
 GL_LIB_NAME = lib$(GL_LIB).dylib
 GLU_LIB_NAME = lib$(GLU_LIB).dylib
 GLW_LIB_NAME = lib$(GLW_LIB).dylib
 OSMESA_LIB_NAME = lib$(OSMESA_LIB).dylib
 VG_LIB_NAME = lib$(VG_LIB).dylib
 # globs used to install the lib and all symlinks
 GL_LIB_GLOB = lib$(GL_LIB).*dylib
 GLU_LIB_GLOB = lib$(GLU_LIB).*dylib
 GLW_LIB_GLOB = lib$(GLW_LIB).*dylib
 OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
 VG_LIB_GLOB = lib$(VG_LIB).*dylib
 GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11-xcb -lxcb -lX11 -lXext $(EXTRA_LDFLAGS)
 OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS)
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS)
 SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa glu
 GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
 DRI_DIRS = swrast
 #GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad
 #GALLIUM_DRIVERS_DIRS += llvmpipe
--- a/configs/darwin-fat-32bit
+++ b/configs/darwin-fat-32bit
@@ -0,0 +1,7 @@
 # Configuration for Darwin / MacOS X, making 32bit fat dynamic libs
 RC_CFLAGS=-arch ppc -arch i386
 include $(TOP)/configs/darwin
 CONFIG_NAME = darwin-fat-32bit
--- a/configs/darwin-fat-all
+++ b/configs/darwin-fat-all
@@ -0,0 +1,7 @@
 # Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs
 RC_CFLAGS=-arch ppc -arch i386 -arch ppc64 -arch x86_64
 include $(TOP)/configs/darwin
 CONFIG_NAME = darwin-fat-all
--- a/configs/darwin-fat-intel
+++ b/configs/darwin-fat-intel
@@ -0,0 +1,7 @@
 # Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs for intel
 RC_CFLAGS=-arch i386 -arch x86_64
 include $(TOP)/configs/darwin
 CONFIG_NAME = darwin-fat-intel
--- a/configs/default
+++ b/configs/default
@@ -0,0 +1,174 @@
 # Default/template configuration
 # This is included by other config files which may override some
 # of these variables.
 # Think of this as a base class from which configs are derived.
 CONFIG_NAME = default
 # Version info
 MESA_MAJOR=8
 MESA_MINOR=1
 MESA_TINY=0
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 # external projects.  This should be useless now that we use libdrm.
 DRM_SOURCE_PATH=$(TOP)/../drm
 # Compiler and flags
 CC = cc
 CXX = CC
 HOST_CC = $(CC)
 CFLAGS = -O
 CXXFLAGS = -O
 LDFLAGS =
 HOST_CFLAGS = $(CFLAGS)
 GLU_CFLAGS = 
 GLX_TLS = no
 # Compiler for building demos/tests/etc
 APP_CC = $(CC)
 APP_CXX = $(CXX)
 # Misc tools and flags
 SHELL = /bin/sh
 MKLIB = $(SHELL) $(TOP)/bin/mklib
 MKLIB_OPTIONS = 
 MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
 FLEX = flex
 BISON = bison
 PKG_CONFIG = pkg-config
 # Use MINSTALL for installing libraries, INSTALL for everything else
 MINSTALL = $(SHELL) $(TOP)/bin/minstall
 INSTALL = $(MINSTALL)
 # Tools for regenerating glapi (generally only needed by the developers)
 PYTHON2 = python
 PYTHON_FLAGS = -t -O -O
 INDENT = indent
 INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU
 GLW_LIB = GLw
 OSMESA_LIB = OSMesa
 EGL_LIB = EGL
 GLESv1_CM_LIB = GLESv1_CM
 GLESv2_LIB = GLESv2
 VG_LIB = OpenVG
 GLAPI_LIB = glapi
 # Library names (actual file names)
 GL_LIB_NAME = lib$(GL_LIB).so
 GLU_LIB_NAME = lib$(GLU_LIB).so
 GLW_LIB_NAME = lib$(GLW_LIB).so
 OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
 EGL_LIB_NAME = lib$(EGL_LIB).so
 GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so
 GLESv2_LIB_NAME = lib$(GLESv2_LIB).so
 VG_LIB_NAME = lib$(VG_LIB).so
 GLAPI_LIB_NAME = lib$(GLAPI_LIB).so
 # globs used to install the lib and all symlinks
 GL_LIB_GLOB = $(GL_LIB_NAME)*
 GLU_LIB_GLOB = $(GLU_LIB_NAME)*
 GLW_LIB_GLOB = $(GLW_LIB_NAME)*
 OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
 EGL_LIB_GLOB = $(EGL_LIB_NAME)*
 GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)*
 GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
 VG_LIB_GLOB = $(VG_LIB_NAME)*
 GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)*
 DRI_CFLAGS = $(CFLAGS)
 DRI_CXXFLAGS = $(CXXFLAGS)
 # Optional assembly language optimization files for libGL
 MESA_ASM_SOURCES = 
 # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
 # order to build the Motif widget too)
 GLW_SOURCES = GLwDrawA.c
 MOTIF_CFLAGS = -I/usr/include/Motif1.2
 # Directories to build
 LIB_DIR = lib
 SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
 	gallium egl gallium/winsys gallium/targets glu
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
 # Gallium directories and
 GALLIUM_DIRS = auxiliary drivers state_trackers
 GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
 GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = sw sw/xlib
 GALLIUM_TARGET_DIRS = libgl-xlib
 GALLIUM_STATE_TRACKERS_DIRS = glx vega
 # native platforms EGL should support
 EGL_PLATFORMS = x11
 EGL_CLIENT_APIS = $(GL_LIB)
 # Library dependencies
 #EXTRA_LIB_PATH ?=
 GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 EGL_LIB_DEPS    = $(EXTRA_LIB_PATH) -ldl -lpthread
 OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLW_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
 GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
 GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
 VG_LIB_DEPS    = $(EXTRA_LIB_PATH) -lpthread
 GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
 # Program dependencies - specific GL libraries added in Makefiles
 X11_LIBS = -lX11
 DLOPEN_LIBS = -ldl
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
 INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
 INSTALL_INC_DIR = $(INSTALL_DIR)/include
 DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
 # EGL driver install directory
 EGL_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/egl
 # Xorg driver install directory (for xorg state-tracker)
 XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers
 # pkg-config substitutions
 GL_PC_REQ_PRIV =
 GL_PC_LIB_PRIV =
 GL_PC_CFLAGS =
 DRI_PC_REQ_PRIV =
 GLU_PC_REQ = gl
 GLU_PC_REQ_PRIV =
 GLU_PC_LIB_PRIV =
 GLU_PC_CFLAGS =
 GLW_PC_REQ_PRIV =
 GLW_PC_LIB_PRIV =
 GLW_PC_CFLAGS =
 OSMESA_PC_REQ =
 OSMESA_PC_LIB_PRIV =
 GLESv1_CM_PC_REQ_PRIV =
 GLESv1_CM_PC_LIB_PRIV =
 GLESv1_CM_PC_CFLAGS =
 GLESv2_PC_REQ_PRIV =
 GLESv2_PC_LIB_PRIV =
 GLESv2_PC_CFLAGS =
 VG_PC_REQ_PRIV =
 VG_PC_LIB_PRIV =
 VG_PC_CFLAGS =
--- a/configs/freebsd
+++ b/configs/freebsd
@@ -0,0 +1,29 @@
 # Configuration for FreeBSD
 include $(TOP)/configs/default
 CONFIG_NAME = FreeBSD
 # Compiler and flags
 CC = cc
 CXX = c++
 MAKE = gmake
 OPT_FLAGS  = -O2
 PIC_FLAGS  = -fPIC
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
 	-DHZ=100
 X11_INCLUDES = -I/usr/local/include
 CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic
 CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 EXTRA_LIB_PATH = -L/usr/local/lib
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -0,0 +1,48 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd
 CONFIG_NAME = freebsd-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 WARN_FLAGS = -Wall
 OPT_FLAGS = -O -g
 EXPAT_INCLUDES = -I/usr/local/include
 X11_INCLUDES = -I/usr/local/include
 DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
 	-DHAVE_ALIAS
 CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
 	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 ASM_SOURCES = 
 MESA_ASM_SOURCES = 
 # Library/program dependencies
 MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
 LIBDRM_CFLAGS = `$(PKG_CONFIG) --cflags libdrm`
 LIBDRM_LIB = `$(PKG_CONFIG) --libs libdrm`
 DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
 GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 	-lm -pthread $(LIBDRM_LIB)
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
 # Directories
 SRC_DIRS = glx gallium mesa glu
 DRIVER_DIRS = dri
 DRM_SOURCE_PATH=$(TOP)/../drm
--- a/configs/freebsd-dri-amd64
+++ b/configs/freebsd-dri-amd64
@@ -0,0 +1,10 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri-amd64: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd-dri
 CONFIG_NAME = freebsd-dri-x86-64
 ASM_FLAGS = -DUSE_X86_64_ASM
 MESA_ASM_SOURCES = $(X86-64_SOURCES)
 GLAPI_ASM_SOURCES = $(X86-64_API)
--- a/configs/freebsd-dri-x86
+++ b/configs/freebsd-dri-x86
@@ -0,0 +1,13 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd-dri
 CONFIG_NAME = freebsd-dri-x86
 # Unnecessary on x86, generally.
 PIC_FLAGS = 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 MESA_ASM_SOURCES = $(X86_SOURCES)
 GLAPI_ASM_SOURCES = $(X86_API)
--- a/configs/hpux10
+++ b/configs/hpux10
@@ -0,0 +1,13 @@
 # Configuration for HPUX v10, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
--- a/configs/hpux10-gcc
+++ b/configs/hpux10-gcc
@@ -0,0 +1,18 @@
 # Configuration for HPUX v10, with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DUSE_XSHM
 CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
--- a/configs/hpux10-static
+++ b/configs/hpux10-static
@@ -0,0 +1,26 @@
 # Configuration for HPUX v10, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLW_LIB_DEPS = 
--- a/configs/hpux11-32
+++ b/configs/hpux11-32
@@ -0,0 +1,27 @@
 # Configuration for HPUX v11
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
--- a/configs/hpux11-32-static
+++ b/configs/hpux11-32-static
@@ -0,0 +1,25 @@
 # Configuration for HPUX v11, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
--- a/configs/hpux11-32-static-nothreads
+++ b/configs/hpux11-32-static-nothreads
@@ -0,0 +1,24 @@
 # Configuration for HPUX v11, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
--- a/configs/hpux11-64
+++ b/configs/hpux11-64
@@ -0,0 +1,28 @@
 # Configuration for HPUX v11, 64-bit
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-64
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS =
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
--- a/configs/hpux11-64-static
+++ b/configs/hpux11-64-static
@@ -0,0 +1,25 @@
 # Configuration for HPUX v11, 64-bit, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-64-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS = -static
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
--- a/configs/hpux11-ia64
+++ b/configs/hpux11-ia64
@@ -0,0 +1,28 @@
 # Configuration for HPUX IA64 v11, 64-bit
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-ia64
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS =
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.so
 GLU_LIB_NAME = libGLU.so
 GLW_LIB_NAME = libGLw.so
 OSMESA_LIB_NAME = libOSMesa.so
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
--- a/configs/hpux11-ia64-static
+++ b/configs/hpux11-ia64-static
@@ -0,0 +1,25 @@
 # Configuration for HPUX v11, 64-bit, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-ia64-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 MKLIB_OPTIONS = -static
 LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
--- a/configs/hpux9
+++ b/configs/hpux9
@@ -0,0 +1,15 @@
 # Configuration for HPUX v9, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux9
 # Compiler and flags
 CC = cc
 # XXX fix this
 CXX = c++
 CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
 CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
--- a/configs/hpux9-gcc
+++ b/configs/hpux9-gcc
@@ -0,0 +1,13 @@
 # Configuration for HPUX v10, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux9-gcc
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
--- a/configs/irix6-64
+++ b/configs/irix6-64
@@ -0,0 +1,16 @@
 # Configuration for IRIX 6.x, make n64 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-64
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib64
--- a/configs/irix6-64-static
+++ b/configs/irix6-64-static
@@ -0,0 +1,24 @@
 # Configuration for IRIX 6.x, make n64 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-64-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
 MKLIB_OPTIONS = -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib64
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/irix6-n32
+++ b/configs/irix6-n32
@@ -0,0 +1,16 @@
 # Configuration for IRIX 6.x, make n32 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-n32
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
--- a/configs/irix6-n32-static
+++ b/configs/irix6-n32-static
@@ -0,0 +1,23 @@
 # Configuration for IRIX 6.x, make n32 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-n32-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -DPTHREADS
 CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS
 MKLIB_OPTIONS = -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/irix6-o32
+++ b/configs/irix6-o32
@@ -0,0 +1,17 @@
 # Configuration for IRIX 6.x, make o32 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-o32
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
--- a/configs/irix6-o32-static
+++ b/configs/irix6-o32-static
@@ -0,0 +1,23 @@
 # Configuration for IRIX 6.x, make o32 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-o32-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
 MKLIB_OPTIONS = -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = lib32
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/linux
+++ b/configs/linux
@@ -0,0 +1,37 @@
 # Configuration for generic Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux
 # Compiler and flags
 CC = gcc
 CXX = g++
 OPT_FLAGS  = -O3 -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
 # to build properly on 64-bit platforms.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = -I/usr/X11R6/include
 CFLAGS = -Wall -Wmissing-prototypes -Wdeclaration-after-statement \
 	-Wpointer-arith $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
 CXXFLAGS = -Wall -Wpointer-arith $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(X11_INCLUDES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 EXTRA_LIB_PATH = -L/usr/X11R6/lib
--- a/configs/linux-alpha
+++ b/configs/linux-alpha
@@ -0,0 +1,19 @@
 # Configuration for Linux on Alpha
 include $(TOP)/configs/default
 CONFIG_NAME = linux-alpha
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
--- a/configs/linux-alpha-static
+++ b/configs/linux-alpha-static
@@ -0,0 +1,27 @@
 # Configuration for Linux on Alpha, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-alpha-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
--- a/configs/linux-debug
+++ b/configs/linux-debug
@@ -0,0 +1,9 @@
 # Configuration for debugging on Linux
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-debug
 OPT_FLAGS = -g
 #CFLAGS += -pedantic
 DEFINES += -DDEBUG -DDEBUG_MATH
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -0,0 +1,72 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 OPT_FLAGS  = -O2 -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
 	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = -I/usr/X11R6/include
 CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 MESA_ASM_SOURCES = 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
 LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
 LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm)
 DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 		-lm -lpthread -ldl $(LIBDRM_LIB)
 # Directories
 SRC_DIRS := glx egl $(SRC_DIRS)
 DRIVER_DIRS = dri
 GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm
 GALLIUM_TARGET_DIRS = dri-vmwgfx
 GALLIUM_STATE_TRACKERS_DIRS = egl dri
 DRI_DIRS = swrast
 INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
 INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
 NOUVEAU_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_nouveau)
 NOUVEAU_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_nouveau)
 RADEON_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_radeon)
 RADEON_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_radeon)
 RADEON_LDFLAGS = $(LIBDRM_RADEON_LIBS)
--- a/configs/linux-dri-debug
+++ b/configs/linux-dri-debug
@@ -0,0 +1,8 @@
 # -*-makefile-*-
 # Configuration for linux-dri-debug: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-debug
 OPT_FLAGS  = -O0 -g
 ARCH_FLAGS = -DDEBUG
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -0,0 +1,9 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-ppc
 OPT_FLAGS = -Os -mcpu=603
 PIC_FLAGS = -fPIC
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -0,0 +1,13 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-x86
 ARCH_FLAGS = -m32 -mmmx -msse -msse2
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 MESA_ASM_SOURCES = $(X86_SOURCES)
 GLAPI_ASM_SOURCES = $(X86_API)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -0,0 +1,17 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-x86-64
 ARCH_FLAGS = -m64
 ASM_FLAGS = -DUSE_X86_64_ASM
 MESA_ASM_SOURCES = $(X86-64_SOURCES)
 GLAPI_ASM_SOURCES = $(X86-64_API)
 LIB_DIR = lib64
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib64
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -0,0 +1,54 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri-xcb
 # Compiler and flags
 CC = gcc
 CXX = g++
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 OPT_FLAGS  = -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
        -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I x11) $(shell $(PKG_CONFIG) --cflags-only-I xcb) $(shell $(PKG_CONFIG) --cflags-only-I x11-xcb) $(shell $(PKG_CONFIG) --cflags-only-I xcb-glx)
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 MESA_ASM_SOURCES = 
 # Library/program dependencies
 EXTRA_LIB_PATH=$(shell $(PKG_CONFIG) --libs-only-L x11)
 MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
 LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
 LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm)
 DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
                $(LIBDRM_LIB) $(shell $(PKG_CONFIG) --libs xcb) $(shell $(PKG_CONFIG) --libs x11-xcb) $(shell $(PKG_CONFIG) --libs xcb-glx)
 SRC_DIRS = glx gallium mesa glu
 DRIVER_DIRS = dri
--- a/configs/linux-egl
+++ b/configs/linux-egl
@@ -0,0 +1,58 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 OPT_FLAGS  = -O -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
 	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = -I/usr/X11R6/include
 CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 MESA_ASM_SOURCES = 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
 LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
 LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm)
 DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 		-lm -lpthread -ldl \
                $(LIBDRM_LIB)
 # Directories
 SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
 DRIVER_DIRS = dri
 GALLIUM_WINSYS_DIRS = egl_drm
 GALLIUM_TARGET_DIRS =
 DRI_DIRS = intel 
--- a/configs/linux-ia64-icc
+++ b/configs/linux-ia64-icc
@@ -0,0 +1,18 @@
 # Configuration for Linux with Intel C compiler
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc
 # Compiler and flags
 CC = icc
 CXX = icpc
 CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 MKLIB_OPTIONS = -arch icc-istatic
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) 
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
--- a/configs/linux-ia64-icc-static
+++ b/configs/linux-ia64-icc-static
@@ -0,0 +1,23 @@
 # Configuration for Linux with Intel C compiler, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc-static
 # Compiler and flags
 CC = icc
 CXX = icpc
 CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 MKLIB_OPTIONS = -static -arch icc-istatic
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS =
 GLU_LIB_DEPS =
 GLW_LIB_DEPS =
--- a/configs/linux-icc
+++ b/configs/linux-icc
@@ -0,0 +1,19 @@
 # Configuration for Linux with Intel C compiler
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc
 # Compiler and flags
 CC = icc
 CXX = g++
 CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3
 MKLIB_OPTIONS = -arch icc
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 MESA_ASM_SOURCES = $(X86_SOURCES)
 GLAPI_ASM_SOURCES = $(X86_API)
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -0,0 +1,23 @@
 # Configuration for Linux with Intel C compiler, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc-static
 # Compiler and flags
 CC = icc
 CXX = icpc
 CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS
 MKLIB_OPTIONS = -static -arch icc
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS =
 MESA_ASM_SOURCES = $(X86_SOURCES)
 GLAPI_ASM_SOURCES = $(X86_API)
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -0,0 +1,52 @@
 # -*-makefile-*-
 # Configuration for linux-indirect: Builds a libGL capable of indirect
 # rendering, but *NOT* capable of direct rendering.
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 #MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 WARN_FLAGS = -Wall
 OPT_FLAGS  = -O -g
 PIC_FLAGS  = -fPIC
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
 ARCH_FLAGS ?=
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DGLX_INDIRECT_RENDERING \
 	-DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
 X11_INCLUDES = -I/usr/X11R6/include
 CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 	$(ASM_FLAGS) -std=c99 -ffast-math 
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 MESA_ASM_SOURCES = 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
 DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 # Directories
 SRC_DIRS = glx glu
 DRIVER_DIRS =
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -0,0 +1,47 @@
 # -*-makefile-*-
 # Configuration for Linux and LLVM with optimizations
 # Builds the llvmpipe gallium driver
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-llvm
 # Add llvmpipe driver
 GALLIUM_DRIVERS_DIRS += llvmpipe
 OPT_FLAGS = -O3 -ansi -pedantic
 ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
 DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE
 # override -std=c99
 CFLAGS += -std=gnu99
 LLVM_VERSION := $(shell llvm-config --version)
 ifeq ($(LLVM_VERSION),)
  $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
  MESA_LLVM=0
 else
  MESA_LLVM=1
  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
 #  $(info Using LLVM version: $(LLVM_VERSION))
 endif
 ifeq ($(MESA_LLVM),1)
  LLVM_CFLAGS=`llvm-config --cppflags|sed 's/-DNDEBUG\>//g'`
  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
  LLVM_LDFLAGS = $(shell llvm-config --ldflags)
  LLVM_LIBS = $(shell llvm-config --libs)
  MKLIB_OPTIONS=-cplusplus
 else
  LLVM_CFLAGS=
  LLVM_CXXFLAGS=
 endif
 LD = g++
 GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++
 # to allow the NV drivers to compile
 LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
--- a/configs/linux-llvm-debug
+++ b/configs/linux-llvm-debug
@@ -0,0 +1,12 @@
 # -*-makefile-*-
 # Configuration for Linux and LLVM with debugging info
 # Builds the llvmpipe gallium driver
 include $(TOP)/configs/linux-llvm
 CONFIG_NAME = linux-llvm-debug
 OPT_FLAGS = -g -ansi -pedantic
 DEFINES += -DDEBUG -UNDEBUG
--- a/configs/linux-opengl-es
+++ b/configs/linux-opengl-es
@@ -0,0 +1,27 @@
 # Configuration for OpenGL ES on Linux
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-opengl-es
 # Directories to build
 LIB_DIR = lib
 SRC_DIRS = egl glsl mapi/es1api mapi/es2api mesa/es \
 	gallium gallium/winsys gallium/targets
 # egl st needs this
 DEFINES += -DGLX_DIRECT_RENDERING
 # no mesa or egl drivers
 DRIVER_DIRS =
 GALLIUM_DRIVERS_DIRS = softpipe
 # build libGLES*.so
 GALLIUM_STATE_TRACKERS_DIRS = es
 # build egl_x11_{swrast,i915}.so
 GALLIUM_DRIVERS_DIRS += trace rbug i915
 GALLIUM_STATE_TRACKERS_DIRS += egl
 GALLIUM_WINSYS_DIRS += drm/intel
 GALLIUM_TARGET_DIRS += egl-swrast egl-i915
--- a/configs/linux-osmesa
+++ b/configs/linux-osmesa
@@ -0,0 +1,26 @@
 # Configuration for building only libOSMesa on Linux, no Xlib driver
 # This doesn't really have any Linux dependencies, so it should be usable
 # on other (gcc-based) systems.
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -g -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Directories
 SRC_DIRS = mapi/glapi glsl mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread -ldl
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--- a/configs/linux-osmesa-static
+++ b/configs/linux-osmesa-static
@@ -0,0 +1,32 @@
 # Configuration for building static libOSMesa.a on Linux, no Xlib driver
 # This doesn't really have any Linux dependencies, so it should be usable
 # on other (gcc-based) systems.
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa
 # Compiler and flags
 CC = gcc -m32
 CXX = g++ -m32
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 GL_LIB_DEPS =
 OSMESA_LIB_DEPS =
 GLU_LIB_DEPS =
 GLW_LIB_DEPS =
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -0,0 +1,29 @@
 # Configuration for 16 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa16
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names
 OSMESA_LIB = OSMesa16
 OSMESA_LIB_NAME = libOSMesa16.so
 # Directories
 SRC_DIRS = mapi/glapi glsl mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--- a/configs/linux-osmesa16-static
+++ b/configs/linux-osmesa16-static
@@ -0,0 +1,30 @@
 # Configuration for 16 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa16-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names
 OSMESA_LIB = OSMesa16
 OSMESA_LIB_NAME = libOSMesa16.a
 # Directories
 SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
--- a/configs/linux-osmesa32
+++ b/configs/linux-osmesa32
@@ -0,0 +1,29 @@
 # Configuration for 32 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa32
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 # Library names
 OSMESA_LIB = OSMesa32
 OSMESA_LIB_NAME = libOSMesa32.so
 # Directories
 SRC_DIRS = mapi/glapi glsl mesa glu
 DRIVER_DIRS = osmesa
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--- a/configs/linux-ppc
+++ b/configs/linux-ppc
@@ -0,0 +1,9 @@
 # Configuration for Linux on PPC
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-ppc
 OPT_FLAGS = -O3 -mcpu=603 -fsigned-char -funroll-loops
 # FIXME: Use of PowerPC assembly should be enabled here.
--- a/configs/linux-ppc-static
+++ b/configs/linux-ppc-static
@@ -0,0 +1,14 @@
 # Configuration for Linux on PPC, static libs
 include $(TOP)/configs/linux-ppc
 CONFIG_NAME = linux-ppc-static
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/linux-profile
+++ b/configs/linux-profile
@@ -0,0 +1,8 @@
 # Configuration for profiling on Linux with gprof
 include $(TOP)/configs/linux-static
 CONFIG_NAME = linux-profile
 OPT_FLAGS = -pg -g -O2
 DEFINES += -DNDEBUG
--- a/configs/linux-sparc
+++ b/configs/linux-sparc
@@ -0,0 +1,9 @@
 # Configuration for Linux on Sparc
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-sparc
 #ASM_FLAGS = -DUSE_SPARC_ASM
 #MESA_ASM_SOURCES = $(SPARC_SOURCES)
 #GLAPI_ASM_SOURCES = $(SPARC_API)
--- a/configs/linux-sparc5
+++ b/configs/linux-sparc5
@@ -0,0 +1,7 @@
 # Configuration for Linux on Sparc5
 include $(TOP)/configs/linux-sparc
 CONFIG_NAME = linux-sparc5
 ARCH_FLAGS += -mcpu=ultrasparc
--- a/configs/linux-static
+++ b/configs/linux-static
@@ -0,0 +1,23 @@
 # Configuration for generic Linux, making static libs
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-static
 MKLIB_OPTIONS = -static
 PIC_FLAGS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLW_LIB_DEPS = 
 # Need to specify all libraries we may need
 	-l$(GL_LIB) -lm -L/usr/X11R6/lib/ -lX11 -lXext -lXmu -lXi -lpthread
--- a/configs/linux-ultrasparc
+++ b/configs/linux-ultrasparc
@@ -0,0 +1,7 @@
 # Configuration for Linux on UltraSparc
 include $(TOP)/configs/linux-sparc
 CONFIG_NAME = linux-ultrasparc
 ARCH_FLAGS += -mv8 -mtune=ultrasparc
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -0,0 +1,11 @@
 # Configuration for Linux with x86 optimizations
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-x86
 ARCH_FLAGS = -m32 -mmmx -msse -msse2
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 MESA_ASM_SOURCES = $(X86_SOURCES)
 GLAPI_ASM_SOURCES = $(X86_API)
--- a/configs/linux-x86-32
+++ b/configs/linux-x86-32
@@ -0,0 +1,7 @@
 # To build Linux x86 32-bit in an x86-64 environment
 include $(TOP)/configs/linux-x86
 CONFIG_NAME = linux-x86-32
 ARCH_FLAGS += -m32
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -0,0 +1,14 @@
 # Configuration for Linux for 64-bit X86 (Opteron)
 include $(TOP)/configs/linux
 CONFIG_NAME = linux-x86-64
 ARCH_FLAGS = -m64
 MESA_ASM_SOURCES = $(X86-64_SOURCES)
 GLAPI_ASM_SOURCES = $(X86-64_API)
 ASM_FLAGS = -DUSE_X86_64_ASM
 LIB_DIR = lib64
 EXTRA_LIB_PATH = -L/usr/X11R6/lib64
--- a/Show More
+++ b/Show More