diff options
author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2022-04-06 15:09:09 +0200 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2022-04-19 15:39:48 +0000 |
commit | 3d608de8828c92c286d516f139f270dea7c35e25 (patch) | |
tree | f9b942b5935b7b938232448eaefa2ad8ca67e9e2 | |
parent | 05af6f04344319a9a772dd8046220531598cb6f3 (diff) |
dzn: use c-style initialization
Here's a few cases where we can use C-style initialization up-front,
which reduces the diffs later on.
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15816>
-rw-r--r-- | src/microsoft/vulkan/dzn_cmd_buffer.cpp | 10 | ||||
-rw-r--r-- | src/microsoft/vulkan/dzn_descriptor_set.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.cpp b/src/microsoft/vulkan/dzn_cmd_buffer.cpp index dd1e7ece398..495b0468f7e 100644 --- a/src/microsoft/vulkan/dzn_cmd_buffer.cpp +++ b/src/microsoft/vulkan/dzn_cmd_buffer.cpp @@ -598,7 +598,7 @@ dzn_cmd_buffer_collect_query_ops(struct dzn_cmd_buffer *cmdbuf, uint32_t start, end; BITSET_FOREACH_RANGE(start, end, bitset, nbits) { - struct dzn_cmd_buffer_query_range range { qpool, start, end - start }; + struct dzn_cmd_buffer_query_range range = { qpool, start, end - start }; struct dzn_cmd_buffer_query_range *entry = (struct dzn_cmd_buffer_query_range *) util_dynarray_grow(ops_array, struct dzn_cmd_buffer_query_range, 1); @@ -776,7 +776,7 @@ dzn_cmd_buffer_get_dsv(struct dzn_cmd_buffer *cmdbuf, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { struct dzn_device *device = container_of(cmdbuf->vk.base.device, struct dzn_device, vk); - struct dzn_cmd_buffer_dsv_key key { image, *desc }; + struct dzn_cmd_buffer_dsv_key key = { image, *desc }; struct hash_entry *he = _mesa_hash_table_search(cmdbuf->dsvs.ht, &key); struct dzn_cmd_buffer_dsv_entry *dsve; @@ -806,7 +806,7 @@ dzn_cmd_buffer_get_rtv(struct dzn_cmd_buffer *cmdbuf, const D3D12_RENDER_TARGET_VIEW_DESC *desc) { struct dzn_device *device = container_of(cmdbuf->vk.base.device, struct dzn_device, vk); - struct dzn_cmd_buffer_rtv_key key { image, *desc }; + struct dzn_cmd_buffer_rtv_key key = { image, *desc }; struct hash_entry *he = _mesa_hash_table_search(cmdbuf->rtvs.ht, &key); struct dzn_cmd_buffer_rtv_entry *rtve; @@ -2149,7 +2149,7 @@ dzn_cmd_buffer_attachment_ref_transition(struct dzn_cmd_buffer *cmdbuf, if (att->before == att->during) return; - VkImageSubresourceRange subres { + VkImageSubresourceRange subres = { .aspectMask = att->aspects, .baseMipLevel = iview->vk.base_mip_level, .levelCount = iview->vk.level_count, @@ -2189,7 +2189,7 @@ dzn_cmd_buffer_attachment_transition(struct dzn_cmd_buffer *cmdbuf, if (att->last == att->after) return; - VkImageSubresourceRange subres { + VkImageSubresourceRange subres = { .aspectMask = att->aspects, .baseMipLevel = iview->vk.base_mip_level, .levelCount = iview->vk.level_count, diff --git a/src/microsoft/vulkan/dzn_descriptor_set.cpp b/src/microsoft/vulkan/dzn_descriptor_set.cpp index ff60c20b89a..d15b618e3e3 100644 --- a/src/microsoft/vulkan/dzn_descriptor_set.cpp +++ b/src/microsoft/vulkan/dzn_descriptor_set.cpp @@ -1662,7 +1662,7 @@ dzn_descriptor_set_write(const VkWriteDescriptorSet *pDescriptorWrite) dzn_descriptor_set_ptr_move(set, &ptr, 1)) { assert(dzn_descriptor_set_get_desc_vk_type(set, &ptr) == pDescriptorWrite->descriptorType); const VkDescriptorBufferInfo *binfo = &pDescriptorWrite->pBufferInfo[d]; - struct dzn_buffer_desc desc { + struct dzn_buffer_desc desc = { pDescriptorWrite->descriptorType, dzn_buffer_from_handle(binfo->buffer), binfo->range, binfo->offset @@ -1681,7 +1681,7 @@ dzn_descriptor_set_write(const VkWriteDescriptorSet *pDescriptorWrite) dzn_descriptor_set_ptr_move(set, &ptr, 1)) { assert(dzn_descriptor_set_get_desc_vk_type(set, &ptr) == pDescriptorWrite->descriptorType); const VkDescriptorBufferInfo *binfo = &pDescriptorWrite->pBufferInfo[d]; - struct dzn_buffer_desc desc { + struct dzn_buffer_desc desc = { pDescriptorWrite->descriptorType, dzn_buffer_from_handle(binfo->buffer), binfo->range, binfo->offset |