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

nir: support feeding state to nir_lower_clip_[vg]s

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Erik Faye-Lund
2019-10-02 16:30:45 -04:00
parent eb3047c094
commit 71c0dcf266
7 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/broadcom/compiler/vir.c
View File

@@ -825,7 +825,7 @@ v3d_nir_lower_vs_late(struct v3d_compile *c)
if (c->key->ucp_enables) { if (c->key->ucp_enables) {
NIR_PASS_V(c->s, nir_lower_clip_vs, c->key->ucp_enables, NIR_PASS_V(c->s, nir_lower_clip_vs, c->key->ucp_enables,
false, false); false, false, NULL);
NIR_PASS_V(c->s, nir_lower_io_to_scalar, NIR_PASS_V(c->s, nir_lower_io_to_scalar,
nir_var_shader_out); nir_var_shader_out);
} }

6
src/compiler/nir/nir.h
View File

@@ -3908,9 +3908,11 @@ bool nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval);
bool nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables, bool nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables,
bool use_vars, bool use_vars,
bool use_clipdist_array); bool use_clipdist_array,
const gl_state_index16 clipplane_state_tokens[][STATE_LENGTH]);
bool nir_lower_clip_gs(nir_shader *shader, unsigned ucp_enables, bool nir_lower_clip_gs(nir_shader *shader, unsigned ucp_enables,
bool use_clipdist_array); bool use_clipdist_array,
const gl_state_index16 clipplane_state_tokens[][STATE_LENGTH]);
bool nir_lower_clip_fs(nir_shader *shader, unsigned ucp_enables, bool nir_lower_clip_fs(nir_shader *shader, unsigned ucp_enables,
bool use_clipdist_array); bool use_clipdist_array);
bool nir_lower_clip_cull_distance_arrays(nir_shader *nir); bool nir_lower_clip_cull_distance_arrays(nir_shader *nir);

44
src/compiler/nir/nir_lower_clip.c
View File

@@ -203,11 +203,35 @@ find_clipvertex_and_position_outputs(nir_shader *shader,
return *clipvertex || *position; return *clipvertex || *position;
} }
static nir_ssa_def *
get_ucp(nir_builder *b, int plane,
const gl_state_index16 clipplane_state_tokens[][STATE_LENGTH])
{
if (clipplane_state_tokens) {
char tmp[100];
snprintf(tmp, ARRAY_SIZE(tmp), "gl_ClipPlane%dMESA", plane);
nir_variable *var = nir_variable_create(b->shader,
nir_var_uniform,
glsl_vec4_type(),
tmp);
var->num_state_slots = 1;
var->state_slots = ralloc_array(var, nir_state_slot, 1);
memcpy(var->state_slots[0].tokens,
clipplane_state_tokens[plane],
sizeof(var->state_slots[0].tokens));
return nir_load_var(b, var);
} else
return nir_load_user_clip_plane(b, plane);
}
static void static void
lower_clip_outputs(nir_builder *b, nir_variable *position, lower_clip_outputs(nir_builder *b, nir_variable *position,
nir_variable *clipvertex, nir_variable **out, nir_variable *clipvertex, nir_variable **out,
unsigned ucp_enables, bool use_vars, unsigned ucp_enables, bool use_vars,
bool use_clipdist_array) bool use_clipdist_array,
const gl_state_index16 clipplane_state_tokens[][STATE_LENGTH])
{ {
nir_ssa_def *clipdist[MAX_CLIP_PLANES]; nir_ssa_def *clipdist[MAX_CLIP_PLANES];
nir_ssa_def *cv; nir_ssa_def *cv;
@@ -231,7 +255,7 @@ lower_clip_outputs(nir_builder *b, nir_variable *position,
for (int plane = 0; plane < MAX_CLIP_PLANES; plane++) { for (int plane = 0; plane < MAX_CLIP_PLANES; plane++) {
if (ucp_enables & (1 << plane)) { if (ucp_enables & (1 << plane)) {
nir_ssa_def *ucp = nir_load_user_clip_plane(b, plane); nir_ssa_def *ucp = get_ucp(b, plane, clipplane_state_tokens);
/* calculate clipdist[plane] - dot(ucp, cv): */ /* calculate clipdist[plane] - dot(ucp, cv): */
clipdist[plane] = nir_fdot4(b, ucp, cv); clipdist[plane] = nir_fdot4(b, ucp, cv);
@@ -279,7 +303,8 @@ lower_clip_outputs(nir_builder *b, nir_variable *position,
*/ */
bool bool
nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables, bool use_vars, nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables, bool use_vars,
bool use_clipdist_array) bool use_clipdist_array,
const gl_state_index16 clipplane_state_tokens[][STATE_LENGTH])
{ {
nir_function_impl *impl = nir_shader_get_entrypoint(shader); nir_function_impl *impl = nir_shader_get_entrypoint(shader);
nir_builder b; nir_builder b;
@@ -314,7 +339,7 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables, bool use_vars,
use_clipdist_array); use_clipdist_array);
lower_clip_outputs(&b, position, clipvertex, out, ucp_enables, use_vars, lower_clip_outputs(&b, position, clipvertex, out, ucp_enables, use_vars,
use_clipdist_array); use_clipdist_array, clipplane_state_tokens);
nir_metadata_preserve(impl, nir_metadata_dominance); nir_metadata_preserve(impl, nir_metadata_dominance);
@@ -324,7 +349,8 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables, bool use_vars,
static void static void
lower_clip_in_gs_block(nir_builder *b, nir_block *block, nir_variable *position, lower_clip_in_gs_block(nir_builder *b, nir_block *block, nir_variable *position,
nir_variable *clipvertex, nir_variable **out, nir_variable *clipvertex, nir_variable **out,
unsigned ucp_enables, bool use_clipdist_array) unsigned ucp_enables, bool use_clipdist_array,
const gl_state_index16 clipplane_state_tokens[][STATE_LENGTH])
{ {
nir_foreach_instr_safe(instr, block) { nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic) if (instr->type != nir_instr_type_intrinsic)
@@ -336,7 +362,7 @@ lower_clip_in_gs_block(nir_builder *b, nir_block *block, nir_variable *position,
case nir_intrinsic_emit_vertex: case nir_intrinsic_emit_vertex:
b->cursor = nir_before_instr(instr); b->cursor = nir_before_instr(instr);
lower_clip_outputs(b, position, clipvertex, out, ucp_enables, true, lower_clip_outputs(b, position, clipvertex, out, ucp_enables, true,
use_clipdist_array); use_clipdist_array, clipplane_state_tokens);
break; break;
default: default:
/* not interesting; skip this */ /* not interesting; skip this */
@@ -351,7 +377,8 @@ lower_clip_in_gs_block(nir_builder *b, nir_block *block, nir_variable *position,
bool bool
nir_lower_clip_gs(nir_shader *shader, unsigned ucp_enables, nir_lower_clip_gs(nir_shader *shader, unsigned ucp_enables,
bool use_clipdist_array) bool use_clipdist_array,
const gl_state_index16 clipplane_state_tokens[][STATE_LENGTH])
{ {
nir_function_impl *impl = nir_shader_get_entrypoint(shader); nir_function_impl *impl = nir_shader_get_entrypoint(shader);
nir_builder b; nir_builder b;
@@ -375,7 +402,8 @@ nir_lower_clip_gs(nir_shader *shader, unsigned ucp_enables,
nir_foreach_block(block, impl) nir_foreach_block(block, impl)
lower_clip_in_gs_block(&b, block, position, clipvertex, out, lower_clip_in_gs_block(&b, block, position, clipvertex, out,
ucp_enables, use_clipdist_array); ucp_enables, use_clipdist_array,
clipplane_state_tokens);
nir_metadata_preserve(impl, nir_metadata_dominance); nir_metadata_preserve(impl, nir_metadata_dominance);

2
src/freedreno/ir3/ir3_nir.c
View File

@@ -223,7 +223,7 @@ ir3_optimize_nir(struct ir3_shader *shader, nir_shader *s,
if (key) { if (key) {
if (s->info.stage == MESA_SHADER_VERTEX) { if (s->info.stage == MESA_SHADER_VERTEX) {
OPT_V(s, nir_lower_clip_vs, key->ucp_enables, false, false); OPT_V(s, nir_lower_clip_vs, key->ucp_enables, false, false, NULL);
if (key->vclamp_color) if (key->vclamp_color)
OPT_V(s, nir_lower_clamp_color_outputs); OPT_V(s, nir_lower_clamp_color_outputs);
} else if (s->info.stage == MESA_SHADER_FRAGMENT) { } else if (s->info.stage == MESA_SHADER_FRAGMENT) {

7
src/gallium/drivers/iris/iris_program.c
View File

@@ -939,7 +939,7 @@ iris_compile_vs(struct iris_context *ice,
if (key->nr_userclip_plane_consts) { if (key->nr_userclip_plane_consts) {
nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_function_impl *impl = nir_shader_get_entrypoint(nir);
nir_lower_clip_vs(nir, (1 << key->nr_userclip_plane_consts) - 1, true, nir_lower_clip_vs(nir, (1 << key->nr_userclip_plane_consts) - 1, true,
false); false, NULL);
nir_lower_io_to_temporaries(nir, impl, true, false); nir_lower_io_to_temporaries(nir, impl, true, false);
nir_lower_global_vars_to_local(nir); nir_lower_global_vars_to_local(nir);
nir_lower_vars_to_ssa(nir); nir_lower_vars_to_ssa(nir);
@@ -1283,7 +1283,7 @@ iris_compile_tes(struct iris_context *ice,
if (key->nr_userclip_plane_consts) { if (key->nr_userclip_plane_consts) {
nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_function_impl *impl = nir_shader_get_entrypoint(nir);
nir_lower_clip_vs(nir, (1 << key->nr_userclip_plane_consts) - 1, true, nir_lower_clip_vs(nir, (1 << key->nr_userclip_plane_consts) - 1, true,
false); false, NULL);
nir_lower_io_to_temporaries(nir, impl, true, false); nir_lower_io_to_temporaries(nir, impl, true, false);
nir_lower_global_vars_to_local(nir); nir_lower_global_vars_to_local(nir);
nir_lower_vars_to_ssa(nir); nir_lower_vars_to_ssa(nir);
@@ -1403,7 +1403,8 @@ iris_compile_gs(struct iris_context *ice,
if (key->nr_userclip_plane_consts) { if (key->nr_userclip_plane_consts) {
nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_function_impl *impl = nir_shader_get_entrypoint(nir);
nir_lower_clip_gs(nir, (1 << key->nr_userclip_plane_consts) - 1, false); nir_lower_clip_gs(nir, (1 << key->nr_userclip_plane_consts) - 1, false,
NULL);
nir_lower_io_to_temporaries(nir, impl, true, false); nir_lower_io_to_temporaries(nir, impl, true, false);
nir_lower_global_vars_to_local(nir); nir_lower_global_vars_to_local(nir);
nir_lower_vars_to_ssa(nir); nir_lower_vars_to_ssa(nir);

2
src/gallium/drivers/vc4/vc4_program.c
View File

@@ -2317,7 +2317,7 @@ vc4_shader_ntq(struct vc4_context *vc4, enum qstage stage,
c->key->ucp_enables, false); c->key->ucp_enables, false);
} else { } else {
NIR_PASS_V(c->s, nir_lower_clip_vs, NIR_PASS_V(c->s, nir_lower_clip_vs,
c->key->ucp_enables, false, false); c->key->ucp_enables, false, false, NULL);
NIR_PASS_V(c->s, nir_lower_io_to_scalar, NIR_PASS_V(c->s, nir_lower_io_to_scalar,
nir_var_shader_out); nir_var_shader_out);
} }

3
src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
View File

@@ -407,7 +407,8 @@ brw_nir_lower_legacy_clipping(nir_shader *nir, int nr_userclip_plane_consts,
nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_function_impl *impl = nir_shader_get_entrypoint(nir);
nir_lower_clip_vs(nir, (1 << nr_userclip_plane_consts) - 1, true, false); nir_lower_clip_vs(nir, (1 << nr_userclip_plane_consts) - 1, true, false,
NULL);
nir_lower_io_to_temporaries(nir, impl, true, false); nir_lower_io_to_temporaries(nir, impl, true, false);
nir_lower_global_vars_to_local(nir); nir_lower_global_vars_to_local(nir);
nir_lower_vars_to_ssa(nir); nir_lower_vars_to_ssa(nir);