fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: don't unset TRUNC_COORD if conformant_trunc_coord=true

Browse source 
This isn't necessary.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24137>
This commit is contained in:
Rhys Perry 2023-07-12 20:51:14 +01:00 • committed by Marge Bot
parent 436df35c17
commit e02f8b62af
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
View file

@ -34,6 +34,7 @@ typedef struct {
uint32_t address32_hi;
bool disable_aniso_single_level;
bool has_image_load_dcc_bug;
bool conformant_trunc_coord;
const struct radv_shader_args *args;
const struct radv_shader_info *info;
@ -245,7 +246,8 @@ get_sampler_desc(nir_builder *b, apply_layout_state *state, nir_deref_instr *der
}
}
uint32_t dword0_mask = tex->op == nir_texop_tg4 ? C_008F30_TRUNC_COORD : 0xffffffffu;
uint32_t dword0_mask =
tex->op == nir_texop_tg4 && !state->conformant_trunc_coord ? C_008F30_TRUNC_COORD : 0xffffffffu;
const uint32_t *samplers = radv_immutable_samplers(layout, binding);
return nir_imm_ivec4(b, samplers[constant_index * 4 + 0] & dword0_mask, samplers[constant_index * 4 + 1],
samplers[constant_index * 4 + 2], samplers[constant_index * 4 + 3]);
@ -329,7 +331,7 @@ get_sampler_desc(nir_builder *b, apply_layout_state *state, nir_deref_instr *der
comp[6] = nir_iand_imm(b, comp[6], C_00A018_WRITE_COMPRESS_ENABLE);
return nir_vec(b, comp, 8);
} else if (desc_type == AC_DESC_SAMPLER && tex->op == nir_texop_tg4) {
} else if (desc_type == AC_DESC_SAMPLER && tex->op == nir_texop_tg4 && !state->conformant_trunc_coord) {
nir_ssa_def *comp[4];
for (unsigned i = 0; i < 4; i++)
comp[i] = nir_channel(b, desc, i);
@ -507,6 +509,7 @@ radv_nir_apply_pipeline_layout(nir_shader *shader, struct radv_device *device,
.address32_hi = device->physical_device->rad_info.address32_hi,
.disable_aniso_single_level = device->instance->disable_aniso_single_level,
.has_image_load_dcc_bug = device->physical_device->rad_info.has_image_load_dcc_bug,
.conformant_trunc_coord = device->physical_device->rad_info.conformant_trunc_coord,
.args = args,
.info = info,
.pipeline_layout = layout,