Merge remote-tracking branch 'public/master' into vulkan

diff --cc src/compiler/Makefile.sources
index 43377f18ad83518561e0fa7da38406b49ee0b43a,0aee2006902a1be2b7b991231dba340a9dcd7489..120ef2935a7fe729acf727d793cac0a592432ac6
--- 1/src/compiler/Makefile.sources
--- 2/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@@ -176,13 -176,12 +176,13 @@@ NIR_FILES = 
        nir/nir_control_flow_private.h \
        nir/nir_dominance.c \
        nir/nir_from_ssa.c \
 +      nir/nir_gather_info.c \
        nir/nir_gs_count_vertices.c \
        nir/nir_inline_functions.c \
-       nir/nir_intrinsics.c \
-       nir/nir_intrinsics.h \
        nir/nir_instr_set.c \
        nir/nir_instr_set.h \
+       nir/nir_intrinsics.c \
+       nir/nir_intrinsics.h \
        nir/nir_liveness.c \
        nir/nir_lower_alu_to_scalar.c \
        nir/nir_lower_atomics.c \

diff --cc src/compiler/glsl/glsl_parser_extras.cpp
Simple merge

diff --cc src/compiler/glsl/standalone_scaffolding.cpp
Simple merge

diff --cc src/compiler/nir/Makefile.sources
index a876eff289af24d60324b0ed219280852c8a93db,347430245519f2abf40a6bf9ab071f2688b23c04..e6367d9c28234c4dff68906030e46534cd4f2975
--- 1/src/compiler/nir/Makefile.sources
--- 2/src/compiler/nir/Makefile.sources
+++ b/src/compiler/nir/Makefile.sources
@@@ -19,13 -19,12 +19,13 @@@ NIR_FILES = 
        nir_control_flow_private.h \
        nir_dominance.c \
        nir_from_ssa.c \
 +      nir_gather_info.c \
        nir_gs_count_vertices.c \
        nir_inline_functions.c \
-       nir_intrinsics.c \
-       nir_intrinsics.h \
        nir_instr_set.c \
        nir_instr_set.h \
+       nir_intrinsics.c \
+       nir_intrinsics.h \
        nir_liveness.c \
        nir_lower_alu_to_scalar.c \
        nir_lower_atomics.c \

diff --cc src/compiler/nir/glsl_to_nir.cpp
Simple merge

diff --cc src/compiler/nir/nir.h
Simple merge

diff --cc src/compiler/nir/nir_opt_algebraic.py
index 2e9cd5fcc94d797d1277c88272a26a16af8c648d,e72b4a791cb052fb9e3518ba36d909c2761a28ff..ddfe94d9e7324f75157a6084b00db9ec66048178
--- 1/src/compiler/nir/nir_opt_algebraic.py
--- 2/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@@ -270,9 -270,12 +271,13 @@@ optimizations = 
     (('fabs', ('fsub', 0.0, a)), ('fabs', a)),
     (('iabs', ('isub', 0, a)), ('iabs', a)),
  
+    # Propagate negation up multiplication chains
+    (('fmul', ('fneg', a), b), ('fneg', ('fmul', a, b))),
+    (('imul', ('ineg', a), b), ('ineg', ('imul', a, b))),
+ 
     # Misc. lowering
     (('fmod', a, b), ('fsub', a, ('fmul', b, ('ffloor', ('fdiv', a, b)))), 'options->lower_fmod'),
 +   (('frem', a, b), ('fsub', a, ('fmul', b, ('ftrunc', ('fdiv', a, b)))), 'options->lower_fmod'),
     (('uadd_carry', a, b), ('b2i', ('ult', ('iadd', a, b), a)), 'options->lower_uadd_carry'),
     (('usub_borrow', a, b), ('b2i', ('ult', a, b)), 'options->lower_usub_borrow'),
  

diff --cc src/compiler/shader_enums.h
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge