diff options
| author | 2020-07-16 18:24:26 -0400 | |
|---|---|---|
| committer | 2020-07-16 18:24:26 -0400 | |
| commit | 75c00c3cb07089c4aad6297cda144b33a0209be0 (patch) | |
| tree | d30a79291b1d7fd12a337a4f1c77cc48fdb90deb /src | |
| parent | vk_descriptor_pool: Make use of designated initializers where applicable (diff) | |
| download | yuzu-75c00c3cb07089c4aad6297cda144b33a0209be0.tar.gz yuzu-75c00c3cb07089c4aad6297cda144b33a0209be0.tar.xz yuzu-75c00c3cb07089c4aad6297cda144b33a0209be0.zip | |
vk_image: Make use of designated initializers where applicable
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_image.cpp | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/src/video_core/renderer_vulkan/vk_image.cpp b/src/video_core/renderer_vulkan/vk_image.cpp index 9bceb3861..1c418ea17 100644 --- a/src/video_core/renderer_vulkan/vk_image.cpp +++ b/src/video_core/renderer_vulkan/vk_image.cpp | |||
| @@ -102,21 +102,29 @@ bool VKImage::HasChanged(u32 base_layer, u32 num_layers, u32 base_level, u32 num | |||
| 102 | 102 | ||
| 103 | void VKImage::CreatePresentView() { | 103 | void VKImage::CreatePresentView() { |
| 104 | // Image type has to be 2D to be presented. | 104 | // Image type has to be 2D to be presented. |
| 105 | VkImageViewCreateInfo image_view_ci; | 105 | present_view = device.GetLogical().CreateImageView({ |
| 106 | image_view_ci.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; | 106 | .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, |
| 107 | image_view_ci.pNext = nullptr; | 107 | .pNext = nullptr, |
| 108 | image_view_ci.flags = 0; | 108 | .flags = 0, |
| 109 | image_view_ci.image = *image; | 109 | .image = *image, |
| 110 | image_view_ci.viewType = VK_IMAGE_VIEW_TYPE_2D; | 110 | .viewType = VK_IMAGE_VIEW_TYPE_2D, |
| 111 | image_view_ci.format = format; | 111 | .format = format, |
| 112 | image_view_ci.components = {VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY, | 112 | .components = |
| 113 | VK_COMPONENT_SWIZZLE_IDENTITY, VK_COMPONENT_SWIZZLE_IDENTITY}; | 113 | { |
| 114 | image_view_ci.subresourceRange.aspectMask = aspect_mask; | 114 | .r = VK_COMPONENT_SWIZZLE_IDENTITY, |
| 115 | image_view_ci.subresourceRange.baseMipLevel = 0; | 115 | .g = VK_COMPONENT_SWIZZLE_IDENTITY, |
| 116 | image_view_ci.subresourceRange.levelCount = 1; | 116 | .b = VK_COMPONENT_SWIZZLE_IDENTITY, |
| 117 | image_view_ci.subresourceRange.baseArrayLayer = 0; | 117 | .a = VK_COMPONENT_SWIZZLE_IDENTITY, |
| 118 | image_view_ci.subresourceRange.layerCount = 1; | 118 | }, |
| 119 | present_view = device.GetLogical().CreateImageView(image_view_ci); | 119 | .subresourceRange = |
| 120 | { | ||
| 121 | .aspectMask = aspect_mask, | ||
| 122 | .baseMipLevel = 0, | ||
| 123 | .levelCount = 1, | ||
| 124 | .baseArrayLayer = 0, | ||
| 125 | .layerCount = 1, | ||
| 126 | }, | ||
| 127 | }); | ||
| 120 | } | 128 | } |
| 121 | 129 | ||
| 122 | VKImage::SubrangeState& VKImage::GetSubrangeState(u32 layer, u32 level) noexcept { | 130 | VKImage::SubrangeState& VKImage::GetSubrangeState(u32 layer, u32 level) noexcept { |