Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	libX11/configure.ac
	libX11/specs/libX11/AppC.xml
	libX11/specs/libX11/AppD.xml
	libX11/specs/libX11/CH03.xml
	libX11/specs/libX11/CH04.xml
	libX11/specs/libX11/CH05.xml
	libX11/specs/libX11/CH06.xml
	libX11/specs/libX11/CH07.xml
	libX11/specs/libX11/CH08.xml
	libX11/specs/libX11/CH09.xml
	libX11/specs/libX11/CH11.xml
	libX11/specs/libX11/CH12.xml
	libX11/specs/libX11/CH13.xml
	libX11/specs/libX11/CH14.xml
	libX11/specs/libX11/CH15.xml
	libX11/specs/libX11/CH16.xml
	libxcb/configure.ac
	libxcb/src/c_client.py
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_util.c
	mesalib/common.py
	mesalib/configs/linux-dri
	mesalib/docs/GL3.txt
	mesalib/docs/download.html
	mesalib/docs/install.html
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp-parse.y
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_clone.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/glsl/opt_tree_grafting.cpp
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_XML.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mapi/mapi/u_thread.c
	mesalib/src/mapi/mapi/u_thread.h
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
	mesalib/src/mesa/main/api_arrayelt.c
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pbo.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shared.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/program/register_allocate.c
	mesalib/src/mesa/program/register_allocate.h
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/tnl/t_draw.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	pixman/pixman/pixman-arm-common.h
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-inlines.h
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h
	xorg-server/configure.ac
	xorg-server/fb/fbblt.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 15 insertions, 15 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 7f6ffee5e..82a1079a2 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -344,7 +344,7 @@ guess_and_alloc_texture(struct st_context *st,
                               stImage->base.Width2,

                               stImage->base.Height2,

                               stImage->base.Depth2,

-                              stImage->level,

+                              stImage->base.Level,

                               &width, &height, &depth)) {

       /* we can't determine the image size at level=0 */

       stObj->width0 = stObj->height0 = stObj->depth0 = 0;

@@ -367,7 +367,7 @@ guess_and_alloc_texture(struct st_context *st,
         stImage->base._BaseFormat == GL_DEPTH_COMPONENT ||

         stImage->base._BaseFormat == GL_DEPTH_STENCIL_EXT) &&

        !stObj->base.GenerateMipmap &&

-       stImage->level == 0) {

+       stImage->base.Level == 0) {

       /* only alloc space for a single mipmap level */

       lastLevel = 0;

    }

@@ -506,8 +506,8 @@ st_TexImage(struct gl_context * ctx,
       assert(texImage->Depth == depth);

    }

 

-   stImage->face = _mesa_tex_target_to_face(target);

-   stImage->level = level;

+   stImage->base.Face = _mesa_tex_target_to_face(target);

+   stImage->base.Level = level;

 

    _mesa_set_fetch_functions(texImage, dims);

 

@@ -529,7 +529,7 @@ st_TexImage(struct gl_context * ctx,
    if (stObj->pt) {

       if (level > (GLint) stObj->pt->last_level ||

           !st_texture_match_image(stObj->pt, &stImage->base,

-                                  stImage->face, stImage->level)) {

+                                  stImage->base.Face, stImage->base.Level)) {

          DBG("release it\n");

          pipe_resource_reference(&stObj->pt, NULL);

          assert(!stObj->pt);

@@ -563,7 +563,7 @@ st_TexImage(struct gl_context * ctx,
     */

    if (stObj->pt &&

        st_texture_match_image(stObj->pt, &stImage->base,

-                              stImage->face, stImage->level)) {

+                              stImage->base.Face, stImage->base.Level)) {

 

       pipe_resource_reference(&stImage->pt, stObj->pt);

       assert(stImage->pt);

@@ -1501,8 +1501,8 @@ st_copy_texsubimage(struct gl_context *ctx,
          pipe->resource_copy_region(pipe,

                                     /* dest */

                                     stImage->pt,

-                                    stImage->level,

-                                    destX, destY, destZ + stImage->face,

+                                    stImage->base.Level,

+                                    destX, destY, destZ + stImage->base.Face,

                                     /* src */

                                     strb->texture,

                                     strb->surface->u.tex.level,

@@ -1524,9 +1524,9 @@ st_copy_texsubimage(struct gl_context *ctx,
          memset(&surf_tmpl, 0, sizeof(surf_tmpl));

          surf_tmpl.format = util_format_linear(stImage->pt->format);

          surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;

-         surf_tmpl.u.tex.level = stImage->level;

-         surf_tmpl.u.tex.first_layer = stImage->face + destZ;

-         surf_tmpl.u.tex.last_layer = stImage->face + destZ;

+         surf_tmpl.u.tex.level = stImage->base.Level;

+         surf_tmpl.u.tex.first_layer = stImage->base.Face + destZ;

+         surf_tmpl.u.tex.last_layer = stImage->base.Face + destZ;

 

          dest_surface = pipe->create_surface(pipe, stImage->pt,

                                              &surf_tmpl);

@@ -1629,7 +1629,7 @@ copy_image_data_to_texture(struct st_context *st,
    /* debug checks */

    {

       const struct gl_texture_image *dstImage =

-         stObj->base.Image[stImage->face][dstLevel];

+         stObj->base.Image[stImage->base.Face][dstLevel];

       assert(dstImage);

       assert(dstImage->Width == stImage->base.Width);

       assert(dstImage->Height == stImage->base.Height);

@@ -1641,15 +1641,15 @@ copy_image_data_to_texture(struct st_context *st,
        */

       st_texture_image_copy(st->pipe,

                             stObj->pt, dstLevel,  /* dest texture, level */

-                            stImage->pt, stImage->level, /* src texture, level */

-                            stImage->face);

+                            stImage->pt, stImage->base.Level, /* src texture, level */

+                            stImage->base.Face);

 

       pipe_resource_reference(&stImage->pt, NULL);

    }

    else if (stImage->base.Data) {

       st_texture_image_data(st,

                             stObj->pt,

-                            stImage->face,

+                            stImage->base.Face,

                             dstLevel,

                             stImage->base.Data,

                             stImage->base.RowStride *