From: Jason Ekstrand Date: Tue, 15 Mar 2016 21:09:50 +0000 (-0700) Subject: Merge remote-tracking branch 'public/master' into vulkan X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f6a0cb29c89a03441be744680a2145445be3a3c;p=mesa.git Merge remote-tracking branch 'public/master' into vulkan --- 7f6a0cb29c89a03441be744680a2145445be3a3c diff --cc src/compiler/nir/nir.h index 0f8c78100bf,34f31eb9859..ae37cbf7325 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@@ -2094,9 -1994,8 +2094,9 @@@ void nir_index_blocks(nir_function_imp void nir_print_shader(nir_shader *shader, FILE *fp); void nir_print_instr(const nir_instr *instr, FILE *fp); - nir_shader *nir_shader_clone(void *mem_ctx, const nir_shader *s); - nir_function_impl *nir_function_impl_clone(const nir_function_impl *impl); + nir_shader * nir_shader_clone(void *mem_ctx, const nir_shader *s); + nir_function_impl *nir_function_impl_clone(const nir_function_impl *fi); +nir_constant *nir_constant_clone(const nir_constant *c, nir_variable *var); #ifdef DEBUG void nir_validate_shader(nir_shader *shader); diff --cc src/mesa/drivers/dri/i965/brw_fs.cpp index 0f9de30f05b,86d2bd92726..b5f1a874368 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@@ -1931,10 -1933,15 +1931,10 @@@ fs_visitor::compact_virtual_grfs( void fs_visitor::assign_constant_locations() { - /* Only the first compile (SIMD8 mode) gets to decide on locations. */ - if (dispatch_width != 8) + /* Only the first compile gets to decide on locations. */ + if (dispatch_width != min_dispatch_width) return; - unsigned int num_pull_constants = 0; - - pull_constant_loc = ralloc_array(mem_ctx, int, uniforms); - memset(pull_constant_loc, -1, sizeof(pull_constant_loc[0]) * uniforms); - bool is_live[uniforms]; memset(is_live, 0, sizeof(is_live)); diff --cc src/mesa/drivers/dri/i965/brw_vec4.h index 7b86e1bc050,d43a5a82052..6143f65efa1 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@@ -274,15 -276,10 +274,8 @@@ public void emit_shader_time_end(); void emit_shader_time_write(int shader_time_subindex, src_reg value); - void emit_untyped_atomic(unsigned atomic_op, unsigned surf_index, - dst_reg dst, src_reg offset, src_reg src0, - src_reg src1); - - void emit_untyped_surface_read(unsigned surf_index, dst_reg dst, - src_reg offset); - src_reg get_scratch_offset(bblock_t *block, vec4_instruction *inst, src_reg *reladdr, int reg_offset); - src_reg get_pull_constant_offset(bblock_t *block, vec4_instruction *inst, - src_reg *reladdr, int reg_offset); void emit_scratch_read(bblock_t *block, vec4_instruction *inst, dst_reg dst, src_reg orig_src,