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

anv/lower_ycbcr: Use the binding array size for bounds checks

Browse source 
Because lower_ycbcr gets called before apply_pipeline_layout, the
indices are all logical and the binding layout HW size is actually too
big for the bounds check.  We should just use the regular logical array
size instead.

Fixes: f3e91e78a3 "anv: add nir lowering pass for ycbcr textures"
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
(cherry picked from commit 320dacb0a0)
This commit is contained in:
Jason Ekstrand 2018-08-20 16:59:38 +01:00 • committed by Dylan Baker
parent 33acfb0780
commit 5a90cc132b
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/intel/vulkan/anv_nir_lower_ycbcr_textures.c
View file

@ -337,18 +337,16 @@ try_lower_tex_ycbcr(struct anv_pipeline_layout *layout,
if (binding->immutable_samplers == NULL)
return false;
unsigned texture_index = tex->texture_index;
assert(tex->texture_index == 0);
unsigned array_index = 0;
if (tex->texture->deref.child) {
assert(tex->texture->deref.child->deref_type == nir_deref_type_array);
nir_deref_array *deref_array = nir_deref_as_array(tex->texture->deref.child);
if (deref_array->deref_array_type != nir_deref_array_type_direct)
return false;
size_t hw_binding_size =
anv_descriptor_set_binding_layout_get_hw_size(binding);
texture_index += MIN2(deref_array->base_offset, hw_binding_size - 1);
array_index = MIN2(deref_array->base_offset, binding->array_size - 1);
}
const struct anv_sampler *sampler =
binding->immutable_samplers[texture_index];
const struct anv_sampler *sampler = binding->immutable_samplers[array_index];
if (sampler->conversion == NULL)
return false;