diff options
| author | Samuel Pitoiset <[email protected]> | 2019-10-15 10:15:04 +0200 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2020-01-15 08:42:25 -0600 |
| commit | 83d1773a5784d3900294108a99111748322331f5 (patch) | |
| tree | b1d839583c272940bc07a5c9e5c46cc56bed23f0 | |
| parent | b3bdb4e6ff82940b4bc78a1cafb5718fe6365a1e (diff) | |
radv: update VK_KHR_imageless_framebuffer for Vulkan 1.2
Promoted to Vulkan 1.2 with the KHR suffix omitted.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 4 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index d61befcca89..20ba975052b 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3152,11 +3152,11 @@ radv_cmd_state_setup_attachments(struct radv_cmd_buffer *cmd_buffer, const VkRenderPassBeginInfo *info) { struct radv_cmd_state *state = &cmd_buffer->state; - const struct VkRenderPassAttachmentBeginInfoKHR *attachment_info = NULL; + const struct VkRenderPassAttachmentBeginInfo *attachment_info = NULL; if (info) { attachment_info = vk_find_struct_const(info->pNext, - RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR); + RENDER_PASS_ATTACHMENT_BEGIN_INFO); } diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 303f2ff8cb4..99da0dd368e 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1146,9 +1146,9 @@ void radv_GetPhysicalDeviceFeatures2( features->indexTypeUint8 = pdevice->rad_info.chip_class >= GFX8; break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES_KHR: { - VkPhysicalDeviceImagelessFramebufferFeaturesKHR *features = - (VkPhysicalDeviceImagelessFramebufferFeaturesKHR *)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES: { + VkPhysicalDeviceImagelessFramebufferFeatures *features = + (VkPhysicalDeviceImagelessFramebufferFeatures *)ext; features->imagelessFramebuffer = true; break; } @@ -6498,9 +6498,9 @@ VkResult radv_CreateFramebuffer( { RADV_FROM_HANDLE(radv_device, device, _device); struct radv_framebuffer *framebuffer; - const VkFramebufferAttachmentsCreateInfoKHR *imageless_create_info = + const VkFramebufferAttachmentsCreateInfo *imageless_create_info = vk_find_struct_const(pCreateInfo->pNext, - FRAMEBUFFER_ATTACHMENTS_CREATE_INFO_KHR); + FRAMEBUFFER_ATTACHMENTS_CREATE_INFO); assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO); @@ -6518,7 +6518,7 @@ VkResult radv_CreateFramebuffer( framebuffer->layers = pCreateInfo->layers; if (imageless_create_info) { for (unsigned i = 0; i < imageless_create_info->attachmentImageInfoCount; ++i) { - const VkFramebufferAttachmentImageInfoKHR *attachment = + const VkFramebufferAttachmentImageInfo *attachment = imageless_create_info->pAttachmentImageInfos + i; framebuffer->width = MIN2(framebuffer->width, attachment->width); framebuffer->height = MIN2(framebuffer->height, attachment->height); |