diff options
| author | Eric Anholt <[email protected]> | 2015-04-01 11:38:53 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2015-04-03 11:50:27 -0700 |
| commit | cb966fb2bea77b1d7b1bdb6597b7b85d810f2d0a (patch) | |
| tree | 5cb21f4fb3f205080622f3433c720b5a27767b40 /src/mesa | |
| parent | ea811b7868d4039499dddf53c109cf0b9da98967 (diff) | |
i965: Use the tex projector lowering pass instead of hand-rolling it.
This only impacts the ARB_fp path. We can't quite disable the GLSL-level
lowering pass, because it needs to apply before
brw_do_lower_unnormalized_offset().
total instructions in shared programs: 5667857 -> 5667847 (-0.00%)
instructions in affected programs: 1114 -> 1104 (-0.90%)
helped: 16
HURT: 6
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp index 4dfb4d693ae..0f1659db110 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp @@ -101,6 +101,9 @@ fs_visitor::emit_nir_code() nir_lower_global_vars_to_local(nir); nir_validate_shader(nir); + nir_lower_tex_projector(nir); + nir_validate_shader(nir); + nir_split_var_copies(nir); nir_validate_shader(nir); @@ -1782,7 +1785,6 @@ fs_visitor::nir_emit_texture(nir_tex_instr *instr) int lod_components = 0, offset_components = 0; fs_reg coordinate, shadow_comparitor, lod, lod2, sample_index, mcs, tex_offset; - fs_reg projector; for (unsigned i = 0; i < instr->num_srcs; i++) { fs_reg src = get_nir_src(instr->src[i].src); @@ -1835,8 +1837,7 @@ fs_visitor::nir_emit_texture(nir_tex_instr *instr) offset_components = instr->coord_components; break; case nir_tex_src_projector: - projector = retype(src, BRW_REGISTER_TYPE_F); - break; + unreachable("should be lowered"); case nir_tex_src_sampler_offset: { /* Figure out the highest possible sampler index and mark it as used */ @@ -1860,13 +1861,6 @@ fs_visitor::nir_emit_texture(nir_tex_instr *instr) } } - if (projector.file != BAD_FILE) { - fs_reg invproj = vgrf(glsl_type::float_type); - emit_math(SHADER_OPCODE_RCP, invproj, projector); - for (int i = 0; i < 3; i++) - emit(MUL(offset(coordinate, i), offset(coordinate, i), invproj)); - } - if (instr->op == nir_texop_txf_ms) { if (brw->gen >= 7 && key_tex->compressed_multisample_layout_mask & (1 << sampler)) { |