New upstream release and pull from upstream 7.8 branch

2 files changed, 410 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 64911906563..1371119fe50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,410 @@
+commit db3b34219ef1dbf9ebf5e524d3e459f9ad9571b5
+Author: Brian Paul <brianp@vmware.com>
+Date:   Fri Apr 16 08:25:58 2010 -0600
+
+    docs: update links for new mesa-users and mesa-announce lists
+
+commit 885048232fb715b0646d52ff35305941a25f1382
+Author: Tormod Volden <lists.tormod@gmail.com>
+Date:   Thu Apr 15 10:13:53 2010 -0700
+
+    savage: call _mesa_meta_init/free()
+    
+    Fixes crash when using _mesa_CopyTexImage2D.
+    Bug #27652.
+    
+    Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+    Signed-off-by: Brian Paul <brianp@vmware.com>
+
+commit b3a68cdc6f4bf2c006aa01f8980536e8e520d62a
+Author: Arpad Borsos <arpad.borsos@googlemail.com>
+Date:   Wed Apr 14 14:26:32 2010 -0600
+
+    softpipe: Fix division by zero
+    
+    This can be triggered by running the cairo tests using the gl backend
+    and softpipe.
+    
+    Signed-off-by: Brian Paul <brianp@vmware.com>
+
+commit d9793fc3ac0986f8665e269ecf993705132d0360
+Author: Michael Schmidt <mschmidt@redhat.com>
+Date:   Wed Apr 14 10:12:42 2010 -0400
+
+    Initialize DRI2 swap interval to 0
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=27628
+
+commit 157bdd1446dd21cc87a89abdc890b2f6dc83af76
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date:   Tue Apr 13 09:38:41 2010 -0700
+
+    DRI2: report swap events correctly in direct rendered case
+    
+    In the direct rendered case, we need to convert DRI2 swap complete
+    events to GLX events for the client to consume.  This path had what
+    looks like a stray "& 0x75" from some earlier debugging that prevented
+    clients from seeing the right event code.
+
+commit 497b66094df5bfeb210ab0ebbdcf1e0b811b001a
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Apr 12 18:45:10 2010 -0600
+
+    docs: update name, link for mesa-dev list
+
+commit 4a796264dfc1bdba37a7204f3439a8da213109ed
+Author: Vinson Lee <vlee@vmware.com>
+Date:   Sun Apr 11 17:56:21 2010 -0700
+
+    i915g: Fix assert.
+
+commit 2657325c4a73a2bfa94888a936d06466000e7fbf
+Author: Maciej Cencora <m.cencora@gmail.com>
+Date:   Sun Apr 11 12:39:54 2010 +0200
+
+    r300: respect radeon common code fallbacks
+    
+    Fixes progs/demos/shadowtex under KMS
+
+commit 6a5518861e541db76bae0fa69d1d025805d90f2c
+Author: Maciej Cencora <m.cencora@gmail.com>
+Date:   Fri Apr 9 21:14:15 2010 +0200
+
+    r300: set proper vertex index limits also in non indexed mode
+    
+    Fixes #27521, broken menus in UT2004 and broken water refraction in Sauerbraten.
+
+commit edff2e058571cfd8e1cb94e668c35f3d3cac4d80
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Fri Apr 9 20:20:42 2010 -0400
+
+    r600: add new r7xx pci ids
+
+commit 394c25133e756e9d9580b65e0f1af7d67155e0f7
+Author: Kristian Høgsberg <krh@bitplanet.net>
+Date:   Thu Apr 8 22:09:11 2010 -0400
+
+    glx: Fix config chooser logic for 'mask' matching
+    
+    When matching attributes using the 'mask' matching criteria, the spec
+    says that
+    
+      "Only GLXFBConfigs for which the set bits of attribute include all
+       the bits that are set in the requested value are
+       considered. (Additional bits might be set in the attribute)."
+    
+    The current test returns true if the two bit masks have bits in
+    common, specifically it matches even if the requested value has bits
+    set that are not set in the fbconfig attribute.  For example, an
+    application asking for
+    
+      GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT | GLX_PBUFFER_BIT,
+    
+    as glxpbdemo does, will match fbconfigs that don't support pbuffer
+    rendering, as long as they support pixmap rendering.
+    
+    Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+
+commit b22a00bff4aadd390dd8af6b5b05bd2833ec7f85
+Author: Brian Paul <brianp@vmware.com>
+Date:   Fri Apr 9 10:03:31 2010 -0600
+
+    mesa: fix instruction indexing bugs
+    
+    We were looping over instructions but only looking at the 0th instruction's
+    opcode.
+    
+    Fixes fd.o bug 27566.
+
+commit 21cf976ad970bb407b53a863a30efbcd1c8bbf7c
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Apr 8 13:11:05 2010 -0600
+
+    docs: link to 7.8.2 release notes
+
+commit 3ad9a98ec2646caa283b6634fda38c482de33bab
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Apr 8 13:10:51 2010 -0600
+
+    docs: initial 7.8.2 release notes
+
+commit ffedd28c9c9f218efb989deb38451c3bfc0b1e0f
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Apr 8 13:09:01 2010 -0600
+
+    progs/tests: added some debug code (disabled)
+
+commit bab6c0a03527f3d3b5124c6540cc167e3989c068
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Apr 8 13:05:35 2010 -0600
+
+    st/mesa: fix glDrawPixels(GL_DEPTH_COMPONENT) regression
+    
+    Commit 1454f20a991ddda35f1a2ffda953012078b407ba caused the regression.
+    When the vertex shader emitted both a texcoord and color we were grabbing
+    the wrong vertex attributes.  Fix the draw_quad() code to put texcoords
+    in slot[1] and color in slot[2].  That's a bit cleaner than changing
+    the vertex shader code.
+    
+    Tested with progs/tests/zreaddraw.c
+
+commit 8ac7d7fa05f34dcded533ba17ed3cec1f69e8906
+Author: Li Peng <peng.li@intel.com>
+Date:   Thu Apr 8 13:52:55 2010 -0400
+
+    intel: Call intel_prepare_render() in intelClear()
+    
+    Make sure we have up to date buffers before we start looking at
+    the tiling bits to determine how to clear.
+
+commit 4b39a0da89f5b07d4a24bc9ce52693e6c2acfe99
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Sat Apr 3 13:34:29 2010 +1000
+
+    texenvprogram: fix for ARB_draw_buffers.
+    
+    piglit has a test called fbo-drawbuffers, this fails for me on r300g,
+    and fixing the texenv program to use the DATA outputs fixes it.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 582e292a88ccb19bbaed8c4f313512a416b2076b
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Mon Apr 5 12:45:20 2010 -0700
+
+    docs: Update 7.8.1 release MD5 sums
+
+commit 5683d77b22b12129c4d715860671d331c760e362
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Apr 5 11:22:32 2010 -0600
+
+    mesa: bump MESA_TINY version
+
+commit 0e0de77f0e2583365f2c41bddee21526758b1bff
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Apr 5 11:12:59 2010 -0600
+
+    docs: added news item for 7.8.1 release
+
+commit 659669d74cdb2c37b5e7a74bb56e6ef326ff7d62
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Apr 5 11:10:51 2010 -0600
+
+    docs: add link to 7.8.1 release notes
+
+commit 0eea33b0696cee2cdea1e63a1714cec267d9b990
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Apr 5 11:00:52 2010 -0600
+
+    softpipe: index the correct blend/mask state index
+    
+    Need to check pipe_blend_state::independent_blend_enable to determine
+    which render target/index to use when checking blend enable and colormask
+    state.
+    
+    This is part of the fix for piglit/fbo-drawbuffers
+
+commit 1ad1a51f140fcf6eba5a976f01e74e33d2b661d4
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Mon Apr 5 09:51:18 2010 -0700
+
+    docs: Add 7.8.1 release MD5 sums
+
+commit 88b7329cdd8f3fc22f18a84175822f81930b4d50
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Mon Apr 5 09:49:08 2010 -0700
+
+    mesa: set version string to 7.8.1
+
+commit dcaa2c6e761ef3f910c94c0e4e4980626ab8e11e
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Mon Apr 5 09:12:33 2010 -0700
+
+    Initial 7.8.1 release notes
+
+commit f820b263db0d3bc46b4ea7b41bbe026cbf990430
+Author: Henri Verbeet <hverbeet@gmail.com>
+Date:   Sun Apr 4 10:24:46 2010 -0700
+
+    mesa: update_arrays() depends on program state.
+    
+    It uses ctx->VertexProgram._Current.
+    
+    Signed-off-by: Brian Paul <brianp@vmware.com>
+
+commit 42ea25cb4ecae09b5cc011a95d42ba7f0645dde3
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Sun Apr 4 23:06:01 2010 -0700
+
+    Update to final names from GLX_INTEL_swap_event spec
+    
+    Fixes bug #27454.
+
+commit f66733e0773b4ec794438dd2422aeb28a791adda
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Sun Apr 4 16:53:41 2010 -0700
+
+    gl: updated glxext.h to version 27
+
+commit 930838efcdac04dd0a0c7ee0375364548a0efe8c
+Author: Vinson Lee <vlee@vmware.com>
+Date:   Sat Apr 3 12:14:21 2010 -0700
+
+    util: Use GCC atomic bultins on GCC 4.1 and higher only.
+
+commit 71b2f1d8e64eb77b1c1955c175d07def74855bad
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 12:28:41 2010 -0700
+
+    xdemos: Build object files first
+    
+    This helps debugging on darwin.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 67776f66c93abb44ee4d1432ba59458ce4fb28f7
+Author: Vinson Lee <vlee@vmware.com>
+Date:   Fri Apr 2 00:12:59 2010 -0700
+
+    glx: Fix compilation errors on non-GLX_DIRECT_RENDERING builds.
+    
+    Add ifdef guards around variables of types defined only for
+    GLX_DIRECT_RENDERING.
+
+commit 154d9242de865c3cca8e597be911d69a53077ab1
+Author: Chia-I Wu <olv@lunarg.com>
+Date:   Fri Apr 2 10:27:57 2010 +0800
+
+    st/vega: Do not depend on libm.
+    
+    This fixes the "no rule to make target -lm" error on darwin, reported by
+    Jeremy Huddleston.
+
+commit 2b4d8616f581a36ed98a491ac1ec14be69d37511
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date:   Thu Apr 1 17:26:04 2010 -0700
+
+    GLX/DRI2: pass GLX drawable ID to dri2InvalidateBuffers
+    
+    The IDs will be the same in the case where an X window is used directly
+    as a GLX drawable, but will fail if a new GLX drawable is created
+    explicitly, as with glxgears_fbconfig.
+    
+    Fixes fdo bug #27190.
+
+commit 115203281cf791221f586f03c14cfe4e0a44dd7a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 17:00:22 2010 -0700
+
+    Revert accidental commits from the xquartz tree
+    
+    This reverts commit 9aadc793f3db64cefa0b08f18abad424a659dacc.
+    This reverts commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1.
+    This reverts commit dbe8b013936d977ec63d6607bfd2fc6772d29787.
+    This reverts commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890.
+    This reverts commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b.
+    This reverts commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b.
+    This reverts commit 86a7978d37393ee34f876569ac06ffdb8d7289ae.
+    This reverts commit 437902ce978cde9a0e1aa260f12dc232a8501c42.
+
+commit 9aadc793f3db64cefa0b08f18abad424a659dacc
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 12:14:08 2010 -0700
+
+    apple: Don't build gallium
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Jan 2 00:03:53 2010 -0500
+
+    apple: Use mesa gl.h rather than generating one.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit dbe8b013936d977ec63d6607bfd2fc6772d29787
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 11:18:42 2010 -0700
+
+    apple: Integrate our libGL into the existing build system better
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 11:17:04 2010 -0700
+
+    apple: Change ifdefs for DRI to be DRI && !APPLE
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Dec 24 09:51:17 2009 -0800
+
+    apple: Remove duplicate headers that already exist in mesa.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 11:01:31 2010 -0700
+
+    apple: Initial import of libGL for OSX from AppleSGLX svn repository.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 86a7978d37393ee34f876569ac06ffdb8d7289ae
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 12:28:41 2010 -0700
+
+    xdemos: Build object files first
+    
+    This helps debugging on darwin.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 437902ce978cde9a0e1aa260f12dc232a8501c42
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 11:51:15 2010 -0700
+
+    xdemos: Fix a build failure for non-autoconf configs
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 16f568a1830ea17da82683f97e016cdc0aae0c65
+Author: Vinson Lee <vlee@vmware.com>
+Date:   Thu Apr 1 00:10:28 2010 -0700
+
+    glx: Fix compilation errors on non-GLX_DIRECT_RENDERING builds.
+    
+    driContext field for __GLXcontextRec struct is only defined if
+    GLX_DIRECT_RENDERING is set.
+
+commit e24f4378a1e29a8f81033c1c4a1c31ec9ca3706a
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date:   Wed Mar 31 15:44:25 2010 +1000
+
+    st/mesa: use BITFIELD64_BIT to access shader OutputsWritten in more places
+
+commit 07c6d94cd7272524ef06b2a787667e5d626137d2
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Tue Mar 30 11:50:13 2010 +0200
+
+    glx/dri2: Fix debug build with old dri2proto.
+    
+    Apparently the higher compiler optimization level in non-debug builds was
+    eliminating the unused functions referencing the unresolved DRI2 symbols...
+
+commit 2aafbd7c2ae6922edecec6662ebda6c71cc5e404
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Mar 29 12:01:28 2010 -0600
+
+    docs: fix 7.7.1 release date
+    
+    (cherry picked from commit e6f5ca0fa3bff975f2acb3a825d77f095bc9f43e)
+
 commit dec94903d98e3705a0b92d6e9227854eabb336b5
 Author: Ian Romanick <ian.d.romanick@intel.com>
 Date:   Sun Mar 28 16:35:56 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 53c5720910a..3301a7589fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-mesa (7.8-1) UNRELEASED; urgency=low
+mesa (7.8.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    + Pull from upstream 7.8 branch up to commit db3b3421.
   * Refresh patches.
   * Bump build dependency to libdrm-dev 2.4.19, x11proto-gl-dev 1.4.11,
     and x11proto-dri2-dev 2.1.
 
- -- Brice Goglin <bgoglin@debian.org>  Tue, 30 Mar 2010 21:42:31 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 18 Apr 2010 09:24:28 +0200
 
 mesa (7.7.1-1) unstable; urgency=low