Mesa (master): 21 new commits

Wed Jun 10 12:32:16 UTC 2009

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a
Merge: d9617deb008b75f4a605a30408aeb1948139c33e 76a1017e978f8e51114d765c8c98ff25da13042b
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Tue Jun 9 07:53:25 2009 +0200

    Merge branch 'mesa_7_5_branch'
    
    Conflicts:
    
    	Makefile
    	src/mesa/main/version.h
    	src/mesa/shader/slang/slang_preprocess.c
    	src/mesa/state_tracker/st_cb_bufferobjects.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=76a1017e978f8e51114d765c8c98ff25da13042b
Author: Keith Whitwell <keithw at vmware.com>
Date:   Tue Jun 9 18:32:18 2009 +0100

    mesa/st: fix tracking of mapped buffer ranges
    
    In st_bufferobj_map_range(), set obj->Offset consistently with its
    usage elsewhere.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9192347443bc3db9ebeb4b5cc090133b63396b04
Author: Keith Whitwell <keithw at vmware.com>
Date:   Tue Jun 9 16:35:55 2009 +0100

    stw: ignore swapbuffer requests on singlebuffer
    
    Return TRUE in this case.  Returning FALSE seems to result in
    mis-rendering -- possibly opengl32.dll is trying to compensate by
    doing a software blit??

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb549775a577cc5c86fefdc7e208b9d5e1d25217
Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jun 9 09:14:38 2009 -0600

    glsl: Expand nested preprocessor macros.
    
    (cherry picked from master, commit ef8caec29ae73bb2bbeb48f0578d839ef29348cd)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=34bb024cf2d02d5d5cb672ead05fa131bdff6dd8
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jun 8 16:11:17 2009 -0600

    st/mesa: fix incorrect bufObj Length assignment, remove unneeded assertion

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7eed6ab5b525b75f690d05042c90d05827253114
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Mon Jun 8 16:02:18 2009 +0100

    Cygwin build fixes
    
    Fix mklib to deal with NOPREFIX and use --enable-auto-image-base for cygwin
    Teach configure.ac some basic facts about cygwin
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=304ba4bba44057aa21f0ae434e49b1e09ab7d039
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jun 8 13:53:33 2009 -0600

    glsl: Fix preprocessor define argument parsing for dead sections.
    
    (cherry picked from master, commit 19a54d9f1055c366fd77026dd67007a8d5921f58)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=77c329a2773820c57e7b286858e80a596f89ef94
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Mon Jun 8 16:46:06 2009 +0200

    pipebuffer: Silence out of heap space debug print

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6753adbc71a2d13e8ec095251f62cb267429de7
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jun 8 10:44:48 2009 -0600

    st/mesa: remove invalid assertion
    
    It's legal for ARB_vertex_program programs to not write to result.position.
    The results are undefined in that case.  This assertion was causing us to
    abort/exit though.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e09f78d8dc7f20bb11f84206b6f1d71418332d8a
Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Jun 8 16:29:46 2009 +0100

    mesa: Use matching signedness for the counter as upper bound.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=42678dba941b5a734e6aa03b530653d9c5341a70
Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Jun 8 16:27:59 2009 +0100

    mesa: Allocate tokens from the heap.
    
    The recent increase ST_MAX_SHADER_TOKENS to 8K causes stack overflows on
    windows.
    
    Failure to allocate is not being propagated to the caller. This is not
    a regression since the previous _mesa_malloc result wasn't being
    checked as well. Unfortunately it is not easy to fix, as the callers of
    these functions do not have failure propagation mechanism either, and
    so on. So leaving a just fixme note for now.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33d63277706aede31559a24c0db76b37609e76ef
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jun 8 09:52:31 2009 -0600

    mesa: better error message for invalid texture unit index

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bced6a326e3520d2b280b4f6cdaadf843ce1d2d
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jun 8 09:42:04 2009 -0600

    mesa: bump MAX_PROGRAM_ENV_PARAMS from 128 to 256
    
    Also, MAX_NV_VERTEX_PROGRAM_PARAMS should be 96, not 128 (or 256).

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d3c8fbf12289a8cc081c2d68e810c4bf29d1f8d
Author: Keith Whitwell <keithw at vmware.com>
Date:   Mon Jun 8 16:11:29 2009 +0100

    mesa/vbo: drop all references to vbo on destroy
    
    We were adding references to the input arrays, but failing to drop
    them on destruction.  This could lead to a 64kb buffer being leaked
    each context destruction.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fce4ee12a620de4ece35cef62a4562bbd4895557
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jun 8 07:25:24 2009 -0600

    mesa: EXT_vertex_array_bgra fixes
    
    1) Pass the correct format when calling update_array in
       _mesa_VertexAttribPointerARB.
    2) glVertexAttribPointerNV accepts GL_BGRA format too.
    3) raise INVALID_VALUE error when format is BGRA and normalized is
       false in glVertexAttribPointerARB
    
    (cherry picked from commit 4adb190a162c5ed0684a8616331344caadba4010)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d9d0e62306ce1a046ff724936016a4f080cf21a
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Mon Jun 8 14:34:16 2009 +0200

    stw: If stfb not set don't call into mesa

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=283e84bfb3066a3e3d778d4065b448ddd288fbb4
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Wed Jun 3 16:33:56 2009 +0200

    progs/tests: Add some scissor tests

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=78dad275646b720511dac31ca6ba0535568af81f
Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Jun 4 10:34:02 2009 -0700

    Revert "scons: Less aggressive optimizations for MSVC 64bit compiler."
    
    This reverts commit fc7f92478286041a018ac4e72d2ccedeea7c0eca.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfff2a6189b38f1ee8c8ca204e223574a5abf760
Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jun 5 17:16:47 2009 -0600

    mesa: bump version to 7.5-rc3

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6453605785a3036c7e633400e4bd35bf2297b000
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Thu Jun 4 19:42:08 2009 -0700

    osmesa: Link with -ldl for dlopen code
    
    Now that the dlopen wrappers are built into libmesa.a, we need to link
    standalone libOSMesa with libdl to resolve dlopen and friends on
    platforms that need it.
    (cherry picked from commit 4795dd5950d4dcd7c8d421c8fb4851c193297ba1)

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5df64685892aea4dabee377352888d8eb58e9446
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Thu Jun 4 06:21:10 2009 -0700

    osmesa: Allow building standalone in all three channel widths
    
    autoconf had been designating the 8 bit libOSMesa as the default
    standalone osmesa, but the Makefile expected it to be linked to libGL.
    Fix up the osmesa Makefile so that it allows any of the combinations of
    standalone and channel width to be built.
    
    Fixes bug #21980.
    (cherry picked from commit 7441dcd90b01df8351026af8bbb50e11bb86071a)