New upstream snapshot

2 files changed, 1507 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 2567e54e6f4..1206f32ac49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1505 @@
+commit 2f28ca0a27cb0c539affb22c487c4bb44b6d54b4
+Author: Dave Airlie <[email protected]>
+Date:   Wed Jan 27 11:46:26 2010 +1000
+
+    radeon/r200/r300: don't clean non-emitted state.
+    
+    So if we don't actually emit an atom to the hw because we don't
+    need it in the current state (e.g. lighting related atoms when
+    lighting is off) then don't mark it as clean, because when
+    lighting gets switched on we won't emit it at all.
+    
+    This fixes funky gears colors.
+    
+    Signed-off-by: Dave Airlie <[email protected]>
+
+commit 0580e488daba592d442ab8a45aa8441064dd2705
+Author: Dave Airlie <[email protected]>
+Date:   Wed Jan 27 11:02:32 2010 +1000
+
+    radeon: remove unused file
+
+commit 5435f790fd91fb7ca42693eb7b987e09a8c8c875
+Author: José Fonseca <[email protected]>
+Date:   Mon Jan 25 19:46:40 2010 +0000
+
+    python: Add missing library on debug builds.
+
+commit 68ca19afd7299fa9c686f95d53b7e14df37aba4c
+Author: Erik Wien <[email protected]>
+Date:   Tue Jan 26 13:19:30 2010 -0700
+
+    mesa: Don't bind DRAW/READ_FRAMEBUFFER separately without FBO blit support
+    
+    If GL_EXT_framebuffer_blit was not supported _mesa_DeleteFramebuffersEXT
+    would raise an error when deleting the currently bound framebuffer. This
+    because it tried to bind the default DRAW- and READ_FRAMEBUFFER separately.
+    This patch binds the default FRAMEBUFFER instead in that case.
+    
+    Encountered in the fbo/fbo-copyteximage piglit test on R600.
+    
+    Patch cleaned up a bit by Brian Paul.
+
+commit cbecb8fc8e85cfafed7fd8fd0e2dd1143efcf62b
+Author: Brian Paul <[email protected]>
+Date:   Tue Jan 26 12:49:44 2010 -0700
+
+    vbo: if 'end' is out of bounds, clamp it
+    
+    If we determine that the 'end' parameter to glDrawElements() is out of
+    bounds, clamp it to the max legal index value.
+
+commit 645e297a0019eb2f7513bd801ffdaac03187f29f
+Author: Brian Paul <[email protected]>
+Date:   Tue Jan 26 12:47:51 2010 -0700
+
+    vbo: clamp DrawElements start/end to max possible values
+    
+    Some apps are sloppy with their start/end values.  Clamp them to
+    max possible values to prevent problems later.
+
+commit af1e9403e732651fe2cedde230ac7010f2f1a649
+Author: Brian Paul <[email protected]>
+Date:   Tue Jan 26 10:53:34 2010 -0700
+
+    mesa: remove redundant _MaxElement computation
+    
+    Eric added some new code to check if offset < obj_size before computing
+    _MaxElement but my original code was still present afterward and it
+    clobbered the _MaxElement value.
+    
+    Not sure if this came from a bad merge or what.
+
+commit 1d8b308cbf6e17f2703807152deaa1ee075882e2
+Author: Brian Paul <[email protected]>
+Date:   Tue Jan 26 09:12:32 2010 -0700
+
+    docs: document Intel, R300 env vars
+
+commit 6749310d3f60df70ad8f82db986871ab9496793b
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Mon Jan 25 20:07:43 2010 +0100
+
+    st/xorg: Fix crash on resize with libkms
+
+commit 0d051af6127d206d165a1034ca0795ce8fdcd389
+Author: Igor Oliveira <[email protected]>
+Date:   Mon Jan 25 09:53:53 2010 -0700
+
+    vega: fix incorrect samplers, textures indexes in blend_bind_samplers()
+    
+    Fixes fd.o bug 25863.
+    
+    Signed-off-by: Brian Paul <[email protected]>
+
+commit 6877c5de3c3ff39da514a74928ea270138cddff9
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Mon Jan 25 12:27:47 2010 +0100
+
+    vmware/xorg: Do buffer round-robin logic differently
+
+commit 0b482c4fbe69a807bb69bf92f37e362f818c664d
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Fri Jan 22 18:28:40 2010 +0100
+
+    st/xorg: Improve options and print them to log
+    
+    Set 2D acceleration to off by default
+    Get fallback debugging from the Xorg config
+    Also print if 3D acceleration is enabled
+
+commit a3b783ea294f348bf3424eeb4170dd7f0741519a
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Thu Jan 21 21:32:28 2010 +0100
+
+    vmware/xorg: Export pci_probe function for ugly chain-loading
+
+commit 36fd55f9f03b00263ee1ccf22bbb50e5ba048e80
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Thu Jan 21 21:23:22 2010 +0100
+
+    st/xorg: Export helper function for detecting modesetting
+
+commit 16cf7e14a6dee85fadc0ab4e7c066288c3362352
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Thu Jan 21 21:28:14 2010 +0100
+
+    st/xorg: Fix warning
+
+commit 47d30b0c2c36f952cc14deefb9f937f1b0a9b531
+Author: Brian Paul <[email protected]>
+Date:   Sun Jan 24 18:18:17 2010 -0700
+
+    st/mesa: fix int->uint conversion for negative scissor bound values
+    
+    Based on a patch by Xavier Chantry <[email protected]>:
+    
+    If x+width or y+height is negative, then maxx or maxy will get a bogus value
+    when converting that to unsigned. Fix this by setting 0 as minimal value.
+    
+    This was also triggered by teeworlds, but only with some combination of
+    resolution and map section. For example upper part of dm2 at 1280x1024.
+
+commit e88d6fe299cb43eedfae7f0fa3bb14c8086a8cd4
+Author: Brian Paul <[email protected]>
+Date:   Sun Jan 24 17:54:44 2010 -0700
+
+    mesa: move _mesa_debug() call earlier in _mesa_Scissor
+    
+    Part of a patch from Xavier Chantry <[email protected]>
+
+commit fdfa4c85297d5d25e7256bf73e35309b358af86c
+Author: Xavier Chantry <[email protected]>
+Date:   Sat Jan 23 17:27:21 2010 +0100
+
+    st/mesa: fix unsigned/signed breakage in scissor
+    
+    commit 53174afeeb introduced a portability change that converted GLint x,y
+    to GLuint. That breaks when x and y are negative, which seems to be allowed,
+    and which at least one game uses : teeworlds.
+    
+    Rather than simply reverting the change, it seems possible to convert the
+    16bit unsigned to GLint so that comparisons are made between signed integers
+    instead.  This hopefully does not break anything while keeping MSVC happy.
+    
+    Signed-off-by: Xavier Chantry <[email protected]>
+    Signed-off-by: Brian Paul <[email protected]>
+
+commit e85cb98a169f83e1a1ad7f17cbbedaee0ea47fe1
+Author: Vinson Lee <[email protected]>
+Date:   Sun Jan 24 00:17:00 2010 -0800
+
+    r200: Silence fprintf format warning.
+
+commit e02dc139520fab9f7189e0ae390f72ed674bb7d7
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 23:18:33 2010 -0800
+
+    x86: Do not build read_rgba_span_x86.S on Mac OS X.
+    
+    read_rgba_span_x86.S uses the pseudo-ops .hidden and .type which are
+    not recognized on Mac OS X.
+
+commit f429b80fffc57a6165b76e9345cf5b9383edd650
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 23:12:34 2010 -0800
+
+    x86: Do not use .hidden pseudo-op on Mac OS X.
+    
+    The .hidden directive is an unknown pseudo-op on Mac OS X.
+
+commit bc75ec0f3824176f3fd7182846b3ec36051945b3
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 22:59:31 2010 -0800
+
+    glapi: Do not use .type pseudo-op on Mac OS X.
+    
+    The .type directive is an unknown pseudo-op on Mac OS X.
+
+commit 6b55aacccbbc2c86f03eafab23d5d74bc165c9ed
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 21:43:26 2010 -0800
+
+    scons: Do not use ld options start-group and end-group on Darwin.
+    
+    Mac OS X ld does not support these options.
+
+commit d57ba16ae3943a93071ef1bbab4a13725b8ea20c
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 21:05:58 2010 -0800
+
+    scons: Define _DARWIN_C_SOURCE on Darwin builds.
+
+commit 7f2f42dd8093e585a6edff2b1173cc39fc6391df
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 20:56:49 2010 -0800
+
+    progs/demos: Remove unnecessary header from shadowtex.c.
+
+commit b62b524fee5f1b9ec9b53cc8f550a0c9a3d769c2
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 20:43:27 2010 -0800
+
+    r300: Remove unnecessary headers.
+
+commit fb6bff3712d71cfe131fbf70154d326cdf39e7c8
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 14:33:29 2010 -0800
+
+    intel: Remove unnecessary headers.
+
+commit 146a77af3f68d3a935fad5b143123280049e6c60
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 02:14:56 2010 -0800
+
+    radeon: Remove unused variable.
+
+commit 4bad0aef40b87cf1a2ef8ecb5cd560d8a162d0ec
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 01:54:53 2010 -0800
+
+    tdfx: Remove unnecessary headers.
+
+commit 283d9565bf18b828e1bc6ed8ef2692132b4e359e
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 01:40:44 2010 -0800
+
+    sis: Remove unnecessary headers.
+
+commit 09a142e5db8dc72407ffb16a1a4e02d6540f6095
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 00:38:14 2010 -0800
+
+    savage: Remove unnecessary headers.
+
+commit ca54a5b92043ba9564aca5af47f8c57a53cc48bc
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 23 00:19:29 2010 -0800
+
+    mga: Remove unnecessary headers.
+
+commit 634ec5c2abf05a9a8c27d9199ded5d1ad91e538a
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 22 23:53:39 2010 -0800
+
+    i965: Remove unnecessary headers.
+
+commit 329c1b59106cf4ada27eaa4694600dc281d8c0de
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 22 23:22:16 2010 -0800
+
+    i915: Remove unnecessary headers.
+
+commit 5e78903952961fc207b8da1f7b2d0c6ddfd49881
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 22 17:17:01 2010 -0700
+
+    gallium/util: fix incorrect shift in a4r4g4b4_put_tile_rgba()
+    
+    Fixes fd.o bug 23313.
+
+commit 099e8ec54d4f7b9cd9ae3a481d6a6ae60f4590be
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 22 15:41:08 2010 -0700
+
+    mesa: re-implement _mesa_ProgramEnvParameter4fvARB() with memcpy()
+    
+    This is faster and ensures that NaN floats get stored properly.
+    Before, NaN values (which might be used with UP2H, UP2US, UP4B and
+    UP4UB) weren't getting stored properly with gcc -O3.
+    
+    This is the second part of the fix for the piglit fp-unpack-01 failure
+    (bug 25973).
+
+commit 8d1a01d37039a76ecbb8fdb4c10ff8d11aa02dfb
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 22 15:36:28 2010 -0700
+
+    mesa: use new fetch_vector1ui() function for 'unpack' GPU instructions
+    
+    The UP2H, UP2US, UP4B and UP4UB instructions interpret the float
+    registers as integers.  With gcc -O3 some bits were getting mixed up
+    somewhere.  This is part of the fix for the piglit fp-unpack-01 test
+    failure (bug 25973).
+
+commit efde2df114c2c15212198cb196b50cd29bd75f70
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 22 13:07:04 2010 -0700
+
+    xlib/softpipe: more buffer free fixes
+    
+    The previous memory leak fix didn't always work properly.
+    Now check the xm_buffer::smh field (now documented!) to
+    see if the buffer points to shared memory.
+
+commit 64871747bb7b611ffe429fbf1724bd98ee25dd84
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 22 11:45:40 2010 -0700
+
+    gallium/draw: apply DRAW_PIPE_FLAG_MASK to all vertex elements
+    
+    Depending on first/last provoking vertex either the first or last
+    element/index may have the extra DRAW_PIPE_x flags.  Mask off those
+    bits for all vertex elements to be safe (esp. for the quad case).
+    This may be overly cautious, but it's a cheap operation.
+    
+    Fixes a segfault caused by large/bogus vertex indexes otherwise.
+
+commit 5ab0d49a07fb81b7545463310c91ada596e26e72
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 22 11:39:19 2010 -0700
+
+    gallium/draw: added comments, whitespace fixes
+
+commit 96280c2a41e5fda570ba37ff5fca87f2cde59234
+Author: Ruediger Oertel <[email protected]>
+Date:   Fri Jan 22 06:53:27 2010 -0800
+
+    Fix PowerPC related typo in spantmp2.h
+    
+    Signed-off-by: Matthias Hopf <[email protected]>
+    Signed-off-by: Brian Paul <[email protected]>
+
+commit 383f460cf7472af4a526668c2412ab08ea30c0ec
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 21:18:25 2010 -0800
+
+    vmware/core: Update for pipebuffer changes.
+    
+    In particular, delay patching GMR relocations until the buffers are
+    validated, since the buffers relative offset can only be established then.
+
+commit 3f6d732bfbe36b87f735d4f2287b21ad2ddd7535
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 23:41:57 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_cb_viewport.c.
+
+commit 8bc3c06d86b9c4b440402f1ca419da3045d2ed25
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 23:24:40 2010 -0800
+
+    progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.
+
+commit a1c5d8f61df9d9e22bcb0fc37a602ab712958151
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 23:09:06 2010 -0800
+
+    i915g: Remove unnecessary header.
+
+commit cea9250ff0fc8bfa0408b635ae2ef36bc0616e2e
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 23:07:29 2010 -0800
+
+    pipebuffer: Remove unnecessary header.
+
+commit dc544ad9c6e6e24fd2f19dfe83aa294d218f7310
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 22:57:12 2010 -0800
+
+    draw: Remove unnecessary headers.
+
+commit e8b5203fbb7657980a4ba421e14d656b42d2a35f
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 17:24:07 2010 -0800
+
+    svga: Remove unused variable.
+
+commit a626565178fb810f439fbdfdaf6cc28a973a6a81
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 15:51:37 2010 -0800
+
+    vmware/core: Flush preemptively the FIFO commands to keep the GMR working set within reasonable bounds.
+
+commit beb8e8f2f2de0c1221090554159129665a79a292
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 15:47:52 2010 -0800
+
+    vmware/core: Put GMR pool size in a define.
+
+commit e45579e50ba3b9736465f68377b3f5d0afb7c1da
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 15:27:26 2010 -0800
+
+    vmw/wgl: Update for pipebuffer changes.
+    
+    This is a minimum change to keep things building and running minimally -- it
+    might cause applications to fail to allocate buffers due to out of
+    GMR memory.
+    
+    A proper update will be commited later.
+
+commit 31e49dc54ee2d8b2c50ed1d19ab973f72a60f8d8
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 12:12:47 2010 -0800
+
+    svga: Remove duplicate code.
+
+commit 50edefec2dd5ec2990ab2cd699478139173d5fd2
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 14:24:53 2010 -0800
+
+    svga: Remove unused code.
+
+commit 9782d7cdf39c141d816efc48333d6a70ed3f2ac6
+Author: José Fonseca <[email protected]>
+Date:   Wed Jan 20 03:45:17 2010 -0800
+
+    svga: Don't swap buffers to system memory -- winsys' responsibility.
+
+commit c4ceba114161c029ecd2812eb075654b4411b59c
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 12:43:40 2010 -0800
+
+    pipebuffer: Release the lock during map wait. Cleanups.
+
+commit 3498616b03f4b1da7a2a74ed83e95aee77204a2f
+Author: José Fonseca <[email protected]>
+Date:   Wed Jan 20 03:43:53 2010 -0800
+
+    pipebuffer: Swap buffers out to system memory when running out of memory.
+
+commit 0bc885188464446dd94542e0af15f3985dcdf684
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 12:13:27 2010 -0800
+
+    svga: Avoid synchronization issues when doing SW TNL.
+
+commit 8410f7cde30cc1170ae266cf3a0eb7e0e37c454a
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 09:42:05 2010 -0800
+
+    mesa: Use pipe_buffer_write_nooverlap where appropriate.
+
+commit 37246f854b49101b5a112cd5a0bd93bab1b78f7a
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 09:38:47 2010 -0800
+
+    util: Set DISCARD & UNSYNCHRONIZED when uploading vertices sequentially.
+
+commit 17974949464b75f25f635443067b4495bb451248
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 09:32:17 2010 -0800
+
+    util: Use pipe_buffer_write_nooverlap in blits / mipmap generation.
+
+commit a8477fb00c1a7b8bfefb5779bc05c51cdb29cdb5
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 09:30:22 2010 -0800
+
+    gallium: New inline to write buffers which avoids synchronization.
+
+commit 707b28136f7b7dea49bce23b0fcd0a757646ff7a
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 09:19:25 2010 -0800
+
+    gallium: Set PIPE_BUFFER_USAGE_DISCARD flag in pipe_buffer_write.
+
+commit 13c2475339d502644464041fcaac3890770d3abd
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 09:13:15 2010 -0800
+
+    gallium: Remove temporary hack for the absence of a discard flag.
+    
+    PIPE_BUFFER_USAGE_DISCARD flag now exists.
+
+commit 0ae076bf40782c48b1b26ca63ed2c349532dd81e
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 21 12:12:33 2010 -0800
+
+    svga: Follow buffer usage semantics properly.
+    
+    It's necessary to download buffers from the host always, except if the
+    buffer is undefined, because:
+    - just PIPE_BUFFER_USAGE_CPU_WRITE doesn't guarantee all data is written
+      -- old contents may still pierce through
+    - PIPE_BUFFER_USAGE_DISCARD refers to a range, not the whole buffer, so
+      unless we track which parts have been modified and not we still need
+      to download the data.
+
+commit efc08bddb7622e4acfa795b58e1264b64b78ab4f
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 15:05:21 2010 -0800
+
+    st/xorg: Remove unnecessary headers.
+
+commit 2cf8164065b8704e2f32d77af14cde9e7979435c
+Author: Roland Scheidegger <[email protected]>
+Date:   Thu Jan 21 17:30:16 2010 -0500
+
+    r200: fix CS section size mismatch
+    
+    Partial fix for fdo bug 25544
+    
+    The tex handling will still need CS drm changes,
+    see bug 25544 for more.
+
+commit 4222bf3d3c7c85112f2e21bd3ea29b1f496ed8bb
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 14:31:15 2010 -0800
+
+    llvmpipe: Remove unnecessary headers.
+
+commit c50fe2c55cfe9c858b7b7859da79edb0693ee8bd
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 21 12:12:11 2010 -0800
+
+    svga: Remove unnecessary headers.
+
+commit e19b3c01f4442e2c85c6df19847368ecb7b2451f
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 20 22:52:49 2010 -0800
+
+    mach64: Remove unnecessary headers.
+
+commit 7c66211b7dcf302685b8cc3f80a4d90b73d7d62d
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 20 22:02:51 2010 -0800
+
+    i810: Remove unnecessary headers.
+
+commit 0bc2cbf82a20c0fa5b160605eb7e8118791f5fdd
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 20 16:27:44 2010 -0800
+
+    ffb: Remove unnecessary headers.
+
+commit a416123f5b0f05d95eb334473473f660c22b439e
+Author: Brian Paul <[email protected]>
+Date:   Wed Jan 20 10:32:13 2010 -0700
+
+    xlib/softpipe: fix buffer memory leak
+    
+    Fixes leak caused by window resize.
+
+commit 65d2a266375cf32fd90c7fb77fb87993d3a652ea
+Author: Brian Paul <[email protected]>
+Date:   Wed Jan 20 08:03:46 2010 -0700
+
+    st/mesa: fix format logic in compatible_src_dst_formats()
+    
+    We need to consider the user-requested formats, not the actual device-
+    chosen formats.  See code comments for more details.
+
+commit 4e34c5d0b5ef36d4a107e93653937f7715ce2c5a
+Author: Brian Paul <[email protected]>
+Date:   Tue Jan 19 16:42:43 2010 -0700
+
+    docs: updated Mesa mailing list info
+
+commit 9f728ed1c9c7255554109299508a78b9fbb1cdb6
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Wed Jan 20 14:53:38 2010 +0000
+
+    st/xorg: Fic bug and close drm_api at proper place
+
+commit e3cb614f932ac417d446c84bd54f86d01b1cdcd9
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 20 00:08:54 2010 -0800
+
+    softpipe: Remove unnecessary headers.
+
+commit ac2a665fd75249e02838ec63ef4a5b3db093ceb1
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 19 22:47:03 2010 -0800
+
+    i915g: Remove unnecessary headers.
+
+commit bea9ed4dc6abbcf2b95f5f55554800d4f41da47a
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Tue Jan 19 22:26:01 2010 +0100
+
+    svga: Do a more propper creation of textures from handles
+
+commit c78fe6e050c311a3d53ccb091686a65ee6933a90
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Tue Jan 19 23:29:56 2010 +0100
+
+    st/xorg: Don't leak BusID buffer
+
+commit 65354a7e3d8fd094837b7a999e8975dcfbd9d9c9
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Tue Jan 19 17:14:19 2010 +0000
+
+    st/xorg: Pass kernel driver name to drmOpen
+
+commit a5fb5d6a54195d19942482873d0738eaade9e986
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Tue Jan 19 16:46:28 2010 +0000
+
+    st/drm: Expose kernel driver name
+    
+    Based on patch by Chia-I Wu <[email protected]>
+    
+    Expose the name of the kernel driver as accepted by drmOpenByName.
+
+commit 116a02be2264807dafb5fdfd4e3c913bb728c11f
+Author: Ben Skeggs <[email protected]>
+Date:   Mon Jan 11 11:41:47 2010 +1000
+
+    st/dri: update dri2 drawables when viewport is changed
+    
+    Fixes gnome-shell on nouveau, as well as window resize with various
+    other applications.
+    
+    Signed-off-by: Ben Skeggs <[email protected]>
+
+commit e88294328cb71dc32941556da5bd4ed40e8b95f1
+Author: Luca Barbieri <[email protected]>
+Date:   Sat Jan 16 23:19:19 2010 -0800
+
+    glx: Set GL context to null in __glXSetCurrentContextNull
+    
+    __glXSetCurrentContextNull currently does not set the GL context to null
+    in the direct rendering case.
+    
+    This can result in a segfault trying to flush an invalid old context
+    in glXMakeCurrent.
+    
+    This fixes a crash starting the Unigine demos (they still don't work due
+    to missing extensions though).
+    
+    Signed-off-by: Brian Paul <[email protected]>
+
+commit 7a39a5c1cb5087a1b8247f9bed59bf9374717cb3
+Author: José Fonseca <[email protected]>
+Date:   Tue Jan 19 06:13:44 2010 -0800
+
+    wgl: Check for PIPE_TEXTURE_USAGE_DISPLAY_TARGET support in exported color pixel formats.
+    
+    Since all formats we export have PFD_DRAW_TO_WINDOW flag.
+
+commit 5e870f4fe9e71b7f467f2a0b03934352f90846cc
+Author: José Fonseca <[email protected]>
+Date:   Tue Jan 19 06:12:10 2010 -0800
+
+    wgl: Don't export pure-stencil pixel formats.
+    
+    They cause DCT's conform to always fail.
+
+commit e5da7b8548842500e751b133b96b28113fbe0d76
+Author: José Fonseca <[email protected]>
+Date:   Tue Jan 19 05:39:18 2010 -0800
+
+    softpipe: Fix vertex buffer memory leak.
+
+commit faa99dd31de7dad4e9851b12f7f788adb6fce0fc
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 19 00:45:16 2010 -0800
+
+    unichrome: Remove unnecessary headers.
+
+commit 45a27eacd6301078c6f62682193dda3141088fe2
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 22:50:08 2010 -0800
+
+    mesa: Remove unnecessary header from attrib.c.
+
+commit 2613fa815abd7d794ec7144f0ad19ef4f65da991
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 22:45:23 2010 -0800
+
+    mesa: Remove unnecessary header from blend.c.
+
+commit c4ad036ce145ab04677b6e40c18315906b897a31
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 22:17:03 2010 -0800
+
+    mesa: Remove unnecessary headers from buffers.c.
+
+commit 7366d8e7d20efc673702d7c6c9603d507edcf06d
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:56:58 2010 -0800
+
+    mesa: Remove unnecessary header from convolve.c.
+
+commit 08063ba4499c47c9b55c80878a668050c6272c30
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:41:31 2010 -0800
+
+    mesa: Fix typo of 'unknown' in debug.c.
+
+commit b36b85f9d0c721188582e6daa3328ab9766f85c0
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:37:18 2010 -0800
+
+    mesa: Remove unnecessary headers from debug.c.
+
+commit 6deb8c9831c60ed5ae93966b5a37d1215b8682a4
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:34:25 2010 -0800
+
+    mesa: Remove unnecessary header from depthstencil.c.
+
+commit 2660511ea94c2d3abe8495258f7ea693cae3759e
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:31:02 2010 -0800
+
+    mesa: Remove unnecessary headers from dlist.c.
+
+commit 7395ab042aedb3ef29d3c5d974138bc4430cb772
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:22:47 2010 -0800
+
+    mesa: Remove unnecessary header from drawpix.c.
+
+commit 0b3109aa053539b2e07ec16da980615f16dd8c2b
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:17:45 2010 -0800
+
+    mesa: Remove unnecessary header from enable.c.
+
+commit 536e3c9168c315651210ca853eb8cb4423f9f71c
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:14:04 2010 -0800
+
+    mesa: Remove unnecessary headers from fbobject.c.
+
+commit b6dce54214c804e46aab05acd03a64c35a9baa63
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:07:53 2010 -0800
+
+    mesa: Remove unnecessary header from formats.c.
+
+commit 2cbc3e0a206b701780c893cf96507778ab1fb5a1
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 21:02:19 2010 -0800
+
+    mesa: Remove unnecessary header from image.c.
+
+commit 65fa11959f118a75a82d1e432df0b635d316889f
+Author: José Fonseca <[email protected]>
+Date:   Mon Jan 18 19:33:13 2010 -0800
+
+    softpipe: Skip depth testing for PIPE_S8_UNORM.
+
+commit 8fb92e96e90a8cb57da78444fd3395aba424cb0a
+Author: José Fonseca <[email protected]>
+Date:   Mon Jan 18 19:32:36 2010 -0800
+
+    mesa: Handle PIPE_FORMAT_B8G8R8X8_UNORM.
+
+commit bcadde2068563b818a280e40e6189191e10fd371
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 14 15:07:20 2010 +0000
+
+    pipebuffer: Ensure buffer size/alignment is not zero.
+
+commit dc298559c6c838d8ad744e07c134a1c8846c9b33
+Author: José Fonseca <[email protected]>
+Date:   Thu Jan 14 15:06:48 2010 +0000
+
+    svga: Ensure buffer size/alignment is not zero.
+
+commit ebd10755984d582fa65c71b58bc20015e2ea9caf
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 19:32:51 2010 -0800
+
+    mesa: Remove unnecessary headers from lines.c.
+
+commit d0125e3c29942ae7a81a66748ea53b402114993d
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 19:23:47 2010 -0800
+
+    mesa: Remove unnecessary header from mipmap.c.
+
+commit ed5a116eb411aed2a2f1986a1effbb8a426b0065
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 19:20:56 2010 -0800
+
+    mesa: Remove unnecessary header from pixel.c.
+
+commit 2f83948370c686d1f5f0b1e0d23b5286169e850d
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 19:14:23 2010 -0800
+
+    mesa: Remove unnecessary headers from pixelstore.c.
+
+commit 419ae5a48339795d369a41d66312246b2e19f201
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 19:10:05 2010 -0800
+
+    mesa: Remove unnecessary header from points.c.
+
+commit 80ea879cfa63354ec1312a107f63934c1e6c7824
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 19:03:54 2010 -0800
+
+    mesa: Remove unnecessary header from polygon.c.
+
+commit 66035503532a17110e36d1d1053e98a1595d03d9
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 18:54:54 2010 -0800
+
+    mesa: Remove unnecessary header from state.c.
+
+commit ec29ba12a687c8a08ecba002216bbd9f56facef0
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 18:52:24 2010 -0800
+
+    mesa: Remove unnecessary headers from texcompress.c.
+
+commit f8db32acbd03079d4ef30daa1db1339aa35b5cfb
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 18:14:03 2010 -0800
+
+    st/dri: Add comment for intentional fallthrough in case statement.
+
+commit 28576c9ac5a3b6459d94822f333d2e3fbefe5003
+Author: Brian Paul <[email protected]>
+Date:   Mon Jan 18 11:26:55 2010 -0700
+
+    st/mesa: change instruction count assertion to > 0
+    
+    Shaders should at least have an END instruction.
+
+commit e978b24c87be6d7572ed3272e6b186d5c54fb414
+Author: Marcin Slusarz <[email protected]>
+Date:   Mon Jan 18 10:48:06 2010 -0700
+
+    st/dri: fix optionCache memory leaks
+    
+    Signed-off-by: Brian Paul <[email protected]>
+
+commit 23ae31820042f2bc4694f7c48696a697d674b802
+Author: Marcin Slusarz <[email protected]>
+Date:   Sun Jan 17 14:49:34 2010 -0800
+
+    glxgears: unbind current context before "destroying" it
+    
+    glXDestroyContext does not destroy the context if it's still
+    connected to some window. Unbind context from window to test it.
+    
+    Signed-off-by: Brian Paul <[email protected]>
+
+commit ccc888c39ee8a7c460dca5b1b659d28dbbc4c689
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Fri Jan 15 01:29:13 2010 +0000
+
+    st/xorg: If dri2 version is 2 support version 1 as well
+    
+    Thanks to X server commit 2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca
+    it is possible to be ABI compatible in version 2 with version 1 of
+    the DRI2 interface.
+
+commit 3e1241d4f872cca96616edcbdcaea5b59d37e78f
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Fri Jan 15 01:14:55 2010 +0000
+
+    st/xorg: Set enforce version to 1 if not defined
+
+commit ae97520e37ee70c813a198c805c7338aefbd8156
+Author: Thomas Hellstrom <[email protected]>
+Date:   Mon Jan 18 15:55:17 2010 +0100
+
+    ws/vmware: Check DRM version also when bootstrapping in dri2 mode.
+    
+    Signed-off-by: Thomas Hellstrom <[email protected]>
+
+commit 5f2d60a7154f896bb418231662663465269ce9b8
+Author: Thomas Hellstrom <[email protected]>
+Date:   Mon Jan 18 13:33:08 2010 +0100
+
+    st/dri: Don't request a fake front if the server adds one automatically.
+    
+    We use the presence of the getBuffersWithFormat extension function to
+    detect whether the server automatically adds a front.
+    
+    Signed-off-by: Thomas Hellstrom <[email protected]>
+
+commit d773f28ff29a0abbb9f856cb4a3c60fcaeea1d3b
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 00:47:56 2010 -0800
+
+    mesa: Remove unnecessary headers from texformat.c.
+
+commit 39824945fa738666b4bb804382904b0537322878
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 18 00:14:51 2010 -0800
+
+    mesa: Remove unnecessary headers from texgetimage.c.
+
+commit 6938dccf1ac0955026ac68794a03f49bc370fd44
+Author: Vinson Lee <[email protected]>
+Date:   Sun Jan 17 22:31:53 2010 -0800
+
+    mesa: Remove unnecessary header from teximage.c.
+
+commit c847e7d07b3f43d5c05a920cf6326b89b31ed92b
+Author: Vinson Lee <[email protected]>
+Date:   Sun Jan 17 20:50:15 2010 -0800
+
+    mesa: Remove unnecessary header from texobj.c.
+
+commit 59eed7a2015cf301ea20392febc0de6b8d1ee0b1
+Author: Vinson Lee <[email protected]>
+Date:   Sun Jan 17 16:21:11 2010 -0800
+
+    mesa: Remove unnecessary header from texparam.c.
+
+commit 3e876431d01c50b5672d0ad28f7f8dbd20670616
+Author: Vinson Lee <[email protected]>
+Date:   Sun Jan 17 16:08:59 2010 -0800
+
+    mesa: Remove unnecessary headers from texstate.c.
+
+commit 6b6ac9aca08603fb0e3f91bf53fd6d49a1701e2a
+Author: Vinson Lee <[email protected]>
+Date:   Sun Jan 17 15:48:39 2010 -0800
+
+    mesa: Use preprocessor to comment out code.
+
+commit ae943f8e202fc3791bd56ac863e5493cd17bb44c
+Author: Vinson Lee <[email protected]>
+Date:   Sun Jan 17 01:49:16 2010 -0800
+
+    mesa: Remove unnecessary headers from vtxfmt.c.
+
+commit 97e44cde17ce508fd3708d391f7701e1919352fb
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 23:41:05 2010 -0800
+
+    mesa: Remove unnecessary headers from arbprogparse.c.
+
+commit 97fc7ae69f4e620a5b14a3dbe574c4810741293c
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 16:15:37 2010 -0800
+
+    mesa: Remove unnecessary header from nvvertparse.c.
+
+commit 5a4d5b694c0fa92b613bd73138d32f68b966a56c
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 16:06:58 2010 -0800
+
+    glsl: Remove unnecessary header from prog_execute.c.
+
+commit 148498d8cc897d70c54e9ddc09e957a855a597d4
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 15:51:52 2010 -0800
+
+    glsl: Remove unnecessary header from prog_statevars.c.
+
+commit 0d622420826ccbf35eed80b663994ffb918dc9a1
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 15:35:56 2010 -0800
+
+    glsl: Remove unnecessary headers from shader_api.c.
+
+commit 1f7762f62bb082fceb579434a4ca78f13d78da49
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 15:00:29 2010 -0800
+
+    glsl: Remove unnecessary header from slang_emit.c.
+
+commit 89950fbe24a351fbb10330b6695d653c9f2d6887
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 13:29:15 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_cb_drawpixels.c.
+
+commit 59db91e2eec1e755de71deba87227a647845b1c9
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 02:20:51 2010 -0800
+
+    glsl: Remove unnecessary header from slang_builtin.c.
+
+commit 535084996b050a75f230dc10c15bd6239e2aa08a
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 02:16:24 2010 -0800
+
+    glsl: Remove unnecessary headers from slang_compile.c.
+
+commit 1d3bdc20908f860316e0bfeaa54dc8fa6d344d0c
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 02:02:49 2010 -0800
+
+    glsl: Remove unnecessary header from slang_link.c.
+
+commit 10bd931949d8dd3c63fe8bcc00899875d7dde105
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 01:50:08 2010 -0800
+
+    glsl: Remove unnecessary header from slang_log.c.
+
+commit 533b6e8deb3443719bd82c57c79ec106e5473589
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 01:39:04 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_atom_framebuffer.c.
+
+commit 3eb85bf7d941aff1c72e0e0e2d8af18b8b7e496a
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 00:52:34 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_atom_pixeltransfer.c.
+
+commit bc639f291bd6127730845f9e6208e48e51cb83ff
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 00:45:36 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_atom_sampler.c.
+
+commit 227fc5a3083290bf8c494f1f08e911eed6e4cfcc
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 00:36:31 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_atom_shader.c.
+
+commit cc2f2268f5fcfbc7d942fab82a1bb00ac496fc23
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 00:30:25 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_accum.c.
+
+commit e1d4781cd49cd6df2fed171ad6e034f576f219a8
+Author: Vinson Lee <[email protected]>
+Date:   Sat Jan 16 00:08:54 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_bitmap.c.
+
+commit cc770c8409b31dd2dff7dd80cf441f90f191a048
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 15 23:17:00 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_blit.c.
+
+commit 6906bf08cc0ca43cd4fd1a2c6f841ad87c232ece
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 15 23:02:07 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_clear.c.
+
+commit 668d871d95e74862953c90e04e4f04ed02526421
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 15 22:55:47 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_drawpixels.c.
+
+commit adcde22952bb94dd73785bf5971a317e929fbec9
+Author: Alex Deucher <[email protected]>
+Date:   Fri Jan 15 22:23:40 2010 -0500
+
+    r600: fill in some missing XRGB tex formats
+
+commit 81eed59a2c6add1d1514574bf7c3b29b1bf6e8c0
+Author: Alex Deucher <[email protected]>
+Date:   Fri Jan 15 20:54:12 2010 -0500
+
+    r600: set tiling correctly for texturing from depth buffer
+
+commit 114ab07aee9cc3f007a22ae4642e5c4302900d2f
+Author: Alex Deucher <[email protected]>
+Date:   Fri Jan 15 20:53:53 2010 -0500
+
+    r600: fix typo in SQ setup
+
+commit 56cd5806e89fea9598e296ce656dfe550bf2b96e
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 15 18:24:12 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_cb_fbo.c.
+
+commit a9f625543169e0919c507966889d82ecf9db4c5f
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 15 18:20:56 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_feedback.c.
+
+commit 2d2d8900485ac9f462fccdb0a817f7fc598b95f8
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 15 16:28:56 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_cb_program.c.
+
+commit fbda223893301cc10182fb12c91493c959e3fe8b
+Author: Vinson Lee <[email protected]>
+Date:   Fri Jan 15 16:27:28 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_cb_queryobj.c.
+
+commit f595e72337f4cdc2ec6b0378f747e31666e70d5c
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 15 14:57:55 2010 -0700
+
+    tgsi: fix detection of front-facing attribute
+    
+    This code was not updated when we added TGSI_SEMANTIC_FACE a while ago.
+
+commit 2c5aa02e2086f5e79630cdffec804a3e9de0d966
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 15 14:25:30 2010 -0700
+
+    swrast: add missing call to _swrast_depth_bounds_test()
+    
+    We were calling this from the CI span function, but not the RGBA
+    span function.
+    
+    I don't know of a test program for the GL_EXT_depth_bounds_test
+    extension...
+
+commit 73856817973caab283427c52152672f524c49a07
+Author: Brian Paul <[email protected]>
+Date:   Fri Jan 15 14:19:23 2010 -0700
+
+    swrast: fix broken _swrast_depth_clamp_span()
+    
+    The integer Z clamping range depends on the number of bits
+    in the Z buffer because that's the scale factor used when we
+    transform NDC coords by the viewport/depth range.
+    
+    Fixes fd.o bug #25972 but only for Z buffers up to a depth
+    of 30 bits.  Beyond that we get into messy integer overflow
+    issues and things fall apart.
+
+commit 79a5a2839029eef23f4c238fec6878b5f87ceec3
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 23:05:42 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_cb_rasterpos.c.
+
+commit 9c2ef74a76fc3707ca428dca2ca401da790cb915
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 23:03:37 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_readpixels.c.
+
+commit cde041cd1320849be70dc8571da1460b8b913f14
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 22:30:00 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_cb_strings.c.
+
+commit 644572a3723bc5167fb71f15e0bbfec3f999be9b
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 22:27:13 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_texture.c.
+
+commit 4f8baf7dce47b1295292bf3d153d1e93ea83e6a1
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 19:00:27 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_cb_viewport.c.
+
+commit 53c6c384125726ad4e528d57272be95f197fb630
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 18:53:51 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_context.c.
+
+commit 604e9ec2c436b8bc595faf97db1a4f57fe5368f2
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 18:46:51 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_draw_feedback.c.
+
+commit 9e7778d7aa9bd079a4a5d3d1656d75d6e4978a1d
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 18:34:59 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_extensions.c.
+
+commit 8a8a27b01a60ba80608f736c46da82747c215586
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 18:19:39 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_format.c.
+
+commit eaedc1bb3e651884a184f520bd81aa12c569c29b
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 18:10:06 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_framebuffer.c.
+
+commit 6890b0698254051f366e0083eee40ed42613c58c
+Author: Vinson Lee <[email protected]>
+Date:   Thu Jan 14 17:54:47 2010 -0800
+
+    st/mesa: Remove unnecessary headers from st_gen_mipmap.c.
+
+commit 252812bf15c3479d921157b9a432c7e42d3b9446
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 23:28:00 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_program.c.
+
+commit c109ca9c492c8956ee32f17c16aa69b0ac0a855d
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 23:16:05 2010 -0800
+
+    st/mesa: Remove unnecessary header from st_texture.c.
+
+commit 6b39e8aeb033085c2685f541eca721a6c5639c91
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 23:01:03 2010 -0800
+
+    swrast: Remove unnecessary header from s_accum.c.
+
+commit 78411881d344b4e2d7243b6f9bebc2d692e3d943
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 22:58:07 2010 -0800
+
+    swrast: Remove unnecessary header from s_atifragshader.c.
+
+commit 0a708681310d03f3456b6f89bf7915b376f75fd1
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 22:45:54 2010 -0800
+
+    swrast: Remove unnecessary header from s_bitmap.c.
+
+commit 886cffb44e92dcdaeb5396a01745e78598e86a3f
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 22:43:16 2010 -0800
+
+    swrast: Remove unnecessary headers from s_copypix.c.
+
+commit cf061c24e041878368946fbcffa2906cfffd8b08
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 22:36:01 2010 -0800
+
+    swrast: Remove unnecessary header from s_depth.c.
+
+commit d1631f734a6f7d052e347e0f5eb878e156d1afa6
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 22:30:04 2010 -0800
+
+    swrast: Remove unnecessary header from s_drawpix.c.
+
+commit f649870c9bc0f7e0660af7131bf418830f6a34ae
+Author: Vinson Lee <[email protected]>
+Date:   Wed Jan 13 22:20:44 2010 -0800
+
+    swrast: Remove unnecessary header from s_feedback.c.
+
+commit a9086f2d17a58bd2597d34a6cc886dc111997e4e
+Author: Thomas Hellstrom <[email protected]>
+Date:   Wed Jan 13 17:40:41 2010 +0100
+
+    st/dri: Make sure we always request a fake front.
+    
+    This should be the correct, but sub-optimal way to handle things on
+    pre-1.7 servers. For servers that automatically adds a fake front
+    we should never request the fake front and handle the reply differently.
+    
+    Signed-off-by: Thomas Hellstrom <[email protected]>
+
+commit 1b333453e4998d5db76952aed6caa34d98dfdc7c
+Author: José Fonseca <[email protected]>
+Date:   Wed Jan 13 13:40:09 2010 +0000
+
+    svga: Fix compile_vs error code.
+    
+    It could erroneously return PIPE_OK in some circumstances.
+    
+    Make compile_fs code identical.
+
+commit 831764fa75b9a2ea5b42c2df35c6dcfcedcd9611
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 23:54:15 2010 -0800
+
+    swrast: Remove unnecessary header from s_fragprog.c.
+
+commit d6588a937293c88674e8c83ba5c34114d12180b1
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 21:59:58 2010 -0800
+
+    swrast: Remove unnecessary header in s_lines.c.
+
+commit 7debc532d50cacc83fb63b7bd36a80bbe432e792
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 21:51:19 2010 -0800
+
+    swrast: Remove unnecessary header from s_points.c.
+
+commit 11034bfa97d5991a2d8cd973ddfbb21935b53924
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 21:41:09 2010 -0800
+
+    swrast: Remove unnecessary header from s_readpix.c.
+
+commit a01b9eac0458eabf07b68bb52afe7026dd8bdfb2
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 20:36:33 2010 -0800
+
+    swrast: Remove unnecessary header from s_texcombine.c.
+
+commit c239f387091da9f81bbd315234a19d9b3e3ac694
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 20:14:36 2010 -0800
+
+    tnl: Remove unnecessary header from t_context.c.
+
+commit 2c7cf3f9c95098ef08966d19cd1990d3825fd9eb
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 20:02:44 2010 -0800
+
+    tnl: Remove unnecessary headers from t_draw.c.
+
+commit dffcbee8e72398e1492a1c957de788e1e87850ac
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 19:55:24 2010 -0800
+
+    tnl: Remove unnecessary header from t_pipeline.c.
+
+commit a24d852630a39be1b9a062f17976e8ff8db1df8b
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 19:49:19 2010 -0800
+
+    tnl: Remove unnecessary header from t_rasterpos.c.
+
+commit 264f4101cd52ad5b22a85f8f4709bd7b38b8d8e2
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 19:45:25 2010 -0800
+
+    tnl: Remove unnecessary header from t_vb_program.c.
+
+commit c63150100301ef524223df430271760b606784c3
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 17:07:24 2010 -0800
+
+    vbo: Remove unnecessary headers from vbo_exec.c.
+
+commit 94d238e7571413cb0be8a4fe6e231b739644d588
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 16:55:36 2010 -0800
+
+    vbo: Remove unnecessary header from vbo_exec_array.c.
+
+commit 37d326503dcd6c779e90c3f8f4626beba28dc449
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 16:37:30 2010 -0800
+
+    vbo: Remove unnecessary header from vbo_exec_draw.c.
+
+commit aee9a6f4e1bc4893f09c1f2b8d723c179c47b34a
+Author: Vinson Lee <[email protected]>
+Date:   Tue Jan 12 00:50:05 2010 -0800
+
+    vbo: Remove unnecessary headers from vbo_save.c.
+
+commit d2271d8a3940be30521cdebd6b711c6d9cfcd4e2
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 23:53:13 2010 -0800
+
+    vbo: Remove unnecessary header from vbo_save_loopback.c.
+
+commit 083dae14bd2d456515374449019afb164ae26655
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 22:46:30 2010 -0800
+
+    vbo: Remove unnecessary header from vbo_split_copy.c.
+
+commit 0d65a68f516ac38f5dad87041423f0891350b83a
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 21:04:16 2010 -0800
+
+    x86: Remove unnecessary header from x86_xform.c.
+
+commit 8e9ceb8309f2527ab94c9e09a6c3f0013419b17f
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 20:24:57 2010 -0800
+
+    progs/xdemos: Remove unnecessary header from corender.c.
+
+commit 477d51537f8be431cf7158010c1dd2451884dc7f
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 20:21:50 2010 -0800
+
+    progs/trivial: Remove unnecessary headers from tri-fbo-tex.c.
+
+commit 7241f5140fc5eef6e315d48f1b9a1155ecfe3166
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 20:15:59 2010 -0800
+
+    progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c.
+
+commit ae8ed89f2468373a158e74e6cc692d5519429f2f
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 19:57:46 2010 -0800
+
+    progs/tests: Remove duplicate included header in vparray.c.
+
+commit 6ed607cce69b54e87fcf71d2ac8fa2f6841a7b30
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 19:56:04 2010 -0800
+
+    progs/tests: Add newline to end of printf in vparray.c.
+
+commit 7bfa54c6a4fab41c37a593438cc5644c1483ce78
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 19:52:22 2010 -0800
+
+    progs/redbook: Remove unnecessary header from aapoly.c.
+
+commit 2178abfba344cf5a928418dc192519b3780eb854
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 19:42:55 2010 -0800
+
+    progs/glsl: Remove duplicate included header from shtest.c.
+
+commit 78ddce9fdada4b09a008b65d91e3e43cfe011459
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 19:29:26 2010 -0800
+
+    progs/demos: Remove unnecessary header from morph3d.c.
+
+commit 3fce8ad2de9500add86ca1e75c0c79361ee1b524
+Author: Brian Paul <[email protected]>
+Date:   Mon Jan 11 20:18:50 2010 -0700
+
+    Revert "util: Build u_bitmask.o when using make."
+    
+    This reverts commit 01eff0e6d23f90650de7c563f74a1aec3de112a6.
+    
+    u_bitmask.c was already in the C_SOURCES list.
+
+commit f07e87ffba38524a87613d14d01344a3343ec6fb
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 19:15:54 2010 -0800
+
+    progs/tests: Silence fprintf format warning.
+
+commit b4bc20852921f42f0499a174602e87bc3d4495f3
+Author: Vinson Lee <[email protected]>
+Date:   Mon Jan 11 19:03:18 2010 -0800
+
+    progs/demos: Remove unnecessary header from isosurf.c.
+
+commit d880b64423d9eab7e6cbe3ad93dfefd6a9613cce
+Author: Zack Rusin <[email protected]>
+Date:   Mon Jan 11 18:27:59 2010 -0500
+
+    st/xorg: move exaMoveInPixmap before trying to fetch it
+    
+    as Michel suggested, this is a cleaner way of fixing crashes caused
+    by exaGetPixmapDriverPrivate returning null since the data hasn't
+    been moved yet.
+
+commit 3447d545d99c450c6a13d8a37e9cb9f5463a40eb
+Author: Zack Rusin <[email protected]>
+Date:   Mon Jan 11 18:03:49 2010 -0500
+
+    st/xorg: fix a rare video crash
+    
+    sometimes dst isn't present if a window is in a middle of a resize, stop
+    crashing in those cases and just ignore a frame.
+
+commit 61f7252448af24942ba9fffe6d792abc1f7d9f84
+Author: Jakob Bornecrantz <[email protected]>
+Date:   Wed Jan 6 17:31:46 2010 +0100
+
+    Revert "pipebuffer: Multi-threading fixes for fencing."
+    
+    This reverts commit 5b64d94390e4805e1634f0c8b5e3156e12b8b872.
+
+commit cb51f0267853dad419d169587aecbecf1800e8c3
+Author: Thomas Hellstrom <[email protected]>
+Date:   Mon Jan 11 21:32:13 2010 +0100
+
+    Revert "st/dri: no need to request fake front buffer, only handle it being returned"
+    
+    This reverts commit 1336989ec60fff7bd590fefd28945a0e5dc536e3.
+    
+    The commit breaks frontbuffer rendering and the possibility to do
+    on-demand frontbuffer requests on all Xservers prior to 1.7.
+    
+    The commit should be conditioned on a dri2 version check.
+    I've submitted a patch to Xserver to bump dri2 minor, and it's acked by Ian.
+    
+    To be able to check the version from within the state tracker, we will
+    probably need another dri2 extension function that returns the server
+    version. The protocol has support for it.
+    
+    Signed-off-by: Thomas Hellstrom <[email protected]>
+
+commit 01eff0e6d23f90650de7c563f74a1aec3de112a6
+Author: Thomas Hellstrom <[email protected]>
+Date:   Mon Jan 11 21:00:59 2010 +0100
+
+    util: Build u_bitmask.o when using make.
+    
+    Signed-off-by: Thomas Hellstrom <[email protected]>
+
 commit 6d6c9c668894c393f7b6086fe0a4234939656865
 Author: Vinson Lee <[email protected]>
 Date:   Mon Jan 11 00:24:39 2010 -0800
diff --git a/debian/changelog b/debian/changelog
index 1bebac3ce96..11889fcef79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 mesa (7.7-2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
     good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
+  [ Brice Goglin ]
+  * Pull from upstream mesa_7_7_branch up to commit 2f28ca0a.
+    + Fix funky colors on radeon/r200/r300.
+
  -- Julien Cristau <[email protected]>  Sat, 16 Jan 2010 16:47:40 +0000
 
 mesa (7.7-1) experimental; urgency=low