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

2016-03-24 17:30:14 -07:00
parent a5dc3c0f02 22b343a8ec
commit 2c3f95d6aa
266 changed files with 4907 additions and 3626 deletions
--- a/src/intel/vulkan/anv_meta_blit2d.c
+++ b/src/intel/vulkan/anv_meta_blit2d.c
@@ -455,7 +455,7 @@ build_nir_copy_fragment_shader(enum glsl_sampler_dim tex_dim)
   tex->texture = nir_deref_var_create(tex, sampler);
   tex->sampler = NULL;

-   nir_ssa_dest_init(&tex->instr, &tex->dest, 4, "tex");
+   nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, "tex");
   nir_builder_instr_insert(&b, &tex->instr);

   nir_variable *color_out = nir_variable_create(b.shader, nir_var_shader_out,