KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600/sfn: Fix enabling the right interpolator for inerpolate_at_sample 

Fixes: 73c5f45191
   r600/sfn: Fix interpolate at sample

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6925>
This commit is contained in:
Gert Wollny 2020-09-29 16:09:09 +02:00 committed by Marge Bot
parent 16a3a56321
commit 7683e27561
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
View File

@ -170,10 +170,8 @@ bool FragmentShaderFromNir::do_allocate_reserved_registers()
m_interpolator[5].enabled = true; /* linear */
}
if (m_enable_sample_interpolators) {
m_interpolator[0].enabled = true; /* perspective */
m_interpolator[3].enabled = true; /* linear */
}
if (m_enable_sample_interpolators)
m_interpolator[1].enabled = true; /* perspective */
// sort the varying inputs
m_shaderio.sort_varying_inputs();
@ -467,8 +465,7 @@ bool FragmentShaderFromNir::emit_interp_deref_at_sample(nir_intrinsic_instr* ins
auto& io = m_shaderio.input(var->data.driver_location, var->data.location_frac);
int ij_index = io.ij_index() >= 3 ? 3 : 0;
auto interpolator = m_interpolator[ij_index];
auto interpolator = m_interpolator[1];
assert(interpolator.enabled);
PValue dummy(new GPRValue(interpolator.i->sel(), 0));
@ -607,7 +604,9 @@ bool FragmentShaderFromNir::do_emit_load_deref(const nir_variable *in_var, nir_i
auto dst = vec_from_nir(instr->dest, 4);
sfn_log << SfnLog::io << "Set input[" << in_var->data.driver_location
<< "].gpr=" << dst.sel() << "\n";
<< "].gpr=" << dst.sel()
<< " interp=" << io.ij_index()
<< "\n";
io.set_gpr(dst.sel());