Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	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_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

1 files changed, 22 insertions, 22 deletions

diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index acff7eac3..4f77e8ebc 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -160,28 +160,28 @@ struct _mesa_glsl_parse_state {
     * \name Enable bits for GLSL extensions

     */

    /*@{*/

-   unsigned ARB_draw_buffers_enable:1;

-   unsigned ARB_draw_buffers_warn:1;

-   unsigned ARB_draw_instanced_enable:1;

-   unsigned ARB_draw_instanced_warn:1;

-   unsigned ARB_explicit_attrib_location_enable:1;

-   unsigned ARB_explicit_attrib_location_warn:1;

-   unsigned ARB_fragment_coord_conventions_enable:1;

-   unsigned ARB_fragment_coord_conventions_warn:1;

-   unsigned ARB_texture_rectangle_enable:1;

-   unsigned ARB_texture_rectangle_warn:1;

-   unsigned EXT_texture_array_enable:1;

-   unsigned EXT_texture_array_warn:1;

-   unsigned ARB_shader_texture_lod_enable:1;

-   unsigned ARB_shader_texture_lod_warn:1;

-   unsigned ARB_shader_stencil_export_enable:1;

-   unsigned ARB_shader_stencil_export_warn:1;

-   unsigned AMD_conservative_depth_enable:1;

-   unsigned AMD_conservative_depth_warn:1;

-   unsigned AMD_shader_stencil_export_enable:1;

-   unsigned AMD_shader_stencil_export_warn:1;

-   unsigned OES_texture_3D_enable:1;

-   unsigned OES_texture_3D_warn:1;

+   bool ARB_draw_buffers_enable;

+   bool ARB_draw_buffers_warn;

+   bool ARB_draw_instanced_enable;

+   bool ARB_draw_instanced_warn;

+   bool ARB_explicit_attrib_location_enable;

+   bool ARB_explicit_attrib_location_warn;

+   bool ARB_fragment_coord_conventions_enable;

+   bool ARB_fragment_coord_conventions_warn;

+   bool ARB_texture_rectangle_enable;

+   bool ARB_texture_rectangle_warn;

+   bool EXT_texture_array_enable;

+   bool EXT_texture_array_warn;

+   bool ARB_shader_texture_lod_enable;

+   bool ARB_shader_texture_lod_warn;

+   bool ARB_shader_stencil_export_enable;

+   bool ARB_shader_stencil_export_warn;

+   bool AMD_conservative_depth_enable;

+   bool AMD_conservative_depth_warn;

+   bool AMD_shader_stencil_export_enable;

+   bool AMD_shader_stencil_export_warn;

+   bool OES_texture_3D_enable;

+   bool OES_texture_3D_warn;

    /*@}*/

 

    /** Extensions supported by the OpenGL implementation. */