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, 13 insertions, 11 deletions

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index 8df2c42c3..01008092a 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -144,7 +144,7 @@ public:
 

    ir_rvalue *as_rvalue_to_saturate();

 

-   virtual bool is_lvalue()

+   virtual bool is_lvalue() const

    {

       return false;

    }

@@ -152,7 +152,7 @@ public:
    /**

     * Get the variable that is ultimately referenced by an r-value

     */

-   virtual ir_variable *variable_referenced()

+   virtual ir_variable *variable_referenced() const

    {

       return NULL;

    }

@@ -236,7 +236,7 @@ enum ir_variable_interpolation {
 /**

  * \brief Layout qualifiers for gl_FragDepth.

  *

- * The AMD_conservative_depth extension allows gl_FragDepth to be redeclared

+ * The AMD/ARB_conservative_depth extensions allow gl_FragDepth to be redeclared

  * with a layout qualifier.

  */

 enum ir_depth_layout {

@@ -1212,7 +1212,8 @@ enum ir_texture_opcode {
    ir_txb,		/**< Texture look-up with LOD bias */

    ir_txl,		/**< Texture look-up with explicit LOD */

    ir_txd,		/**< Texture look-up with partial derivatvies */

-   ir_txf		/**< Texel fetch with explicit LOD */

+   ir_txf,		/**< Texel fetch with explicit LOD */

+   ir_txs		/**< Texture size */

 };

 

 

@@ -1233,6 +1234,7 @@ enum ir_texture_opcode {
  * (txl <type> <sampler> <coordinate> 0 1 ( ) <lod>)

  * (txd <type> <sampler> <coordinate> 0 1 ( ) (dPdx dPdy))

  * (txf <type> <sampler> <coordinate> 0       <lod>)

+ * (txs <type> <sampler> <lod>)

  */

 class ir_texture : public ir_rvalue {

 public:

@@ -1355,7 +1357,7 @@ public:
 

    virtual ir_visitor_status accept(ir_hierarchical_visitor *);

 

-   bool is_lvalue()

+   bool is_lvalue() const

    {

       return val->is_lvalue() && !mask.has_duplicates;

    }

@@ -1363,7 +1365,7 @@ public:
    /**

     * Get the variable that is ultimately referenced by an r-value

     */

-   virtual ir_variable *variable_referenced();

+   virtual ir_variable *variable_referenced() const;

 

    ir_rvalue *val;

    ir_swizzle_mask mask;

@@ -1387,12 +1389,12 @@ public:
       return this;

    }

 

-   bool is_lvalue();

+   bool is_lvalue() const;

 

    /**

     * Get the variable that is ultimately referenced by an r-value

     */

-   virtual ir_variable *variable_referenced() = 0;

+   virtual ir_variable *variable_referenced() const = 0;

 };

 

 

@@ -1413,7 +1415,7 @@ public:
    /**

     * Get the variable that is ultimately referenced by an r-value

     */

-   virtual ir_variable *variable_referenced()

+   virtual ir_variable *variable_referenced() const

    {

       return this->var;

    }

@@ -1462,7 +1464,7 @@ public:
    /**

     * Get the variable that is ultimately referenced by an r-value

     */

-   virtual ir_variable *variable_referenced()

+   virtual ir_variable *variable_referenced() const

    {

       return this->array->variable_referenced();

    }

@@ -1496,7 +1498,7 @@ public:
    /**

     * Get the variable that is ultimately referenced by an r-value

     */

-   virtual ir_variable *variable_referenced()

+   virtual ir_variable *variable_referenced() const

    {

       return this->record->variable_referenced();

    }