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

2016-04-13 20:25:39 -07:00
parent 79fbec30fc 171a570f38
commit 12f88ba32a
310 changed files with 5116 additions and 2936 deletions
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -170,7 +170,7 @@ anv_shader_compile_to_nir(struct anv_device *device,
   /* Vulkan uses the separate-shader linking model */
   nir->info.separate_shader = true;

-   nir = brw_preprocess_nir(nir, compiler->scalar_stage[stage]);
+   nir = brw_preprocess_nir(compiler, nir);

   nir_shader_gather_info(nir, entry_point->impl);