Merge remote branch 'origin/master' into lp-setup-llvm

Conflicts:
	src/gallium/drivers/llvmpipe/lp_setup_coef.c
	src/gallium/drivers/llvmpipe/lp_setup_coef.h
	src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_setup_tri.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.h

1 files changed, 12 insertions, 12 deletions

diff --git a/src/glsl/builtins/ir/notEqual b/src/glsl/builtins/ir/notEqual
index d07cdbf41f1..abaf1914c9f 100644
--- a/src/glsl/builtins/ir/notEqual
+++ b/src/glsl/builtins/ir/notEqual
@@ -3,71 +3,71 @@
      (parameters
        (declare (in) vec2 arg0)
        (declare (in) vec2 arg1))
-     ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec3
      (parameters
        (declare (in) vec3 arg0)
        (declare (in) vec3 arg1))
-     ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec4
      (parameters
        (declare (in) vec4 arg0)
        (declare (in) vec4 arg1))
-     ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec2
      (parameters
        (declare (in) bvec2 arg0)
        (declare (in) bvec2 arg1))
-     ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec3
      (parameters
        (declare (in) bvec3 arg0)
        (declare (in) bvec3 arg1))
-     ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec4
      (parameters
        (declare (in) bvec4 arg0)
        (declare (in) bvec4 arg1))
-     ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec2
      (parameters
        (declare (in) ivec2 arg0)
        (declare (in) ivec2 arg1))
-     ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec3
      (parameters
        (declare (in) ivec3 arg0)
        (declare (in) ivec3 arg1))
-     ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec4
      (parameters
        (declare (in) ivec4 arg0)
        (declare (in) ivec4 arg1))
-     ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec2
      (parameters
        (declare (in) uvec2 arg0)
        (declare (in) uvec2 arg1))
-     ((return (expression bvec2 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec2 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec3
      (parameters
        (declare (in) uvec3 arg0)
        (declare (in) uvec3 arg1))
-     ((return (expression bvec3 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec3 != (var_ref arg0) (var_ref arg1)))))
 
    (signature bvec4
      (parameters
        (declare (in) uvec4 arg0)
        (declare (in) uvec4 arg1))
-     ((return (expression bvec4 any_nequal (var_ref arg0) (var_ref arg1)))))
+     ((return (expression bvec4 != (var_ref arg0) (var_ref arg1)))))
 ))