Mesa (main): r600/sfn: Lower FS pos input w-transform in NIR
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue May 18 20:31:02 UTC 2021
Module: Mesa
Branch: main
Commit: 3b4b962c1524075d0578f3fbac8a9b7a13f36036
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b4b962c1524075d0578f3fbac8a9b7a13f36036
Author: Gert Wollny <gert.wollny at collabora.com>
Date: Fri Apr 30 20:12:19 2021 +0200
r600/sfn: Lower FS pos input w-transform in NIR
Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10608>
---
src/gallium/drivers/r600/sfn/sfn_nir.cpp | 1 +
src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
index f1c663819c9..76310f9f596 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp
@@ -892,6 +892,7 @@ int r600_shader_from_nir(struct r600_context *rctx,
NIR_PASS_V(sel->nir, r600_vectorize_vs_inputs);
if (sel->nir->info.stage == MESA_SHADER_FRAGMENT) {
+ NIR_PASS_V(sel->nir, nir_lower_fragcoord_wtrans);
NIR_PASS_V(sel->nir, r600_lower_fs_out_to_vector);
}
diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
index b13cb8a8a1d..9cb15d93829 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
@@ -400,8 +400,6 @@ void FragmentShaderFromNir::emit_shader_start()
auto v = new GPRValue(m_frag_pos_index, i);
v->set_as_input();
auto reg = PValue(v);
- if (i == 3)
- emit_instruction(new AluInstruction(op1_recip_ieee, reg, reg, {alu_write, alu_last_instr}));
m_frag_pos[i] = reg;
}
}
More information about the mesa-commit
mailing list