Mesa (main): dzn: fixup indent
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 21 11:31:15 UTC 2022
Module: Mesa
Branch: main
Commit: 85d0d3fede5f140debbae1790777088a6ee7a1d7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85d0d3fede5f140debbae1790777088a6ee7a1d7
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Wed Apr 20 12:50:14 2022 +0200
dzn: fixup indent
This seems to be all tab-indents we have in our code-base.
Acked-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16076>
---
src/microsoft/vulkan/dzn_cmd_buffer.c | 2 +-
src/microsoft/vulkan/dzn_descriptor_set.c | 6 +++---
src/microsoft/vulkan/dzn_device.c | 8 ++++----
src/microsoft/vulkan/dzn_image.c | 6 +++---
src/microsoft/vulkan/dzn_nir.c | 22 +++++++++++-----------
src/microsoft/vulkan/dzn_pipeline.c | 2 +-
src/microsoft/vulkan/dzn_wsi.c | 2 +-
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/microsoft/vulkan/dzn_cmd_buffer.c b/src/microsoft/vulkan/dzn_cmd_buffer.c
index fa4c9f55399..cb50daad21d 100644
--- a/src/microsoft/vulkan/dzn_cmd_buffer.c
+++ b/src/microsoft/vulkan/dzn_cmd_buffer.c
@@ -4115,7 +4115,7 @@ dzn_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer,
qpool->collect_buffer,
dzn_query_pool_get_availability_offset(qpool, firstQuery + q),
step);
- }
+ }
dstOffset += stride;
}
diff --git a/src/microsoft/vulkan/dzn_descriptor_set.c b/src/microsoft/vulkan/dzn_descriptor_set.c
index 4d1e186b586..0813c592e89 100644
--- a/src/microsoft/vulkan/dzn_descriptor_set.c
+++ b/src/microsoft/vulkan/dzn_descriptor_set.c
@@ -302,7 +302,7 @@ dzn_descriptor_set_layout_create(struct dzn_device *device,
desc->ShaderRegister = binfos[binding].base_shader_register;
desc->ShaderVisibility = translate_desc_visibility(ordered_bindings[i].stageFlags);
static_sampler_idx++;
- } else {
+ } else {
has_static_sampler = false;
}
}
@@ -1739,7 +1739,7 @@ dzn_descriptor_set_write(const VkWriteDescriptorSet *pDescriptorWrite)
pDescriptorWrite->descriptorType,
dzn_buffer_from_handle(binfo->buffer),
binfo->range, binfo->offset
- };
+ };
if (desc.buffer)
dzn_descriptor_set_ptr_write_dynamic_buffer_desc(set, &ptr, &desc);
@@ -1841,7 +1841,7 @@ dzn_descriptor_set_copy(const VkCopyDescriptorSet *pDescriptorCopy)
&src_set->pool->heaps[type],
src_set->heap_offsets[type] + src_heap_offset,
count);
- }
+ }
mtx_unlock(&dst_set->pool->defragment_lock);
mtx_unlock(&src_set->pool->defragment_lock);
}
diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
index 8ae6cab1a6d..9782f77cb22 100644
--- a/src/microsoft/vulkan/dzn_device.c
+++ b/src/microsoft/vulkan/dzn_device.c
@@ -910,7 +910,7 @@ dzn_instance_add_physical_device(struct dzn_instance *instance,
!(desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE))
return VK_SUCCESS;
- return dzn_physical_device_create(instance, adapter, &desc);
+ return dzn_physical_device_create(instance, adapter, &desc);
}
VKAPI_ATTR VkResult VKAPI_CALL
@@ -955,8 +955,8 @@ dzn_EnumeratePhysicalDevices(VkInstance inst,
VKAPI_ATTR VkResult VKAPI_CALL
dzn_EnumerateInstanceVersion(uint32_t *pApiVersion)
{
- *pApiVersion = DZN_API_VERSION;
- return VK_SUCCESS;
+ *pApiVersion = DZN_API_VERSION;
+ return VK_SUCCESS;
}
static bool
@@ -1171,7 +1171,7 @@ dzn_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
}
default:
dzn_debug_ignored_stype(ext->sType);
- break;
+ break;
}
}
}
diff --git a/src/microsoft/vulkan/dzn_image.c b/src/microsoft/vulkan/dzn_image.c
index 7c2bcd2d741..67f181a10bb 100644
--- a/src/microsoft/vulkan/dzn_image.c
+++ b/src/microsoft/vulkan/dzn_image.c
@@ -386,9 +386,9 @@ dzn_image_get_dsv_desc(const struct dzn_image *image,
case VK_IMAGE_TYPE_2D:
if (image->vk.array_layers > 1) {
dsv_desc.ViewDimension =
- image->vk.samples > 1 ?
- D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY :
- D3D12_DSV_DIMENSION_TEXTURE2DARRAY;
+ image->vk.samples > 1 ?
+ D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY :
+ D3D12_DSV_DIMENSION_TEXTURE2DARRAY;
} else {
dsv_desc.ViewDimension =
image->vk.samples > 1 ?
diff --git a/src/microsoft/vulkan/dzn_nir.c b/src/microsoft/vulkan/dzn_nir.c
index 6bac1ca9182..d432731eb84 100644
--- a/src/microsoft/vulkan/dzn_nir.c
+++ b/src/microsoft/vulkan/dzn_nir.c
@@ -66,10 +66,10 @@ dzn_nir_create_bo_desc(nir_builder *b,
nir_vulkan_resource_index(b,
nir_address_format_num_components(addr_format),
nir_address_format_bit_size(addr_format),
- nir_imm_int(b, 0),
- .desc_set = desc_set,
- .binding = binding,
- .desc_type = desc_type);
+ nir_imm_int(b, 0),
+ .desc_set = desc_set,
+ .binding = binding,
+ .desc_type = desc_type);
nir_ssa_def *desc =
nir_load_vulkan_descriptor(b,
@@ -182,8 +182,8 @@ dzn_nir_indirect_draw_shader(enum dzn_indirect_draw_type type)
triangle_fan_index_buf_addr_hi,
nir_channel(&b, draw_info1, 2),
triangle_count,
- nir_imm_int(&b, 1),
- nir_imm_int(&b, 1),
+ nir_imm_int(&b, 1),
+ nir_imm_int(&b, 1),
};
assert(sizeof(struct dzn_indirect_triangle_fan_rewrite_index_exec_params) == (ARRAY_SIZE(triangle_fan_exec_vals) * 4));
@@ -429,11 +429,11 @@ dzn_nir_blit_fs(const struct dzn_nir_blit_info *info)
for (unsigned s = 0; s < nsamples; s++) {
nir_tex_instr *tex = nir_tex_instr_create(b.shader, 4);
- tex->op = nir_texop_txf_ms;
- tex->dest_type = nir_out_type;
- tex->texture_index = 0;
- tex->is_array = info->src_is_array;
- tex->sampler_dim = info->sampler_dim;
+ tex->op = nir_texop_txf_ms;
+ tex->dest_type = nir_out_type;
+ tex->texture_index = 0;
+ tex->is_array = info->src_is_array;
+ tex->sampler_dim = info->sampler_dim;
tex->src[0].src_type = nir_tex_src_coord;
tex->src[0].src = nir_src_for_ssa(nir_f2i32(&b, coord));
diff --git a/src/microsoft/vulkan/dzn_pipeline.c b/src/microsoft/vulkan/dzn_pipeline.c
index 95a3d490d68..9fc175e34f7 100644
--- a/src/microsoft/vulkan/dzn_pipeline.c
+++ b/src/microsoft/vulkan/dzn_pipeline.c
@@ -851,7 +851,7 @@ dzn_graphics_pipeline_create(struct dzn_device *device,
desc.RTVFormats[i] =
dzn_image_get_dxgi_format(attachment->format,
- VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
+ VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
VK_IMAGE_ASPECT_COLOR_BIT);
}
diff --git a/src/microsoft/vulkan/dzn_wsi.c b/src/microsoft/vulkan/dzn_wsi.c
index 1cb95ef0a00..8c3ccf07fbc 100644
--- a/src/microsoft/vulkan/dzn_wsi.c
+++ b/src/microsoft/vulkan/dzn_wsi.c
@@ -35,7 +35,7 @@ void
dzn_wsi_finish(struct dzn_physical_device *physical_device)
{
wsi_device_finish(&physical_device->wsi_device,
- &physical_device->vk.instance->alloc);
+ &physical_device->vk.instance->alloc);
}
VkResult
More information about the mesa-commit
mailing list