New upstream snapshot

2 files changed, 307 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1206f32ac49..cef81d90a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,304 @@
+commit f5145a6ec3e9086988ab8ec004276f845fecc3d9
+Author: Jakob Bornecrantz <jakob@vmware.com>
+Date:   Fri Jan 29 17:11:36 2010 +0100
+
+    vmware/core: Remove old ioctl structs not used
+    
+    Leftover that was never used in this driver
+
+commit ddedfe12d41808c3caa77649e3a9a6c4c6253d69
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Thu Jan 28 20:51:52 2010 +0000
+
+    svga: Actually call fence_reference in texture downloads.
+
+commit cb5447f79ca03d29407e8db84166f5bddd8d4c59
+Author: Brian Paul <brianp@vmware.com>
+Date:   Fri Jan 29 08:26:23 2010 -0700
+
+    glsl: fix preprocessor bug involving //-style comments in macro definitions
+    
+    See comments for details.
+
+commit 9fd3c74724e557bc6ecc851d8552615ab3becfe2
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:05:36 2010 -0700
+
+    tnl: check that state is validated before drawing
+
+commit 4d1234e22242529c8d85f5ef0cf826af41a91570
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:05:23 2010 -0700
+
+    st/mesa: check that state is validated before drawing
+
+commit 3cba779e16935f7c3a0bfd8af48bd5e015068e96
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:04:16 2010 -0700
+
+    vbo: fix missing state validation bugs
+    
+    Commit 2708ddfb06a36d8568e2aa130bf1f7d551fcd309 caused a few regressions.
+    We need to check/validate state after calling bind_arrays() because
+    it might set the _NEW_ARRAYS flag if the varying VP inputs change.
+    
+    The symptom of this problem was some attribute arrays being ignored
+    (or interpreted as constant-valued) in glDrawRangeElements or
+    glMultiDrawElements.
+    
+    A follow-on patch will add some additional asserts to try to catch
+    this kind of thing in the future.
+
+commit 23eda89ec89e2bd5bc26077bd56e8d6b5d4040d4
+Author: Brian Paul <brianp@vmware.com>
+Date:   Thu Jan 28 13:02:40 2010 -0700
+
+    mesa: do state validation in _mesa_valid_to_render()
+    
+    ...rather than checking/validating before all the calls to
+    _mesa_valid_to_render() and valid_to_render().
+    
+    The next patch will actually fix some bugs...
+
+commit 6e68898b05dc957dc6cb92d2ff060589e5936650
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 21:05:31 2009 +0000
+
+    softpipe: Flush draw module when fragment pipeline state changes.
+
+commit 1befcd5a2ae8588f8d17d2ecea19dd4daccddb00
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 11:01:05 2009 +0000
+
+    softpipe: Flush draw module before switching framebuffer.
+    
+    Otherwise geometry might end up in the wrong rendertarget.
+
+commit 12ba3559785fa276b3b4b6fa06cfe551b87aecc3
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Mon Nov 23 11:21:11 2009 +0000
+
+    llvmpipe: Use assert instead of abort. Only verify functions on debug builds.
+
+commit a0907a645f7d832e7c53d14c2ed88080b456a1a5
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sun Nov 15 06:46:48 2009 -0800
+
+    llvmpipe: Fix memory leak.
+
+commit 1acf7a09e762e6d8a26c8f0d919f5efa6df6e71f
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Nov 10 17:52:53 2009 -0800
+
+    llvmpipe: Use the generic conversion routine for depths.
+    
+    This allows for z32f depth format to work correctly.
+
+commit 14dc02a1b2c52cf02b7f89885b61f42575834958
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Nov 10 17:51:06 2009 -0800
+
+    llvmpipe: Be more conservative with the supported formats.
+    
+    We'll likely support much more formats, but doing this allows to run
+    more testsuites without immediately hit assertion failures.
+
+commit 88cf87bd5633c0e8155e4226fc49ab36f1abc335
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Mon Dec 28 22:52:41 2009 +0000
+
+    llvmpipe: Unmapping vertex/index buffers does NOT flush draw module anymore.
+    
+    Not since 6094e79f4e3350d123c7532b1c73faa60834a62d.
+    
+    Drivers now need to flush draw module explicitely (which explains why
+    all those previous commits adding draw_flushes calls were necessary).
+    
+    This is a good thing, but it's tricky to get this right in face of user buffers
+    (it's not even clear who has the responsibility to flush when a user buffer
+    is seen -- statetracker or pipe driver), so just force flush (temporarily)
+    since it's not a bottleneck now.
+
+commit 31b3420688dbf7fc2282f0d1fe13e51fe9e1f9b6
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 15:21:16 2009 +0000
+
+    llvmpipe: Treat state changes systematically.
+    
+    That is:
+    - check for no op
+    - update/flush draw module
+    - update bound state and mark it as dirty
+    
+    In particular flushing the draw module is important since it may contain
+    unflushed primitives which would otherwise be draw with wrong state.
+
+commit 4e95983fa832cf0808ccab64e9fbfb0fcdde8049
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Sat Dec 26 11:00:42 2009 +0000
+
+    llvmpipe: Flush draw module before switching framebuffer.
+    
+    Otherwise geometry will end up in the wrong rendertarget.
+
+commit 4e506eac8f11a23249a46265b796c4764d9d045e
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Dec 16 15:06:02 2009 +0000
+
+    llvmpipe: add LP_DEBUG env var
+    
+    Cherry-picked from dec35d04aeb398eef159aaf8cde5e0d04622b811.
+
+commit 46167149ceac96cf91f2031d2c58346b80f0834d
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Dec 14 15:27:35 2009 -0700
+
+    llvmpipe: fix broken TGSI_OPCODE_FRC codegen
+
+commit 96ec4eb755d0296c807ca5c89383a3b9f9fc1dbe
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Dec 14 15:24:31 2009 -0700
+
+    llvmpipe: fix broken lp_build_abs()
+
+commit e20547042c03e22234c9580f005286552bd4ae18
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 14:46:43 2009 +0000
+
+    llvmpipe: Fix yet another copynpaste typo in lp_build_log2_approx.
+    
+    Now fslight looks perfect.
+
+commit 0451d0fd01bdd4ee6a2497a3a1c749446739602e
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 14:15:52 2009 +0000
+
+    llvmpipe: Fix lp_build_polynomial comment.
+
+commit aa8b23e077f8c4f4c517e58533a72db0fb861091
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 13:58:53 2009 +0000
+
+    llvmpipe: Fix typo in lp_build_log constant.
+
+commit 4eb48a3af78beda4ee1628d0ecd6a437a0721a72
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue Dec 15 12:13:43 2009 +0000
+
+    llvmpipe: Fix bad SI -> FP conversion into lp_build_log2_approx.
+    
+    It should be a bitcast  as the integer value is actually an encoded FP
+    already.
+
+commit 8db8adfd01a1ff1e2a160ae3b0199bd3daa4191a
+Author: Jakob Bornecrantz <jakob@vmware.com>
+Date:   Thu Jan 28 17:59:26 2010 +0100
+
+    st/xorg: Update to new libkms interface but be backwards compatible
+
+commit 8e240d7e0eb640cc954f6d81119136e2d546d618
+Author: Keith Whitwell <keithw@vmware.com>
+Date:   Mon Aug 10 18:45:07 2009 +0100
+
+    svga: remove sleep in DEBUG_FLUSH path
+
+commit 40298bf272c7fbb289b442b4424c2c17402ae322
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Thu Jan 28 17:11:02 2010 +0000
+
+    python/retrace: Dump all vertices for verbosity level 3.
+
+commit a0518e66b2960d3bab386985e24ccbc9c51abf97
+Author: Brian Paul <brianp@vmware.com>
+Date:   Wed Jan 27 17:08:03 2010 -0700
+
+    docs: Fixed Windows build for 7.7.1
+
+commit 82c76cd16f35f4d903f49761af7eb28a755ad299
+Author: Brian Paul <brianp@vmware.com>
+Date:   Wed Jan 27 16:25:59 2010 -0700
+
+    windows: assorted build fixes
+    
+    These changes were originally submitted by Karl Schultz for Mesa 7.7-rc2
+    but weren't applied.
+
+commit 50e890bc51cfc278378f25cb70be79f1bad0b6b6
+Author: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
+Date:   Tue Jan 26 14:20:06 2010 -0700
+
+    glx: fix possible memory leaks in dri2CreateScreen()
+    
+    Original patch fixed up by Brian Paul.
+
+commit bba95570196dad29880426152a1b7fb77619296d
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jan 27 12:18:02 2010 -0500
+
+    r600: fix warning
+
+commit 2041d3e4b76009687bb2a7752c3ee94e5c160357
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jan 27 12:16:50 2010 -0500
+
+    r600: rv670 support 8 tex instructions just like other r6xx
+    
+    also clarify some other const values.
+
+commit 77b7b3a1ab36f1dafa905dbe709d0d72dbc9d54d
+Author: Andre Maasikas <amaasikas@gmail.com>
+Date:   Wed Jan 27 11:22:56 2010 +0200
+
+    r600: increase max texture units to 16
+
+commit 0dab80fbfb5703bfbeed691051c353aeca3aaa7a
+Author: Andre Maasikas <amaasikas@gmail.com>
+Date:   Wed Jan 27 10:20:15 2010 +0200
+
+    r600: fix XPD with writemask
+    
+    same variable used for 2 different temp registers
+    fixes e.g. glsl/bump
+
+commit e3257912e006120f6ab611e77005eed1a464030a
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Jan 27 16:25:31 2010 +0000
+
+    mesa: Warn when indices are out of bounds, but do not skip the draw in debug builds.
+    
+    The driver (or preferably the hardware) should handle out of bounds
+    indices.
+    
+    If there are problems then it's better to detect those in the debug
+    builds.
+
+commit 15fe4918223f04fa89d523220609abea0cac34e2
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Jan 27 15:41:25 2010 +0000
+
+    svga: Prevent buffer overflow in buffer ranges.
+    
+    Do this by extending the nearest range to cover the new range.
+    
+    This fixes an access fault in Call of Duty which was doing many disjoint
+    glBufferSubData calls.
+
+commit ac597f5acc8886a0c44aaa4f2484f9d569ae5d6d
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Wed Jan 27 14:45:56 2010 +0000
+
+    svga: Fix PIPE_LOGICOP_INVERT.
+    
+    Actually the current XOR implementation is an INVERT.
+    
+    This fixes rectangle selection in Maya.
+
+commit 5cb255f0d7ab048355b454d69e44ab9735c8921e
+Author: Keith Whitwell <keithw@vmware.com>
+Date:   Wed Jan 27 13:48:21 2010 +0000
+
+    svga: better path for generating white pixels for xor logicop workaround
+
 commit 2f28ca0a27cb0c539affb22c487c4bb44b6d54b4
 Author: Dave Airlie <airlied@redhat.com>
 Date:   Wed Jan 27 11:46:26 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index 656e050ae5c..0e7ebec325e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.7-3) UNRELEASED; urgency=low
+
+  * Pull from upstream mesa_7_7_branch up to commit f5145a6e.
+
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 01 Feb 2010 22:37:33 +0100
+
 mesa (7.7-2) experimental; urgency=low
 
   [ Julien Cristau ]