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

diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index ce5bd4afe..ed731b631 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -254,7 +254,7 @@ ir_validate::visit_leave(ir_expression *ir)
 

    case ir_unop_f2i:

       assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT);

-      assert(ir->type->is_integer());

+      assert(ir->type->base_type == GLSL_TYPE_INT);

       break;

    case ir_unop_i2f:

       assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);

@@ -269,17 +269,25 @@ ir_validate::visit_leave(ir_expression *ir)
       assert(ir->type->base_type == GLSL_TYPE_FLOAT);

       break;

    case ir_unop_i2b:

-      assert(ir->operands[0]->type->is_integer());

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);

       assert(ir->type->base_type == GLSL_TYPE_BOOL);

       break;

    case ir_unop_b2i:

       assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);

-      assert(ir->type->is_integer());

+      assert(ir->type->base_type == GLSL_TYPE_INT);

       break;

    case ir_unop_u2f:

       assert(ir->operands[0]->type->base_type == GLSL_TYPE_UINT);

       assert(ir->type->base_type == GLSL_TYPE_FLOAT);

       break;

+   case ir_unop_i2u:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT);

+      assert(ir->type->base_type == GLSL_TYPE_UINT);

+      break;

+   case ir_unop_u2i:

+      assert(ir->operands[0]->type->base_type == GLSL_TYPE_UINT);

+      assert(ir->type->base_type == GLSL_TYPE_INT);

+      break;

 

    case ir_unop_any:

       assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL);