Mesa (master): zink: fixup bad indentation
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Apr 27 08:22:12 UTC 2021
Module: Mesa
Branch: master
Commit: bc3625f5a2e4fc5dc5b1f02448661b42ac5fdf57
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc3625f5a2e4fc5dc5b1f02448661b42ac5fdf57
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Wed Apr 21 16:08:41 2021 +0200
zink: fixup bad indentation
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10466>
---
src/gallium/drivers/zink/zink_descriptors.c | 80 ++++++++++++++---------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c
index e2da0fa9d65..f647b118d77 100644
--- a/src/gallium/drivers/zink/zink_descriptors.c
+++ b/src/gallium/drivers/zink/zink_descriptors.c
@@ -971,46 +971,46 @@ handle_image_descriptor(struct zink_screen *screen, struct zink_resource *res, e
struct zink_sampler_state *sampler,
VkImageView imageview, VkBufferView bufferview, bool do_set)
{
- if (!res) {
- /* if we're hitting this assert often, we can probably just throw a junk buffer in since
- * the results of this codepath are undefined in ARB_texture_buffer_object spec
- */
- assert(screen->info.rb2_feats.nullDescriptor);
-
- switch (vktype) {
- case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
- case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
- *buffer_info = VK_NULL_HANDLE;
- if (do_set)
- wd->pTexelBufferView = buffer_info;
- ++(*num_buffer_info);
- break;
- case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
- case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
- image_info->imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
- image_info->imageView = VK_NULL_HANDLE;
- image_info->sampler = sampler ? sampler->sampler : VK_NULL_HANDLE;
- if (do_set)
- wd->pImageInfo = image_info;
- ++(*num_image_info);
- break;
- default:
- unreachable("unknown descriptor type");
- }
- } else if (res->base.b.target != PIPE_BUFFER) {
- assert(layout != VK_IMAGE_LAYOUT_UNDEFINED);
- image_info->imageLayout = layout;
- image_info->imageView = imageview;
- image_info->sampler = sampler ? sampler->sampler : VK_NULL_HANDLE;
- if (do_set)
- wd->pImageInfo = image_info;
- ++(*num_image_info);
- } else {
- if (do_set)
- wd->pTexelBufferView = buffer_info;
- *buffer_info = bufferview;
- ++(*num_buffer_info);
- }
+ if (!res) {
+ /* if we're hitting this assert often, we can probably just throw a junk buffer in since
+ * the results of this codepath are undefined in ARB_texture_buffer_object spec
+ */
+ assert(screen->info.rb2_feats.nullDescriptor);
+
+ switch (vktype) {
+ case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
+ case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
+ *buffer_info = VK_NULL_HANDLE;
+ if (do_set)
+ wd->pTexelBufferView = buffer_info;
+ ++(*num_buffer_info);
+ break;
+ case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
+ case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
+ image_info->imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+ image_info->imageView = VK_NULL_HANDLE;
+ image_info->sampler = sampler ? sampler->sampler : VK_NULL_HANDLE;
+ if (do_set)
+ wd->pImageInfo = image_info;
+ ++(*num_image_info);
+ break;
+ default:
+ unreachable("unknown descriptor type");
+ }
+ } else if (res->base.b.target != PIPE_BUFFER) {
+ assert(layout != VK_IMAGE_LAYOUT_UNDEFINED);
+ image_info->imageLayout = layout;
+ image_info->imageView = imageview;
+ image_info->sampler = sampler ? sampler->sampler : VK_NULL_HANDLE;
+ if (do_set)
+ wd->pImageInfo = image_info;
+ ++(*num_image_info);
+ } else {
+ if (do_set)
+ wd->pTexelBufferView = buffer_info;
+ *buffer_info = bufferview;
+ ++(*num_buffer_info);
+ }
}
static void
More information about the mesa-commit
mailing list