Mesa (mesa_7_6_branch): 47 new commits

Wed Sep 9 14:35:07 UTC 2009

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c309bb494b6ee1c403442d1207743f749f95b6e
Merge: c6c44bf48124dd5b4661014a8d58482c5a54557f d27d659043bd7f2bd9a2636209f299cda0664230
Author: Brian Paul <brianp at vmware.com>
Date:   Wed Sep 9 08:33:39 2009 -0600

    Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
    
    Conflicts:
    
    	Makefile
    	configs/default
    	progs/glsl/Makefile
    	src/gallium/auxiliary/util/u_simple_shaders.c
    	src/gallium/state_trackers/glx/xlib/xm_api.c
    	src/mesa/drivers/dri/i965/brw_draw_upload.c
    	src/mesa/drivers/dri/i965/brw_vs_emit.c
    	src/mesa/drivers/dri/intel/intel_context.h
    	src/mesa/drivers/dri/intel/intel_pixel.c
    	src/mesa/drivers/dri/intel/intel_pixel_read.c
    	src/mesa/main/texenvprogram.c
    	src/mesa/main/version.h

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d27d659043bd7f2bd9a2636209f299cda0664230
Author: Vinson Lee <vlee at vmware.com>
Date:   Wed Sep 9 08:21:05 2009 -0600

    scons: Set default_dri to no for Mac OS.
    
    Mac OS does not have libdrm.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=42943a4cf90d66ade212feea29a29a3702eec6c1
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 8 14:45:24 2009 -0600

    mesa: bump version to 7.5.2
    
    I'm not 100% sure there'll be a 7.5.2 release, but just in case.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8de625c7cf639c583e8bf43acb1214010989bb64
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 8 12:21:42 2009 -0600

    i965: fix incorrect test for vertex position attribute

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18bdb6e712d43632dcd2e73cea68e0b2953fe62e
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 8 09:20:39 2009 -0600

    egl: also use X types for building on Apple/MacOS X
    
    See bug 20413.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf19638a003f0915d3d5419b737c2006a8f24a31
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Sep 7 10:49:31 2009 +1000

    prog/glsl: fix Makefile for samplers_array.
    
    The rule added in 488b3c4d1bc3d830477180759a42dbaf8f5801b0 does not use the
    right INCDIR, breaking the build when GL isn't installed in the default include
    paths.
    
    7.5 branch only fix, already fixed in master by rewriting the Makefile
    (ceb9459ed5e63207defa5d715958c2757933272f)
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2cba25f9eecf2063c3b98d66ade59cd9e50990e
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jun 22 08:52:52 2009 -0700

    i965: Fix warnings in intel_pixel_read.c.
    (cherry picked from commit c80ce5ac90b1e0ac7a72cd41c314aa2000bfecf5)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf820a045f0626718ec147ebb26e31f82ec0b4fb
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jun 19 22:12:52 2009 -0700

    intel: Also get the DRI2 front buffer when doing front buffer reading.
    (cherry picked from commit df70d3049a396af3601d2a1747770635a74120bb)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2855ee82c6d74066e8d9e44b17b2ce3b5782110e
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jun 19 22:03:37 2009 -0700

    intel: Update Mesa state before span setup in glReadPixels.
    
    We could have mapped the wrong set of draw buffers.  Noticed while looking
    into a DRI2 glean ReadPixels issue.
    (cherry picked from commit afc981ee46791838f3cb83e11eb33938aa3efc83)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=04081a164ca6160404d87dccbfc641bfd46428e0
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jun 19 21:43:22 2009 -0700

    intel: Move intel_pixel_read.c to shared for use with i965.
    (cherry picked from commit dcfe0d66bfff9a55741aee298b7ffb051a48f0d3)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d1dfc96c48681c455e1174a60bd325b33a2784f
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jul 16 15:57:22 2009 -0700

    i965: Add missing state dependency of sf_unit on _NEW_BUFFERS.
    (cherry picked from commit 99174e7630676307f618c252755a20ba61ad9158)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9504edee344936ef496341174d4c2d76ee0c44d
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 18 18:48:54 2009 -0700

    intel: Align cubemap texture height to its padding requirements.
    (cherry picked from commit a70e1315846cd5e8d6f2b622821ff8262fe7179d)
    (cherry picked from commit 29e51c3872531366570d032147abad50f8a3c1af)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=945d34e88ab7413299227fea56acc746010bb2e9
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 7 18:09:31 2009 -0700

    intel: Align untiled region height to 2 according to 965 docs.
    
    This may or may not be required pre-965, but it doesn't seem unlikely, and
    I'd rather be safe.
    (cherry picked from commit b053474378633249be0e9f24010650ffb816229a)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94d3b832cc5c73544c478804531e16644483d8be
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 5 20:12:15 2009 -0700

    i965: Fix source depth reg setting for FSes reading and writing to depth.
    
    For some IZ setups, we'd forget to account for the source depth register
    being present, so we'd both read the wrong reg, and write output depth to
    the wrong reg.
    
    Bug #22603.
    (cherry picked from commit f44916414ecd2b888c8a680d56b7467ccdff6886)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c764d5c34548d56e912cdc5990adffb0e8fd9f7
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 4 18:02:31 2009 -0700

    i965: Respect CondSwizzle in OPCODE_IF.
    
    Fixes piglit glsl-vs-if-bool and progs/glsl/twoside, and will likely be
    useful for the looping code.
    
    Bug #18992
    (cherry picked from commit 78c022acd0b37bf8b32f04313d76255255e769c1)
    (cherry picked from commit 63d7a2f53fb38e170f4e55f2b599e918edf2c512)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0b7850f1da6e367ed3380fbf0a59fa5af992546
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jun 18 09:23:58 2009 -0600

    i965: asst clean-ups, etc in brw_vs_emit()
    (cherry picked from commit fd7d764514c540987549c3ea88a2d669b0f0ea58)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d6c73513c5918a3f833ebf402803946b78828b8
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 4 14:13:27 2009 -0700

    i965: Emit conditional code updates as required for GLSL VS if statements.
    
    Previously, we'd be branching based on whatever condition code happened to be
    laying around.
    (cherry picked from commit 7007f8b352763af89805f287153cb7972bff0523)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83e6c67363d77d89ab4b6e2e202c8634d582c907
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 4 13:42:30 2009 -0700

    i965: Spell "conditional" correctly.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f396263651b867be39800bfd274b1be3d78ef60f
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 4 12:39:22 2009 -0700

    i965: Fix RECT shadow sampling by not losing the other texcoords.
    
    Bug #20821
    (cherry picked from commit 191e028de20b2f954621b652aa77b06d0e93652a)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=63b3fa2bcecc75a116ce651da435d205ccd43584
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug 3 17:55:14 2009 -0700

    i965: Assert that the offset in the VBO is below the VBO size.
    
    This avoids sending a bad buffer address to the GPU due to programmer error,
    and is permitted by the ARB_vbo spec.  Note that we still have the opportunity
    to dereference past the end of the GPU, because we aren't clipping to a
    correct _MaxElement, but that appears to be harder than it should be.  This
    gets us the 90% solution.
    
    Bug #19911.
    (cherry picked from commit d7430d942f6c7950a92367aeb13b80cf76ccad78)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=217af32c2d6afab5e1907cc16fb4b6feb982abe7
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug 3 17:12:43 2009 -0700

    i965: Even if no VS inputs are set, still load some amount of URB as required.
    
    See comment on Vertex URB Entry Read Length for VS_STATE.
    
    This, combined with the previous three commits, fixes #22945.
    (cherry picked from commit e340d4f9866db4bae391288e83a630a310b0dd2b)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=456a16491bc757af6ba9a98e5706a78f748e9a79
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug 3 15:24:02 2009 -0700

    i965: Make sure the VS URB size is big enough to fit a VF VUE.
    
    This fix is just from code and docs inspection, but it may fix hangs on
    some applications.
    
    (cherry picked from commit e93848e595176ae0bad3bfe64e0ca63fd089bb72)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9eca0e5350377148976e0d1200f98bd20ac28197
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jul 30 13:40:29 2009 -0700

    i965: Don't emit bad packets when no VBs are referenced.
    
    It appears that sometimes Mesa (and I suppose a VS could as well) emits
    a program which references no vertex data, and thus we end up with
    nr_enabled == 0 even though some VBs are enabled.  We'd end up emitting
    VB/VE packet headers of 0xffffffff in that case, leading to GPU hangs.
    
    Bug #22945 (wine with an uncompiled VS)
    (cherry picked from commit d1fbfd0f962347e4153db3852292d44de5aea863)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e26bdb849b75f4aeb69cf8b1fdffbc461265490
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug 3 14:46:18 2009 -0700

    i965: Calculate enabled[] and nr_enabled once and re-use the values.
    
    The code duplication bothered me.
    (cherry picked from commit 9b9cb30d128fc5f1ba77287696ecd508e640efde)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=213ac4bb5de1cef601e0677ef2e5ca1779851e28
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jun 23 19:30:25 2009 -0700

    i965: Set the max index buffer address correctly according to the docs.
    
    It's the last addressable byte, not the byte after the end of the buffer.
    (cherry picked from commit b72dea5441e8e9226dabf1826fa3bc129c7bc281)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cab307ce6b32d2ffdb0eb3bb5bae93c6fb9305fb
Author: Brian Paul <brianp at vmware.com>
Date:   Fri May 15 09:14:24 2009 -0600

    i965: rename var: s/tmp/vs_inputs/
    (cherry picked from commit 840c09fc71542fdfc71edd2a2802925d467567bb)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1960da2e099e3899af3f668e5914162f9293cd6c
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 15:49:10 2009 -0600

    docs: 7.5.1 md5 sums

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d3af894d692e1b4c39eb6b24210bd53993723d7
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 15:44:49 2009 -0600

    docs: point to fd.o for downloads instead of SourceForge

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32156f3a1165624cd4e2d0d337809fb046bd9285
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 15:44:22 2009 -0600

    gallium/xlib: silence unitialized var warning

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c32caf075ce4015ba50d0aa9f0a2ff924c21970
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 15:23:15 2009 -0600

    gallium/xlib: silence uninitialized var warning

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=67c286d20e6f1256950d81aab3f6b54cd4926602
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 15:04:49 2009 -0600

    st/mesa: silence uninitialized var warnings

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b4e835b13fb240f9c8f9fdc994cb80b99265845
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 14:57:30 2009 -0600

    docs: prep for 7.5.1 release

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=08575509e4d3ac152ebf18a6dc944f233d9a62b0
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 14:57:16 2009 -0600

    docs: added news entry for 7.5.1

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccb081414ba46a6e2d29bcc3c675e875717a8165
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 14:57:04 2009 -0600

    docs: update precompiled libs info

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=47df7900fd37f71bca0f3c4ae19d98866023a6c3
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 14:56:50 2009 -0600

    docs: move SGI GLU link

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3a0624ef01c3b347ed8a9fd3bab578b52bd9130
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 3 14:39:53 2009 -0600

    st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted position
    
    If the renderbuffer orientation is Y=0=TOP we need to invert the dstY
    position.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e79054cc4090a2be346236236c9e18ae85cad43d
Author: Keith Whitwell <keithw at vmware.com>
Date:   Wed Sep 2 18:30:11 2009 +0100

    st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware
    
    State tracker currently backs GL_RGB textures with RGBA almost always.
    This means we need to maintain A==1 in these textures to give correct GL_RGB
    sampling results.
    
    This change offloads the RGBA->RGB copy to hardware using the new writemask
    version of u_blit_pixels.
    
    More src/dstLogical/dstActual triples could be shifted to hardware by
    this technique in future patches.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de343680a3e6b2a588f8b3c844828b8d9e6cb6a5
Author: Keith Whitwell <keithw at vmware.com>
Date:   Wed Sep 2 17:58:52 2009 +0100

    util: add version of u_blit_pixels which takes a writemask
    
    Values outside the writemask are set in the destination to {0,0,0,1}

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d7a989b104f02042fadfeec5bd20654bbb6fea6
Author: Keith Whitwell <keithw at vmware.com>
Date:   Tue Sep 1 11:11:28 2009 +0100

    draw: remove unused variable

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9b7d7875b0c114d2fa4956b2bffbe809e5b5a44
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 1 08:53:31 2009 -0600

    progs/tests: re-enable exit() call
    
    See bug 21267.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f785080db33d437893564dded325452770699be
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 31 17:54:46 2009 -0600

    swrast: fix selection/feedback regression
    
    This fixes a conform selection/feedback regression introduced by commit
    8f4d66c5f893b49eb3973aa3b31a856314c045c7

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fcf0804c05faefd196ed5525c068ee4cd30c5312
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 31 13:28:31 2009 -0600

    swrast: can't use deferred texture/shading if using KIL instruction
    
    If the fragment program uses KIL, we have to execute it before z/stencil
    testing.  Otherwise, deferred texture/shading lets us skip shading for
    pixels that fail z/stencil testing.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f36473a8ecc9c3358ae99651f511725344f22cc
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 31 11:17:59 2009 -0600

    mesa: added const qualifiers, move local var

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2241665dc6d77a992edfc49a9d9d9ed8d1b52e60
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 31 11:14:16 2009 -0600

    mesa: fix saturation logic in emit_texenv()
    
    We need to clamp/saturate after each texenv stage, not just the last one.
    Fixes glean texEnv failure for softpipe (and probably other fragment program-
    based drivers).

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6bf86681f5903a06f98cc32ddf5715706de97c4a
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 31 10:32:56 2009 -0600

    docs: fixed glXCreateGLXPixmap() for direct rendering

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7654faf16431d9749fa9f3a8720b4b7fc5c8445
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 31 10:31:45 2009 -0600

    docs/: document cross-compile fix

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a48ee529a256611676884262ced218ad6c05f961
Author: Marc Dietrich <marvin24 at gmx.de>
Date:   Mon Aug 31 08:56:33 2009 -0700

    mesa: fix 32bit cross compilation on a 64bit machine
    
    When cross compiling on a 64bit machine, gen_matypes.c is build
    for the host machine (64bit) but must generates code for the target
    machine (32bit). This causes wrong offsets all over the place and
    crashes googleearth on my machine. Solution is to add -m32 when
    cross compiling.
    
    Attached patch is compatible with linux-x86-32 and autoconf based
    builds.