fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-24 00:50:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau: Use nir_lower_tex for projectors

Browse source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11826>
This commit is contained in:
Jason Ekstrand 2021-07-12 11:27:29 -05:00 • committed by Marge Bot
parent ec66c58138
commit bf87b9ad81
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
View file

@ -166,7 +166,6 @@ private:
bool visit(nir_tex_instr *);
// tex stuff
Value* applyProjection(Value *src, Value *proj);
unsigned int getNIRArgCount(TexInstruction::Target&);
nir_shader *nir;
@ -2913,14 +2912,6 @@ Converter::convert(glsl_sampler_dim dim, bool isArray, bool isShadow)
}
#undef CASE_SAMPLER
Value*
Converter::applyProjection(Value *src, Value *proj)
{
if (!proj)
return src;
return mkOp2v(OP_MUL, TYPE_F32, getScratch(), src, proj);
}
unsigned int
Converter::getNIRArgCount(TexInstruction::Target& target)
{
@ -2963,7 +2954,6 @@ Converter::visit(nir_tex_instr *insn)
std::vector<nir_src*> offsets;
uint8_t mask = 0;
bool lz = false;
Value *proj = NULL;
TexInstruction::Target target = convert(insn->sampler_dim, insn->is_array, insn->is_shadow);
operation op = getOperation(insn->op);
@ -2976,7 +2966,6 @@ Converter::visit(nir_tex_instr *insn)
int msIdx = nir_tex_instr_src_index(insn, nir_tex_src_ms_index);
int lodIdx = nir_tex_instr_src_index(insn, nir_tex_src_lod);
int offsetIdx = nir_tex_instr_src_index(insn, nir_tex_src_offset);
int projIdx = nir_tex_instr_src_index(insn, nir_tex_src_projector);
int sampOffIdx = nir_tex_instr_src_index(insn, nir_tex_src_sampler_offset);
int texOffIdx = nir_tex_instr_src_index(insn, nir_tex_src_texture_offset);
int sampHandleIdx = nir_tex_instr_src_index(insn, nir_tex_src_sampler_handle);
@ -2985,12 +2974,9 @@ Converter::visit(nir_tex_instr *insn)
bool bindless = sampHandleIdx != -1 || texHandleIdx != -1;
assert((sampHandleIdx != -1) == (texHandleIdx != -1));
if (projIdx != -1)
proj = mkOp1v(OP_RCP, TYPE_F32, getScratch(), getSrc(&insn->src[projIdx].src, 0));
srcs.resize(insn->coord_components);
for (uint8_t i = 0u; i < insn->coord_components; ++i)
srcs[i] = applyProjection(getSrc(&insn->src[coordsIdx].src, i), proj);
srcs[i] = getSrc(&insn->src[coordsIdx].src, i);
// sometimes we get less args than target.getArgCount, but codegen expects the latter
if (insn->coord_components) {
@ -3018,7 +3004,7 @@ Converter::visit(nir_tex_instr *insn)
if (offsetIdx != -1)
offsets.push_back(&insn->src[offsetIdx].src);
if (compIdx != -1)
srcs.push_back(applyProjection(getSrc(&insn->src[compIdx].src, 0), proj));
srcs.push_back(getSrc(&insn->src[compIdx].src, 0));
if (texOffIdx != -1) {
srcs.push_back(getSrc(&insn->src[texOffIdx].src, 0));
texOffIdx = srcs.size() - 1;
@ -3149,6 +3135,11 @@ Converter::run()
NIR_PASS_V(nir, nir_lower_subgroups, &subgroup_options);
struct nir_lower_tex_options tex_options = {};
tex_options.lower_txp = ~0;
NIR_PASS_V(nir, nir_lower_tex, &tex_options);
NIR_PASS_V(nir, nir_lower_load_const_to_scalar);
NIR_PASS_V(nir, nir_lower_alu_to_scalar, NULL, NULL);
NIR_PASS_V(nir, nir_lower_phis_to_scalar, false);