diff options
author | Jason Ekstrand <jason@jlekstrand.net> | 2021-06-10 22:53:26 -0500 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-06-11 21:19:06 +0000 |
commit | e23b55c3f02851aad6deba746ff9e8598d6f78de (patch) | |
tree | 1a4551bd538667b29e66211df680196fdbd7e574 /src/mesa/drivers | |
parent | eff418fe577f9e775b425d1166fcdf83567e8699 (diff) |
i965: Use nir_lower_passthrough_edgeflags
Now that there's a common NIR pass, there's no point in us doing this in
the back-end anymore. In order to use this pass in i965, we do have to
make one tiny change. Gallium runs the pass after assigning input and
output locations and so needs the pass to respect those locations and
num_inputs. i965, however, runs it before any location assignment or
I/O lowering so we don't care. We do, however, need the pass to succeed
with num_inputs == 0 because we set that later.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11313>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index da37cfe11ac..050bf7d36a5 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -76,10 +76,6 @@ brw_vs_outputs_written(struct brw_context *brw, struct brw_vs_prog_key *key, const struct intel_device_info *devinfo = &brw->screen->devinfo; GLbitfield64 outputs_written = user_varyings; - if (key->copy_edgeflag) { - outputs_written |= BITFIELD64_BIT(VARYING_SLOT_EDGE); - } - if (devinfo->ver < 6) { /* Put dummy slots into the VUE for the SF to put the replaced * point sprite coords in. We shouldn't need these dummy slots, @@ -156,6 +152,9 @@ brw_codegen_vs_prog(struct brw_context *brw, &prog_data.base.base); } + if (key->copy_edgeflag) + nir_lower_passthrough_edgeflags(nir); + uint64_t outputs_written = brw_vs_outputs_written(brw, key, nir->info.outputs_written); |