diff options
| author | Chad Versace <[email protected]> | 2019-02-01 17:08:51 -0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2019-03-11 10:02:13 -0700 |
| commit | 6cb5fd0d7163a2430f14686faad037912f18b557 (patch) | |
| tree | 8b3a7ab1ebc43dfe36b8f079c24e5d1b4d489c58 /src/freedreno/vulkan/tu_image.c | |
| parent | 4f863dc0f72719603a6fd60a62a1d619ee2696af (diff) | |
turnip: Use Vulkan 1.1 names instead of KHR
That is, drop KHR from all tokens that were promoted to Vulkan 1.1.
The consistency makes ctags more useful (it now jumps directly to the
real definitions in vulkan_core.h instead of the typedefs); and it makes
the code slightly less verbose.
Diffstat (limited to 'src/freedreno/vulkan/tu_image.c')
| -rw-r--r-- | src/freedreno/vulkan/tu_image.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c index 0a4bb871284..8c91ea504be 100644 --- a/src/freedreno/vulkan/tu_image.c +++ b/src/freedreno/vulkan/tu_image.c @@ -161,7 +161,7 @@ tu_image_create(VkDevice _device, if (pCreateInfo->sharingMode == VK_SHARING_MODE_CONCURRENT) { for (uint32_t i = 0; i < pCreateInfo->queueFamilyIndexCount; ++i) if (pCreateInfo->pQueueFamilyIndices[i] == - VK_QUEUE_FAMILY_EXTERNAL_KHR) + VK_QUEUE_FAMILY_EXTERNAL) image->queue_family_mask |= (1u << TU_MAX_QUEUE_FAMILIES) - 1u; else image->queue_family_mask |= @@ -170,7 +170,7 @@ tu_image_create(VkDevice _device, image->shareable = vk_find_struct_const(pCreateInfo->pNext, - EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR) != NULL; + EXTERNAL_MEMORY_IMAGE_CREATE_INFO) != NULL; image->tile_mode = pCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ? 3 : 0; setup_slices(image, pCreateInfo); @@ -230,7 +230,7 @@ tu_image_queue_family_mask(const struct tu_image *image, { if (!image->exclusive) return image->queue_family_mask; - if (family == VK_QUEUE_FAMILY_EXTERNAL_KHR) + if (family == VK_QUEUE_FAMILY_EXTERNAL) return (1u << TU_MAX_QUEUE_FAMILIES) - 1u; if (family == VK_QUEUE_FAMILY_IGNORED) return 1u << queue_family; |