From c0f2a19aeebf9549420709c53e9acfccd895e9c3 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 11 Dec 2020 18:41:39 -0800 Subject: [PATCH] zink: Fix typos. Signed-off-by: Vinson Lee Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_query.c | 2 +- src/gallium/drivers/zink/zink_resource.c | 6 +++--- src/gallium/drivers/zink/zink_resource.h | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index 0d018c0f744..f75dcce2b5a 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -290,7 +290,7 @@ get_query_result(struct pipe_context *pctx, break; default: - debug_printf("unhangled query type: %s\n", + debug_printf("unhandled query type: %s\n", util_str_query_type(query->type, true)); unreachable("unexpected query type"); } diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 7d37b52fc97..67ebf61f18d 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -248,7 +248,7 @@ resource_create(struct pipe_screen *pscreen, return NULL; } - res->optimial_tiling = ici.tiling != VK_IMAGE_TILING_LINEAR; + res->optimal_tiling = ici.tiling != VK_IMAGE_TILING_LINEAR; res->aspect = aspect_from_format(templ->format); vkGetImageMemoryRequirements(screen->dev, res->image, &reqs); @@ -551,7 +551,7 @@ zink_transfer_map(struct pipe_context *pctx, trans->base.layer_stride = 0; ptr = ((uint8_t *)ptr) + box->x; } else { - if (res->optimial_tiling || ((res->base.usage != PIPE_USAGE_STAGING))) { + if (res->optimal_tiling || ((res->base.usage != PIPE_USAGE_STAGING))) { enum pipe_format format = pres->format; if (usage & PIPE_MAP_DEPTH_ONLY) format = util_format_get_depth_only(pres->format); @@ -598,7 +598,7 @@ zink_transfer_map(struct pipe_context *pctx, return NULL; } else { - assert(!res->optimial_tiling); + assert(!res->optimal_tiling); if (batch_uses >= ZINK_RESOURCE_ACCESS_WRITE) zink_fence_wait(pctx); VkResult result = vkMapMemory(screen->dev, res->mem, res->offset, res->size, 0, &ptr); diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h index 04e8d8c7395..572a3ecc363 100644 --- a/src/gallium/drivers/zink/zink_resource.h +++ b/src/gallium/drivers/zink/zink_resource.h @@ -47,7 +47,7 @@ struct zink_resource { VkImage image; VkImageLayout layout; VkImageAspectFlags aspect; - bool optimial_tiling; + bool optimal_tiling; }; }; VkDeviceMemory mem; diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 678074010fc..6e474ea9d2d 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -905,7 +905,7 @@ zink_internal_setup_moltenvk(struct zink_screen *screen) VkResult res = (*screen->vk_GetMoltenVKConfigurationMVK)(screen->instance, &molten_config, &molten_config_size); if (res == VK_SUCCESS || res == VK_INCOMPLETE) { // Needed to allow MoltenVK to accept VkImageView swizzles. - // Encounted when using VK_FORMAT_R8G8_UNORM + // Encountered when using VK_FORMAT_R8G8_UNORM molten_config.fullImageViewSwizzle = VK_TRUE; (*screen->vk_SetMoltenVKConfigurationMVK)(screen->instance, &molten_config, &molten_config_size); }