Mesa (master): 28 new commits

Fri May 11 14:42:45 UTC 2012

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7435c043988dd83b430f3d3a7ca5a5a1b2f30d61
Merge: bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a 4d11a6a0c798301863d5b202703dcca37dc24e7c
Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri May 11 16:42:20 2012 +0200

    Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a
Merge: 96956dc5076fc03b9290368ca90e3f3b870ee613 8dd3e341b337ca2d22bcc0e7548a78a6c36ca77d
Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri May 11 16:38:13 2012 +0200

    Merge branch 'gallium-userbuf'
    
    Conflicts:
    	src/gallium/docs/source/screen.rst
    	src/gallium/drivers/nv50/nv50_state.c
    	src/gallium/include/pipe/p_defines.h
    	src/mesa/state_tracker/st_draw.c

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8dd3e341b337ca2d22bcc0e7548a78a6c36ca77d
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Apr 30 14:44:26 2012 -0600

    svga: check for and skip null vertex buffer pointers
    
    Fixes regressions with google earth and other things.
    
    Reviewed-by: José Fonseca <jfonseca at vmware.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5752e16e82d4375171d157cb116a81ea025ea7b
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Apr 30 14:37:12 2012 -0600

    softpipe: cast away const to silence warning

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e588dff57a7a1f8c4d4f243cdf0580121fa9843
Author: Brian Paul <brianp at vmware.com>
Date:   Mon Apr 30 14:36:50 2012 -0600

    svga: cast away const to silence warning

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=96863baa42564ce2daa5f4651f1c52f1d281d9a5
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue May 1 00:11:25 2012 +0200

    u_vbuf: set user buffer pointer for drivers which support user buffers
    
    It's not common to end up in u_vbuf and at the same time support user buffers
    in a driver, but such a combination should work.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c5ff5a41fa63634e2cc8037a0a601c60d233537
Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Apr 30 20:56:25 2012 +0200

    st/mesa: unmap upload buffer after uploading indices and constants

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ed72dd31d45b66e54724dcd20bbbbb6875313c3
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 29 21:34:43 2012 +0200

    st/xorg: don't use user_buffer_create

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=889c9a566c1b0e1d3ef269c53900e5cfbd6d7b45
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 29 21:34:18 2012 +0200

    st/xa: don't use user_buffer_create

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fa20733a622770eaaa941f64d570d7b63d8f37b6
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 29 21:33:37 2012 +0200

    st/vega: don't use user_buffer_create

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0279d15c990d831c7cc4e76cbe7caeba1347b689
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 29 21:32:52 2012 +0200

    st/vega: use cso_draw_arrays

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=46fe17930ec71be3489fbb844de2bf16d877437e
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 29 21:24:39 2012 +0200

    cso: cso_context should install u_vbuf by itself and not st/mesa
    
    so that it's installed in the other state trackers too

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f656607c35c80250f0217b6c03b9312987450f13
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 29 20:43:12 2012 +0200

    st/xorg: fix compilation - wrong libkms include file

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b5f4b173b2703b7f72dcf33ad4cb00347712733
Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Apr 26 13:45:29 2012 +0200

    gallium/util: stop using user buffers in util_draw_texquad

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ac0683d632347347c2fdbd546da0c7c2effb08a
Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Apr 26 13:41:33 2012 +0200

    gallium: remove pipe_resource::user_ptr
    
    It's unused now.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=65d451d9fa1192c386301ca0b84b6c5cd369f92d
Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Apr 26 13:39:19 2012 +0200

    radeonsi: don't create temporary user buffer for r600_upload_const_buffer

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b7d48cbad86eaac21fce3793da41b46db8be3b4
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 22:53:05 2012 +0200

    gallium: add void *user_buffer to pipe_constant_buffer
    
    This reduces CPU overhead when updating constants.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01bf5569c44389c1127bbb9e873c8a234ac92ff7
Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Apr 26 11:19:35 2012 +0200

    st/mesa: reorder code in draw_vbo

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=944b97990bbdf61b2be2e92c3641d3240e12fe58
Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Apr 26 11:14:51 2012 +0200

    st/mesa: remove more unnecessary code in draw_vbo
    
    The variables set here are not used anywhere.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf469f4edc60bd1c5fd770cb231b8d5ab801427f
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 21:14:44 2012 +0200

    gallium: add void *user_buffer in pipe_index_buffer
    
    Adapted drivers: i915, llvmpipe, r300, r600, radeonsi, softpipe.
    
    User index buffers have been disabled in nv30, nv50, nvc0 and svga to keep
    things working.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=43995c9470dd38cf80a60a169f5875de6798863f
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 21:12:37 2012 +0200

    gallium: remove pipe_context::redefine_user_buffer

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4552fd50d959ab99546cfa994f8ba5bdf5d66bc7
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 20:58:47 2012 +0200

    gallium: add void *user_buffer in pipe_vertex_buffer
    
    This reduces CPU overhead in st_draw_vbo and removes a lot of unnecessary code
    in that function which was required only to comply with the gallium interface,
    but wasn't any useful really.
    
    Adapted drivers: i915, llvmpipe, r300, softpipe.
    No changes required in: r600, radeonsi.
    
    User vertex buffers have been disabled in nv30, nv50, nvc0 and svga to keep
    things working.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a0545972694e6afc6c5ac60db563defa79c20d9
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 20:16:50 2012 +0200

    st/mesa: make user constant buffers optional

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=507337864fa80caf9f26602324d2c28dd0a75d61
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 19:52:26 2012 +0200

    gallium: change set_constant_buffer to be UBO-friendly

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b749dc34f8d83cf3dfa863279b1fe2b356d34b2
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 17:31:17 2012 +0200

    gallium: add PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT
    
    This is required for any serious constant buffer support.
    Constant buffer offsets on ATI and NVIDIA DX10 and DX11 GPUs must be
    a multiple of 256.
    
    In OpenGL, this can be queried via GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT.

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c655f499cf61211146a3d38f77532541f88aa88
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 17:04:18 2012 +0200

    st/mesa: make user index buffers optional
    
    v2: use a separate upload buffer for indices

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=989bdaab514cce808eea4b9d792656aaeee8603c
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 15:50:44 2012 +0200

    st/mesa: only set index buffer when drawing is indexed
    
    and restructure the code a bit

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=437ab1d6df7282770ee869180446db36c2dbdfa8
Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Apr 24 15:19:31 2012 +0200

    gallium: add PIPE_CAP_USER_INDEX_BUFFERS and PIPE_CAP_USER_CONSTANT_BUFFERS