Mesa (master): 28 new commits

Brian Paul brianp at kemper.freedesktop.org
Mon Jan 25 21:46:29 UTC 2010 

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b22427911ad27efc1f36faee9462c6082d0417c
Merge: 7e7f8815fbfa21ab2397e673fa19c36603bc7a51 6749310d3f60df70ad8f82db986871ab9496793b
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 25 14:46:17 2010 -0700

    Merge branch 'mesa_7_7_branch'
    
    Conflicts:
    
    	src/mesa/drivers/dri/intel/intel_screen.c
    	src/mesa/drivers/dri/intel/intel_swapbuffers.c
    	src/mesa/drivers/dri/r300/r300_emit.c
    	src/mesa/drivers/dri/r300/r300_ioctl.c
    	src/mesa/drivers/dri/r300/r300_tex.c
    	src/mesa/drivers/dri/r300/r300_texstate.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6749310d3f60df70ad8f82db986871ab9496793b
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Mon Jan 25 20:07:43 2010 +0100

    st/xorg: Fix crash on resize with libkms

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d051af6127d206d165a1034ca0795ce8fdcd389
Author: Igor Oliveira <igor.oliveira at openbossa.org>
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 <brianp at vmware.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6877c5de3c3ff39da514a74928ea270138cddff9
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Mon Jan 25 12:27:47 2010 +0100

    vmware/xorg: Do buffer round-robin logic differently

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b482c4fbe69a807bb69bf92f37e362f818c664d
Author: Jakob Bornecrantz <jakob at vmware.com>
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

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3b783ea294f348bf3424eeb4170dd7f0741519a
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Thu Jan 21 21:32:28 2010 +0100

    vmware/xorg: Export pci_probe function for ugly chain-loading

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=36fd55f9f03b00263ee1ccf22bbb50e5ba048e80
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Thu Jan 21 21:23:22 2010 +0100

    st/xorg: Export helper function for detecting modesetting

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=16cf7e14a6dee85fadc0ab4e7c066288c3362352
Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Thu Jan 21 21:28:14 2010 +0100

    st/xorg: Fix warning

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=47d30b0c2c36f952cc14deefb9f937f1b0a9b531
Author: Brian Paul <brianp at vmware.com>
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 <chantry.xavier at gmail.com>:
    
    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.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e88d6fe299cb43eedfae7f0fa3bb14c8086a8cd4
Author: Brian Paul <brianp at vmware.com>
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 <chantry.xavier at gmail.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fdfa4c85297d5d25e7256bf73e35309b358af86c
Author: Xavier Chantry <chantry.xavier at gmail.com>
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 <chantry.xavier at gmail.com>
    Signed-off-by: Brian Paul <brianp at vmware.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e85cb98a169f83e1a1ad7f17cbbedaee0ea47fe1
Author: Vinson Lee <vlee at vmware.com>
Date:   Sun Jan 24 00:17:00 2010 -0800

    r200: Silence fprintf format warning.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e02dc139520fab9f7189e0ae390f72ed674bb7d7
Author: Vinson Lee <vlee at vmware.com>
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.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f429b80fffc57a6165b76e9345cf5b9383edd650
Author: Vinson Lee <vlee at vmware.com>
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.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc75ec0f3824176f3fd7182846b3ec36051945b3
Author: Vinson Lee <vlee at vmware.com>
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.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b55aacccbbc2c86f03eafab23d5d74bc165c9ed
Author: Vinson Lee <vlee at vmware.com>
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.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d57ba16ae3943a93071ef1bbab4a13725b8ea20c
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 21:05:58 2010 -0800

    scons: Define _DARWIN_C_SOURCE on Darwin builds.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f2f42dd8093e585a6edff2b1173cc39fc6391df
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 20:56:49 2010 -0800

    progs/demos: Remove unnecessary header from shadowtex.c.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b62b524fee5f1b9ec9b53cc8f550a0c9a3d769c2
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 20:43:27 2010 -0800

    r300: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb6bff3712d71cfe131fbf70154d326cdf39e7c8
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 14:33:29 2010 -0800

    intel: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=146a77af3f68d3a935fad5b143123280049e6c60
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 02:14:56 2010 -0800

    radeon: Remove unused variable.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bad0aef40b87cf1a2ef8ecb5cd560d8a162d0ec
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 01:54:53 2010 -0800

    tdfx: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=283d9565bf18b828e1bc6ed8ef2692132b4e359e
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 01:40:44 2010 -0800

    sis: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09a142e5db8dc72407ffb16a1a4e02d6540f6095
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 00:38:14 2010 -0800

    savage: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca54a5b92043ba9564aca5af47f8c57a53cc48bc
Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan 23 00:19:29 2010 -0800

    mga: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=634ec5c2abf05a9a8c27d9199ded5d1ad91e538a
Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Jan 22 23:53:39 2010 -0800

    i965: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=329c1b59106cf4ada27eaa4694600dc281d8c0de
Author: Vinson Lee <vlee at vmware.com>
Date:   Fri Jan 22 23:22:16 2010 -0800

    i915: Remove unnecessary headers.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e78903952961fc207b8da1f7b2d0c6ddfd49881
Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 22 17:17:01 2010 -0700

    gallium/util: fix incorrect shift in a4r4g4b4_put_tile_rgba()
    
    Fixes fd.o bug 23313.

More information about the mesa-commit mailing list