OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/draw: use nir_shader_instructions_pass for nir_lower_aaline_fs

Browse Source 
This just cuts away some needless boilerplate code.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20096>
This commit is contained in:
Erik Faye-Lund
2022-11-24 15:47:38 +01:00
committed by Marge Bot
parent 3897a233fb
commit 7c1b9ee6b7
1 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/gallium/auxiliary/nir/nir_draw_helpers.c
View File

@@ -147,70 +147,51 @@ nir_lower_pstipple_fs(struct nir_shader *shader,
} }
typedef struct { typedef struct {
nir_builder b;
nir_shader *shader;
nir_variable *line_width_input; nir_variable *line_width_input;
} lower_aaline; } lower_aaline;
static void static bool
nir_lower_aaline_block(nir_block *block, lower_aaline_instr(nir_builder *b, nir_instr *instr, void *data)
lower_aaline *state)
{ {
nir_builder *b = &state->b; lower_aaline *state = data;
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); if (instr->type != nir_instr_type_intrinsic)
if (intrin->intrinsic != nir_intrinsic_store_deref) return false;
continue;
nir_variable *var = nir_intrinsic_get_var(intrin, 0); nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (var->data.mode != nir_var_shader_out) if (intrin->intrinsic != nir_intrinsic_store_deref)
continue; return false;
if (var->data.location < FRAG_RESULT_DATA0 && var->data.location != FRAG_RESULT_COLOR)
continue;
nir_ssa_def *out_input = intrin->src[1].ssa; nir_variable *var = nir_intrinsic_get_var(intrin, 0);
b->cursor = nir_before_instr(instr); if (var->data.mode != nir_var_shader_out)
nir_ssa_def *lw = nir_load_var(b, state->line_width_input); return false;
nir_ssa_def *len = nir_channel(b, lw, 3); if (var->data.location < FRAG_RESULT_DATA0 && var->data.location != FRAG_RESULT_COLOR)
len = nir_fadd_imm(b, nir_fmul_imm(b, len, 2.0), -1.0); return false;
nir_ssa_def *tmp = nir_fsat(b, nir_fadd(b, nir_channels(b, lw, 0xa),
nir_fneg(b, nir_fabs(b, nir_channels(b, lw, 0x5)))));
tmp = nir_fmul(b, nir_channel(b, tmp, 0), nir_ssa_def *out_input = intrin->src[1].ssa;
nir_fmin(b, nir_channel(b, tmp, 1), len)); b->cursor = nir_before_instr(instr);
tmp = nir_fmul(b, nir_channel(b, out_input, 3), tmp); nir_ssa_def *lw = nir_load_var(b, state->line_width_input);
nir_ssa_def *len = nir_channel(b, lw, 3);
len = nir_fadd_imm(b, nir_fmul_imm(b, len, 2.0), -1.0);
nir_ssa_def *tmp = nir_fsat(b, nir_fadd(b, nir_channels(b, lw, 0xa),
nir_fneg(b, nir_fabs(b, nir_channels(b, lw, 0x5)))));
nir_ssa_def *out = nir_vec4(b, nir_channel(b, out_input, 0), tmp = nir_fmul(b, nir_channel(b, tmp, 0),
nir_channel(b, out_input, 1), nir_fmin(b, nir_channel(b, tmp, 1), len));
nir_channel(b, out_input, 2), tmp = nir_fmul(b, nir_channel(b, out_input, 3), tmp);
tmp);
nir_instr_rewrite_src(instr, &intrin->src[1], nir_src_for_ssa(out));
}
} nir_ssa_def *out = nir_vec4(b, nir_channel(b, out_input, 0),
nir_channel(b, out_input, 1),
static void nir_channel(b, out_input, 2),
nir_lower_aaline_impl(nir_function_impl *impl, tmp);
lower_aaline *state) nir_instr_rewrite_src(instr, &intrin->src[1], nir_src_for_ssa(out));
{ return true;
nir_builder *b = &state->b;
nir_builder_init(b, impl);
nir_foreach_block(block, impl) {
nir_lower_aaline_block(block, state);
}
} }
void void
nir_lower_aaline_fs(struct nir_shader *shader, int *varying) nir_lower_aaline_fs(struct nir_shader *shader, int *varying)
{ {
lower_aaline state = { lower_aaline state;
.shader = shader,
};
if (shader->info.stage != MESA_SHADER_FRAGMENT) if (shader->info.stage != MESA_SHADER_FRAGMENT)
return; return;
@@ -235,11 +216,8 @@ nir_lower_aaline_fs(struct nir_shader *shader, int *varying)
*varying = tgsi_get_generic_gl_varying_index(line_width->data.location, true); *varying = tgsi_get_generic_gl_varying_index(line_width->data.location, true);
state.line_width_input = line_width; state.line_width_input = line_width;
nir_foreach_function(function, shader) { nir_shader_instructions_pass(shader, lower_aaline_instr,
if (function->impl) { nir_metadata_dominance, &state);
nir_lower_aaline_impl(function->impl, &state);
}
}
} }
typedef struct { typedef struct {