On Feb 9, 2016 7:06 PM, "Connor Abbott" <<a href="mailto:cwabbott0@gmail.com">cwabbott0@gmail.com</a>> wrote: > > Did you make sure the other drivers and ttn don't use this? Assming that, Well, I deleted it from the header and the other drivers built so... > Reviewed-by: Connor Abbott <<a href="mailto:cwabbott0@gmail.com">cwabbott0@gmail.com</a>> > > I really should get to your other series, but I've been busy with > school stuff and whatnot and I've been too lazy -- sorry! > > On Tue, Feb 9, 2016 at 8:08 PM, Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> wrote: > > When NIR was originally drafted, there was no easy way to determine if > > something was constant or not. The result was that we had lots of > > special-casing for constant values such as this. Now that load_const > > instructions are SSA-only, it's really easy to find constants and this > > isn't really needed anymore. > > --- > > src/compiler/nir/glsl_to_nir.cpp | 16 +++++-------- > > src/compiler/nir/nir.h | 3 --- > > src/compiler/nir/nir_clone.c | 1 - > > src/compiler/nir/nir_instr_set.c | 3 --- > > src/compiler/nir/nir_print.c | 14 ------------ > > .../drivers/freedreno/ir3/ir3_compiler_nir.c | 15 ------------- > > src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 26 +++++++++------------- > > src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 21 ++++++++--------- > > 8 files changed, 27 insertions(+), 72 deletions(-) > > > > diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp > > index 3db2775..eaf71d0 100644 > > --- a/src/compiler/nir/glsl_to_nir.cpp > > +++ b/src/compiler/nir/glsl_to_nir.cpp > > @@ -1824,7 +1824,7 @@ nir_visitor::visit(ir_texture *ir) > > num_srcs++; > > if (ir->shadow_comparitor != NULL) > > num_srcs++; > > - if (ir->offset != NULL && ir->offset->as_constant() == NULL) > > + if (ir->offset != NULL) > > num_srcs++; > > > > nir_tex_instr *instr = nir_tex_instr_create(this->shader, num_srcs); > > @@ -1881,16 +1881,10 @@ nir_visitor::visit(ir_texture *ir) > > /* we don't support multiple offsets yet */ > > assert(ir->offset->type->is_vector() || ir->offset->type->is_scalar()); > > > > - ir_constant *const_offset = ir->offset->as_constant(); > > - if (const_offset != NULL) { > > - for (unsigned i = 0; i < const_offset->type->vector_elements; i++) > > - instr->const_offset[i] = const_offset->value.i[i]; > > - } else { > > - instr->src[src_number].src = > > - nir_src_for_ssa(evaluate_rvalue(ir->offset)); > > - instr->src[src_number].src_type = nir_tex_src_offset; > > - src_number++; > > - } > > + instr->src[src_number].src = > > + nir_src_for_ssa(evaluate_rvalue(ir->offset)); > > + instr->src[src_number].src_type = nir_tex_src_offset; > > + src_number++; > > } > > > > switch (ir->op) { > > diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h > > index a4dbfde..294b18e 100644 > > --- a/src/compiler/nir/nir.h > > +++ b/src/compiler/nir/nir.h > > @@ -949,9 +949,6 @@ typedef struct { > > */ > > bool is_new_style_shadow; > > > > - /* constant offset - must be 0 if the offset source is used */ > > - int const_offset[4]; > > - > > /* gather component selector */ > > unsigned component : 2; > > > > diff --git a/src/compiler/nir/nir_clone.c b/src/compiler/nir/nir_clone.c > > index 5eff743..58ba2eb 100644 > > --- a/src/compiler/nir/nir_clone.c > > +++ b/src/compiler/nir/nir_clone.c > > @@ -355,7 +355,6 @@ clone_tex(clone_state *state, const nir_tex_instr *tex) > > ntex->is_array = tex->is_array; > > ntex->is_shadow = tex->is_shadow; > > ntex->is_new_style_shadow = tex->is_new_style_shadow; > > - memcpy(ntex->const_offset, tex->const_offset, sizeof(ntex->const_offset)); > > ntex->component = tex->component; > > ntex->sampler_index = tex->sampler_index; > > ntex->sampler_array_size = tex->sampler_array_size; > > diff --git a/src/compiler/nir/nir_instr_set.c b/src/compiler/nir/nir_instr_set.c > > index d3f939f..880a814 100644 > > --- a/src/compiler/nir/nir_instr_set.c > > +++ b/src/compiler/nir/nir_instr_set.c > > @@ -152,7 +152,6 @@ hash_tex(uint32_t hash, const nir_tex_instr *instr) > > hash = HASH(hash, instr->is_array); > > hash = HASH(hash, instr->is_shadow); > > hash = HASH(hash, instr->is_new_style_shadow); > > - hash = HASH(hash, instr->const_offset); > > unsigned component = instr->component; > > hash = HASH(hash, component); > > hash = HASH(hash, instr->sampler_index); > > @@ -302,8 +301,6 @@ nir_instrs_equal(const nir_instr *instr1, const nir_instr *instr2) > > tex1->is_array != tex2->is_array || > > tex1->is_shadow != tex2->is_shadow || > > tex1->is_new_style_shadow != tex2->is_new_style_shadow || > > - memcmp(tex1->const_offset, tex2->const_offset, > > - sizeof(tex1->const_offset)) != 0 || > > tex1->component != tex2->component || > > tex1->sampler_index != tex2->sampler_index || > > tex1->sampler_array_size != tex2->sampler_array_size) { > > diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c > > index 48ecb48..370eb8b 100644 > > --- a/src/compiler/nir/nir_print.c > > +++ b/src/compiler/nir/nir_print.c > > @@ -612,20 +612,6 @@ print_tex_instr(nir_tex_instr *instr, print_state *state) > > fprintf(fp, ", "); > > } > > > > - bool has_nonzero_offset = false; > > - for (unsigned i = 0; i < 4; i++) { > > - if (instr->const_offset[i] != 0) { > > - has_nonzero_offset = true; > > - break; > > - } > > - } > > - > > - if (has_nonzero_offset) { > > - fprintf(fp, "[%i %i %i %i] (offset), ", > > - instr->const_offset[0], instr->const_offset[1], > > - instr->const_offset[2], instr->const_offset[3]); > > - } > > - > > if (instr->op == nir_texop_tg4) { > > fprintf(fp, "%u (gather_component), ", instr->component); > > } > > diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c > > index 6eb6a2d..b441f6b 100644 > > --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c > > +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c > > @@ -1430,21 +1430,6 @@ emit_tex(struct ir3_compile *ctx, nir_tex_instr *tex) > > > > tex_info(tex, &flags, &coords); > > > > - if (!has_off) { > > - /* could still have a constant offset: */ > > - if (tex->const_offset[0] || tex->const_offset[1] || > > - tex->const_offset[2] || tex->const_offset[3]) { > > - off = const_off; > > - > > - off[0] = create_immed(b, tex->const_offset[0]); > > - off[1] = create_immed(b, tex->const_offset[1]); > > - off[2] = create_immed(b, tex->const_offset[2]); > > - off[3] = create_immed(b, tex->const_offset[3]); > > - > > - has_off = true; > > - } > > - } > > - > > /* scale up integer coords for TXF based on the LOD */ > > if (ctx->unminify_coords && (opc == OPC_ISAML)) { > > assert(has_lod); > > diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp > > index 0efb2fa..6a27482 100644 > > --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp > > +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp > > @@ -2949,7 +2949,6 @@ fs_visitor::nir_emit_texture(const fs_builder &bld, nir_tex_instr *instr) > > instr->is_array; > > > > int lod_components = 0; > > - int UNUSED offset_components = 0; > > > > fs_reg coordinate, shadow_comparitor, lod, lod2, sample_index, mcs, tex_offset; > > > > @@ -2997,13 +2996,18 @@ fs_visitor::nir_emit_texture(const fs_builder &bld, nir_tex_instr *instr) > > case nir_tex_src_ms_index: > > sample_index = retype(src, BRW_REGISTER_TYPE_UD); > > break; > > - case nir_tex_src_offset: > > - tex_offset = retype(src, BRW_REGISTER_TYPE_D); > > - if (instr->is_array) > > - offset_components = instr->coord_components - 1; > > - else > > - offset_components = instr->coord_components; > > + > > + case nir_tex_src_offset: { > > + nir_const_value *const_offset = > > + nir_src_as_const_value(instr->src[i].src); > > + if (const_offset) { > > + tex_offset = brw_imm_ud(brw_texture_offset(const_offset->i, 3)); > > + } else { > > + tex_offset = retype(src, BRW_REGISTER_TYPE_D); > > + } > > break; > > + } > > + > > case nir_tex_src_projector: > > unreachable("should be lowered"); > > > > @@ -3039,14 +3043,6 @@ fs_visitor::nir_emit_texture(const fs_builder &bld, nir_tex_instr *instr) > > } > > } > > > > - for (unsigned i = 0; i < 3; i++) { > > - if (instr->const_offset[i] != 0) { > > - assert(offset_components == 0); > > - tex_offset = brw_imm_ud(brw_texture_offset(instr->const_offset, 3)); > > - break; > > - } > > - } > > - > > enum glsl_base_type dest_base_type = > > brw_glsl_base_type_for_nir_type (instr->dest_type); > > > > diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp > > index d3ac7ab..92349c6 100644 > > --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp > > +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp > > @@ -1655,6 +1655,7 @@ vec4_visitor::nir_emit_texture(nir_tex_instr *instr) > > dst_reg dest = get_nir_dest(instr->dest, instr->dest_type); > > > > /* Load the texture operation sources */ > > + uint32_t constant_offset = 0; > > for (unsigned i = 0; i < instr->num_srcs; i++) { > > switch (instr->src[i].src_type) { > > case nir_tex_src_comparitor: > > @@ -1711,9 +1712,17 @@ vec4_visitor::nir_emit_texture(nir_tex_instr *instr) > > break; > > } > > > > - case nir_tex_src_offset: > > - offset_value = get_nir_src(instr->src[i].src, BRW_REGISTER_TYPE_D, 2); > > + case nir_tex_src_offset: { > > + nir_const_value *const_offset = > > + nir_src_as_const_value(instr->src[i].src); > > + if (const_offset) { > > + constant_offset = brw_texture_offset(const_offset->i, 3); > > + } else { > > + offset_value = > > + get_nir_src(instr->src[i].src, BRW_REGISTER_TYPE_D, 2); > > + } > > break; > > + } > > > > case nir_tex_src_sampler_offset: { > > /* The highest sampler which may be used by this operation is > > @@ -1760,14 +1769,6 @@ vec4_visitor::nir_emit_texture(nir_tex_instr *instr) > > } > > } > > > > - uint32_t constant_offset = 0; > > - for (unsigned i = 0; i < 3; i++) { > > - if (instr->const_offset[i] != 0) { > > - constant_offset = brw_texture_offset(instr->const_offset, 3); > > - break; > > - } > > - } > > - > > /* Stuff the channel select bits in the top of the texture offset */ > > if (instr->op == nir_texop_tg4) { > > if (instr->component == 1 && > > -- > > 2.5.0.400.gff86faf > > > > _______________________________________________ > > mesa-dev mailing list > > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > > <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a>