Mesa (master): Squashed commit of the following:

[Brian Paul]

Module: Mesa
Branch: master
Commit: 6b329b9274b18c50f4177eef7ee087d50ebc1525
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b329b9274b18c50f4177eef7ee087d50ebc1525

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Apr 26 14:54:41 2011 -0600

Squashed commit of the following:

commit 864fe253b04105b7469e5f7b064dc37637b944f8
Author: Brian Paul <brianp at vmware.com>
Date:   Thu Apr 21 20:13:07 2011 -0600

    mesa: s/exec/disp/ in _mesa_init_histogram_dispatch()

    This function isn't normally compiled (FEATURE_histogram).

commit f4bf45e2b94b582cacd19cdca873c5be627e4250
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:58 2011 -0600

    mesa: hook up GL_ARB_robustness dispatch functions

    ...and advertise the extension.

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 2b89e38e5f572dc40cebc06381ae7c5d04386998
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:58 2011 -0600

    mesa: regenerated API files for GL_ARB_robustness

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 5d5ebfb7135cec9d833adef86cbf4d0f3d9beca8
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    glapi: add ARB_robustness xml

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 0159d1d6d99f4bbc18381dc2081c20d3aff17ac9
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    mesa: implement GL_ARB_robustness functions

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 938fd71f4c4742f274922d53492a7290ab8d9c9b
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    mesa: add context fields for GL_ARB_robustness

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 72075137bc79e65be03dac7e97b6dba93c3a86a4
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    mesa: standardize more bounds-checking error messages

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 32a3fc23746db49da903fbc08afa0135af3007d2
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    mesa: standardize some bounds-checking error messages

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit cecbf1f4d164207de373dec0cadee2e84e1f9656
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    mesa: add more bounds-checking support for client memory buffers

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit edc895b52383d5bd274422db56adead1d81daf5f
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    mesa: add bounds-checking support for client memory buffers

    Signed-off-by: Brian Paul <brianp at vmware.com>

commit 3a96ef28a538f158a219b406cd090dee70470c85
Author: nobled <nobled at dreamwidth.org>
Date:   Thu Apr 21 07:53:57 2011 -0600

    mesa: use is_bufferobj() helper function

    Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/glx/indirect.c                              |   26 +-
 src/glx/indirect_size.c                         |   44 +-
 src/glx/indirect_size.h                         |   38 +-
 src/mapi/glapi/gen/ARB_robustness.xml           |  185 +
 src/mapi/glapi/gen/Makefile                     |    1 +
 src/mapi/glapi/gen/gl_API.xml                   |    2 +
 src/mapi/glapi/glapi_mapi_tmp.h                 | 1688 ++++---
 src/mapi/glapi/glapi_sparc.S                    |  646 ++--
 src/mapi/glapi/glapi_x86-64.S                   | 3498 ++++++++-----
 src/mapi/glapi/glapi_x86.S                      |  944 ++--
 src/mapi/glapi/glapitable.h                     |  584 +-
 src/mapi/glapi/glapitemp.h                      |  348 +-
 src/mapi/glapi/glprocs.h                        | 1458 +++---
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c |    2 +-
 src/mesa/drivers/x11/xm_dd.c                    |   10 +-
 src/mesa/main/api_exec.c                        |    9 +
 src/mesa/main/colortab.c                        |   18 +-
 src/mesa/main/context.c                         |    4 +
 src/mesa/main/convolve.c                        |   31 +-
 src/mesa/main/dlist.c                           |    4 +-
 src/mesa/main/drawpix.c                         |   14 +-
 src/mesa/main/enums.c                           | 6668 ++++++++++++-----------
 src/mesa/main/eval.c                            |   95 +-
 src/mesa/main/extensions.c                      |    1 +
 src/mesa/main/get.c                             |    3 +
 src/mesa/main/get.h                             |    4 +
 src/mesa/main/getstring.c                       |   17 +
 src/mesa/main/glapidispatch.h                   | 1252 +++--
 src/mesa/main/histogram.c                       |   26 +-
 src/mesa/main/mtypes.h                          |    6 +
 src/mesa/main/pbo.c                             |  108 +-
 src/mesa/main/pbo.h                             |   11 +-
 src/mesa/main/pixel.c                           |   74 +-
 src/mesa/main/polygon.c                         |   16 +-
 src/mesa/main/polygon.h                         |    3 +
 src/mesa/main/readpix.c                         |   37 +-
 src/mesa/main/readpix.h                         |    4 +
 src/mesa/main/remap_helper.h                    | 4023 +++++++-------
 src/mesa/main/texgetimage.c                     |   84 +-
 src/mesa/main/texgetimage.h                     |    7 +-
 src/mesa/main/uniforms.c                        |  106 +-
 src/mesa/main/uniforms.h                        |   17 +-
 42 files changed, 12139 insertions(+), 9977 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=6b329b9274b18c50f4177eef7ee087d50ebc1525