diff --git a/.pick_status.json b/.pick_status.json index 47ac29def51..482d2ce69d6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -574,7 +574,7 @@ "description": "anv: Fix descriptor sampler offsets assignment", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7c76125db25db9bdf5521baf7c848ccd4bd37b5f", "notes": null diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index 2ef884e5382..c6420ff4c8a 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -821,7 +821,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer, assert((offset & ~ANV_DESCRIPTOR_SET_OFFSET_MASK) == 0); push->desc_surface_offsets[set_index] &= ~ANV_DESCRIPTOR_SET_OFFSET_MASK; push->desc_surface_offsets[set_index] |= offset; - push->desc_sampler_offsets[set_index] |= + push->desc_sampler_offsets[set_index] = anv_address_physical(set->desc_sampler_addr) - cmd_buffer->device->physical->va.dynamic_state_pool.addr;