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

anv/descriptor_set: Store aux usage of sampled image descriptors

Browse source 
v2: Rebase onto latest changes
v3: Account for NULL image_view in aux_usage assignment

Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Nanley Chery 2017-01-31 11:13:44 -08:00
parent efc2222323
commit 5408d3fd05
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/intel/vulkan/anv_cmd_buffer.c
View file

@ -855,10 +855,9 @@ void anv_CmdPushDescriptorSetKHR(
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
for (uint32_t j = 0; j < write->descriptorCount; j++) {
anv_descriptor_set_write_image_view(set,
anv_descriptor_set_write_image_view(set, &cmd_buffer->device->info,
write->pImageInfo + j,
write->descriptorType,
write->pImageInfo[j].imageView,
write->pImageInfo[j].sampler,
write->dstBinding,
write->dstArrayElement + j);
}

27
src/intel/vulkan/anv_descriptor_set.c
View file

@ -571,9 +571,9 @@ VkResult anv_FreeDescriptorSets(
void
anv_descriptor_set_write_image_view(struct anv_descriptor_set *set,
const struct gen_device_info * const devinfo,
const VkDescriptorImageInfo * const info,
VkDescriptorType type,
VkImageView _image_view,
VkSampler _sampler,
uint32_t binding,
uint32_t element)
{
@ -588,18 +588,18 @@ anv_descriptor_set_write_image_view(struct anv_descriptor_set *set,
switch (type) {
case VK_DESCRIPTOR_TYPE_SAMPLER:
sampler = anv_sampler_from_handle(_sampler);
sampler = anv_sampler_from_handle(info->sampler);
break;
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
image_view = anv_image_view_from_handle(_image_view);
sampler = anv_sampler_from_handle(_sampler);
image_view = anv_image_view_from_handle(info->imageView);
sampler = anv_sampler_from_handle(info->sampler);
break;
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
image_view = anv_image_view_from_handle(_image_view);
image_view = anv_image_view_from_handle(info->imageView);
break;
default:
@ -617,6 +617,10 @@ anv_descriptor_set_write_image_view(struct anv_descriptor_set *set,
.type = type,
.image_view = image_view,
.sampler = sampler,
.aux_usage = image_view == NULL ? ISL_AUX_USAGE_NONE :
anv_layout_to_aux_usage(devinfo, image_view->image,
image_view->aspect_mask,
info->imageLayout),
};
}
@ -710,10 +714,9 @@ void anv_UpdateDescriptorSets(
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
for (uint32_t j = 0; j < write->descriptorCount; j++) {
anv_descriptor_set_write_image_view(set,
anv_descriptor_set_write_image_view(set, &device->info,
write->pImageInfo + j,
write->descriptorType,
write->pImageInfo[j].imageView,
write->pImageInfo[j].sampler,
write->dstBinding,
write->dstArrayElement + j);
}
@ -811,10 +814,8 @@ anv_descriptor_set_write_template(struct anv_descriptor_set *set,
for (uint32_t j = 0; j < entry->array_count; j++) {
const VkDescriptorImageInfo *info =
data + entry->offset + j * entry->stride;
anv_descriptor_set_write_image_view(set,
entry->type,
info->imageView,
info->sampler,
anv_descriptor_set_write_image_view(set, &device->info,
info, entry->type,
entry->binding,
entry->array_element + j);
}

9
src/intel/vulkan/anv_private.h
View file

@ -902,6 +902,11 @@ struct anv_descriptor {
struct {
struct anv_image_view *image_view;
struct anv_sampler *sampler;
/* Used to determine whether or not we need the surface state to have
* the auxiliary buffer enabled.
*/
enum isl_aux_usage aux_usage;
};
struct anv_buffer_view *buffer_view;
@ -995,9 +1000,9 @@ anv_descriptor_set_layout_size(const struct anv_descriptor_set_layout *layout);
void
anv_descriptor_set_write_image_view(struct anv_descriptor_set *set,
const struct gen_device_info * const devinfo,
const VkDescriptorImageInfo * const info,
VkDescriptorType type,
VkImageView _image_view,
VkSampler _sampler,
uint32_t binding,
uint32_t element);