OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Rework arguments to anv_descriptor_set_write_*

Browse Source 
Make them all take a device followed by a set.  This is consistent
with how the actual Vulkan entrypoint parameters are laid out.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand
2018-11-21 18:00:56 -06:00
parent 5b7a9e7398
commit 8c6d410a50
3 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/intel/vulkan/anv_cmd_buffer.c
View File

@@ -1025,7 +1025,7 @@ void anv_CmdPushDescriptorSetKHR(
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
for (uint32_t j = 0; j < write->descriptorCount; j++) { for (uint32_t j = 0; j < write->descriptorCount; j++) {
anv_descriptor_set_write_image_view(set, &cmd_buffer->device->info, anv_descriptor_set_write_image_view(cmd_buffer->device, set,
write->pImageInfo + j, write->pImageInfo + j,
write->descriptorType, write->descriptorType,
write->dstBinding, write->dstBinding,
@@ -1039,7 +1039,7 @@ void anv_CmdPushDescriptorSetKHR(
ANV_FROM_HANDLE(anv_buffer_view, bview, ANV_FROM_HANDLE(anv_buffer_view, bview,
write->pTexelBufferView[j]); write->pTexelBufferView[j]);
anv_descriptor_set_write_buffer_view(set, anv_descriptor_set_write_buffer_view(cmd_buffer->device, set,
write->descriptorType, write->descriptorType,
bview, bview,
write->dstBinding, write->dstBinding,
@@ -1056,8 +1056,7 @@ void anv_CmdPushDescriptorSetKHR(
ANV_FROM_HANDLE(anv_buffer, buffer, write->pBufferInfo[j].buffer); ANV_FROM_HANDLE(anv_buffer, buffer, write->pBufferInfo[j].buffer);
assert(buffer); assert(buffer);
anv_descriptor_set_write_buffer(set, anv_descriptor_set_write_buffer(cmd_buffer->device, set,
cmd_buffer->device,
&cmd_buffer->surface_state_stream, &cmd_buffer->surface_state_stream,
write->descriptorType, write->descriptorType,
buffer, buffer,
@@ -1106,8 +1105,7 @@ void anv_CmdPushDescriptorSetWithTemplateKHR(
set->buffer_count = set_layout->buffer_count; set->buffer_count = set_layout->buffer_count;
set->buffer_views = push_set->buffer_views; set->buffer_views = push_set->buffer_views;
anv_descriptor_set_write_template(set, anv_descriptor_set_write_template(cmd_buffer->device, set,
cmd_buffer->device,
&cmd_buffer->surface_state_stream, &cmd_buffer->surface_state_stream,
template, template,
pData); pData);

31
src/intel/vulkan/anv_descriptor_set.c
View File

@@ -712,8 +712,8 @@ VkResult anv_FreeDescriptorSets(
} }
void void
anv_descriptor_set_write_image_view(struct anv_descriptor_set *set, anv_descriptor_set_write_image_view(struct anv_device *device,
const struct gen_device_info * const devinfo, struct anv_descriptor_set *set,
const VkDescriptorImageInfo * const info, const VkDescriptorImageInfo * const info,
VkDescriptorType type, VkDescriptorType type,
uint32_t binding, uint32_t binding,
@@ -764,7 +764,8 @@ anv_descriptor_set_write_image_view(struct anv_descriptor_set *set,
} }
void void
anv_descriptor_set_write_buffer_view(struct anv_descriptor_set *set, anv_descriptor_set_write_buffer_view(struct anv_device *device,
struct anv_descriptor_set *set,
VkDescriptorType type, VkDescriptorType type,
struct anv_buffer_view *buffer_view, struct anv_buffer_view *buffer_view,
uint32_t binding, uint32_t binding,
@@ -784,8 +785,8 @@ anv_descriptor_set_write_buffer_view(struct anv_descriptor_set *set,
} }
void void
anv_descriptor_set_write_buffer(struct anv_descriptor_set *set, anv_descriptor_set_write_buffer(struct anv_device *device,
struct anv_device *device, struct anv_descriptor_set *set,
struct anv_state_stream *alloc_stream, struct anv_state_stream *alloc_stream,
VkDescriptorType type, VkDescriptorType type,
struct anv_buffer *buffer, struct anv_buffer *buffer,
@@ -855,7 +856,7 @@ void anv_UpdateDescriptorSets(
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
for (uint32_t j = 0; j < write->descriptorCount; j++) { for (uint32_t j = 0; j < write->descriptorCount; j++) {
anv_descriptor_set_write_image_view(set, &device->info, anv_descriptor_set_write_image_view(device, set,
write->pImageInfo + j, write->pImageInfo + j,
write->descriptorType, write->descriptorType,
write->dstBinding, write->dstBinding,
@@ -869,7 +870,7 @@ void anv_UpdateDescriptorSets(
ANV_FROM_HANDLE(anv_buffer_view, bview, ANV_FROM_HANDLE(anv_buffer_view, bview,
write->pTexelBufferView[j]); write->pTexelBufferView[j]);
anv_descriptor_set_write_buffer_view(set, anv_descriptor_set_write_buffer_view(device, set,
write->descriptorType, write->descriptorType,
bview, bview,
write->dstBinding, write->dstBinding,
@@ -886,8 +887,7 @@ void anv_UpdateDescriptorSets(
ANV_FROM_HANDLE(anv_buffer, buffer, write->pBufferInfo[j].buffer); ANV_FROM_HANDLE(anv_buffer, buffer, write->pBufferInfo[j].buffer);
assert(buffer); assert(buffer);
anv_descriptor_set_write_buffer(set, anv_descriptor_set_write_buffer(device, set,
device,
NULL, NULL,
write->descriptorType, write->descriptorType,
buffer, buffer,
@@ -930,8 +930,8 @@ void anv_UpdateDescriptorSets(
*/ */
void void
anv_descriptor_set_write_template(struct anv_descriptor_set *set, anv_descriptor_set_write_template(struct anv_device *device,
struct anv_device *device, struct anv_descriptor_set *set,
struct anv_state_stream *alloc_stream, struct anv_state_stream *alloc_stream,
const struct anv_descriptor_update_template *template, const struct anv_descriptor_update_template *template,
const void *data) const void *data)
@@ -949,7 +949,7 @@ anv_descriptor_set_write_template(struct anv_descriptor_set *set,
for (uint32_t j = 0; j < entry->array_count; j++) { for (uint32_t j = 0; j < entry->array_count; j++) {
const VkDescriptorImageInfo *info = const VkDescriptorImageInfo *info =
data + entry->offset + j * entry->stride; data + entry->offset + j * entry->stride;
anv_descriptor_set_write_image_view(set, &device->info, anv_descriptor_set_write_image_view(device, set,
info, entry->type, info, entry->type,
entry->binding, entry->binding,
entry->array_element + j); entry->array_element + j);
@@ -963,7 +963,7 @@ anv_descriptor_set_write_template(struct anv_descriptor_set *set,
data + entry->offset + j * entry->stride; data + entry->offset + j * entry->stride;
ANV_FROM_HANDLE(anv_buffer_view, bview, *_bview); ANV_FROM_HANDLE(anv_buffer_view, bview, *_bview);
anv_descriptor_set_write_buffer_view(set, anv_descriptor_set_write_buffer_view(device, set,
entry->type, entry->type,
bview, bview,
entry->binding, entry->binding,
@@ -980,8 +980,7 @@ anv_descriptor_set_write_template(struct anv_descriptor_set *set,
data + entry->offset + j * entry->stride; data + entry->offset + j * entry->stride;
ANV_FROM_HANDLE(anv_buffer, buffer, info->buffer); ANV_FROM_HANDLE(anv_buffer, buffer, info->buffer);
anv_descriptor_set_write_buffer(set, anv_descriptor_set_write_buffer(device, set,
device,
alloc_stream, alloc_stream,
entry->type, entry->type,
buffer, buffer,
@@ -1062,5 +1061,5 @@ void anv_UpdateDescriptorSetWithTemplate(
ANV_FROM_HANDLE(anv_descriptor_update_template, template, ANV_FROM_HANDLE(anv_descriptor_update_template, template,
descriptorUpdateTemplate); descriptorUpdateTemplate);
anv_descriptor_set_write_template(set, device, NULL, template, pData); anv_descriptor_set_write_template(device, set, NULL, template, pData);
} }

15
src/intel/vulkan/anv_private.h
View File

@@ -1677,23 +1677,24 @@ size_t
anv_descriptor_set_layout_size(const struct anv_descriptor_set_layout *layout); anv_descriptor_set_layout_size(const struct anv_descriptor_set_layout *layout);
void void
anv_descriptor_set_write_image_view(struct anv_descriptor_set *set, anv_descriptor_set_write_image_view(struct anv_device *device,
const struct gen_device_info * const devinfo, struct anv_descriptor_set *set,
const VkDescriptorImageInfo * const info, const VkDescriptorImageInfo * const info,
VkDescriptorType type, VkDescriptorType type,
uint32_t binding, uint32_t binding,
uint32_t element); uint32_t element);
void void
anv_descriptor_set_write_buffer_view(struct anv_descriptor_set *set, anv_descriptor_set_write_buffer_view(struct anv_device *device,
struct anv_descriptor_set *set,
VkDescriptorType type, VkDescriptorType type,
struct anv_buffer_view *buffer_view, struct anv_buffer_view *buffer_view,
uint32_t binding, uint32_t binding,
uint32_t element); uint32_t element);
void void
anv_descriptor_set_write_buffer(struct anv_descriptor_set *set, anv_descriptor_set_write_buffer(struct anv_device *device,
struct anv_device *device, struct anv_descriptor_set *set,
struct anv_state_stream *alloc_stream, struct anv_state_stream *alloc_stream,
VkDescriptorType type, VkDescriptorType type,
struct anv_buffer *buffer, struct anv_buffer *buffer,
@@ -1703,8 +1704,8 @@ anv_descriptor_set_write_buffer(struct anv_descriptor_set *set,
VkDeviceSize range); VkDeviceSize range);
void void
anv_descriptor_set_write_template(struct anv_descriptor_set *set, anv_descriptor_set_write_template(struct anv_device *device,
struct anv_device *device, struct anv_descriptor_set *set,
struct anv_state_stream *alloc_stream, struct anv_state_stream *alloc_stream,
const struct anv_descriptor_update_template *template, const struct anv_descriptor_update_template *template,
const void *data); const void *data);