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

diff --cc src/mesa/drivers/dri/i965/brw_compiler.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_compiler.h
index fb57401,231e000..cf0b088
--- 1/src/mesa/drivers/dri/i965/brw_compiler.h
--- 2/src/mesa/drivers/dri/i965/brw_compiler.h
+++ b/src/mesa/drivers/dri/i965/brw_compiler.h
@@@ -92,11 -92,14 +92,17 @@@ struct brw_compiler 
  
     bool scalar_stage[MESA_SHADER_STAGES];
     struct gl_shader_compiler_options glsl_compiler_options[MESA_SHADER_STAGES];
+ 
+    /**
+     * Apply workarounds for SIN and COS output range problems.
+     * This can negatively impact performance.
+     */
+    bool precise_trig;
  };
  
 +struct brw_compiler *
 +brw_compiler_create(void *mem_ctx, const struct brw_device_info *devinfo);
 +
  
  /**
   * Program key structures.

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

diff --cc src/mesa/drivers/dri/i965/brw_surface_formats.c
Simple merge

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

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