layers: More usage of vvl::Image getter

Author: spencer-lunarg

layers/best_practices/bp_copy_blit_resolve.cpp

@@ -339,7 +339,7 @@ bool BestPractices::PreCallValidateCmdClearColorImage(VkCommandBuffer commandBuf
                                       VendorSpecificTag(kBPVendorAMD));
     }
     if (VendorCheckEnabled(kBPVendorNVIDIA)) {
-        skip |= ValidateClearColor(commandBuffer, dst_image->create_info.format, *pColor, error_obj.location);
+        skip |= ValidateClearColor(commandBuffer, dst_image->GetFormat(), *pColor, error_obj.location);
     }
 
     return skip;

layers/best_practices/bp_state.cpp

@@ -501,7 +501,7 @@ void CommandBufferSubState::RecordClearColorImage(vvl::Image& image_state, VkIma
     }
 
     if (validator.VendorCheckEnabled(kBPVendorNVIDIA)) {
-        validator.RecordClearColor(image_state.create_info.format, *color_values);
+        validator.RecordClearColor(image_state.GetFormat(), *color_values);
     }
 }
 

layers/core_checks/cc_copy_blit_resolve.cpp

@@ -1274,19 +1274,19 @@ bool CoreChecks::ValidateImageUpdate(const vvl::ImageView& view_state, VkImageLa
         }
     }
 
-    if (vkuFormatIsDepthOrStencil(image_state->create_info.format)) {
+    if (vkuFormatIsDepthOrStencil(image_state->GetFormat())) {
         if (aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) {
             if (aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) {
                 skip |= LogError(
                     "VUID-VkDescriptorImageInfo-imageView-01976", objlist, image_info_loc.dot(Field::imageView),
                     "was created with an image format %s, but the image aspectMask (%s) has both STENCIL and DEPTH aspects set ",
-                    string_VkFormat(image_state->create_info.format), string_VkImageAspectFlags(aspect_mask).c_str());
+                    string_VkFormat(image_state->GetFormat()), string_VkImageAspectFlags(aspect_mask).c_str());
             }
         } else if ((aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) == 0) {
             skip |=
                 LogError("VUID-VkDescriptorImageInfo-imageView-01976", objlist, image_info_loc.dot(Field::imageView),
                          "was created with an image format %s, but the image aspectMask (%s) is missing a STENCIL or DEPTH aspects",
-                         string_VkFormat(image_state->create_info.format), string_VkImageAspectFlags(aspect_mask).c_str());
+                         string_VkFormat(image_state->GetFormat()), string_VkImageAspectFlags(aspect_mask).c_str());
         }
     }
 
@@ -2196,9 +2196,9 @@ bool CoreChecks::VerifyWriteUpdateContents(const vvl::DescriptorSet& dst_set, co
 
                     if (auto sampler_state = Get<vvl::Sampler>(sampler)) {
                         // If there is an immutable sampler then |sampler| isn't used, so the following VU does not apply.
-                        if (vkuFormatIsMultiplane(image_state->create_info.format)) {
+                        if (vkuFormatIsMultiplane(image_state->GetFormat())) {
                             // multiplane formats must be created with mutable format bit
-                            const VkFormat image_format = image_state->create_info.format;
+                            const VkFormat image_format = image_state->GetFormat();
                             if (0 == (image_state->create_info.flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT)) {
                                 const LogObjectList objlist(update.dstSet, image_state->Handle());
                                 skip |= LogError("VUID-VkDescriptorImageInfo-sampler-01564", objlist, write_loc,
@@ -5407,15 +5407,15 @@ bool CoreChecks::PreCallValidateWriteResourceDescriptorsEXT(VkDevice device, uin
                 }
             }
 
-            if (vkuFormatIsDepthOrStencil(image_state->create_info.format)) {
+            if (vkuFormatIsDepthOrStencil(image_state->GetFormat())) {
                 const VkImageAspectFlags aspect_mask = image_view_ci.subresourceRange.aspectMask;
                 if (aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) {
                     if (aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) {
                         skip |= LogError("VUID-VkImageDescriptorInfoEXT-pView-11430", image_view_ci.image,
                                          data_loc.dot(Field::pImage).dot(Field::pView).dot(Field::image),
                                          "is a depth/stencil image (%s), but aspectMask (%s) has both STENCIL and DEPTH aspect "
                                          "set\npResources[%" PRIu32 "].type = %s",
-                                         string_VkFormat(image_state->create_info.format),
+                                         string_VkFormat(image_state->GetFormat()),
                                          string_VkImageAspectFlags(image_view_ci.subresourceRange.aspectMask).c_str(), i,
                                          string_VkDescriptorType(resource.type));
                     }
@@ -5424,7 +5424,7 @@ bool CoreChecks::PreCallValidateWriteResourceDescriptorsEXT(VkDevice device, uin
                                      data_loc.dot(Field::pImage).dot(Field::pView).dot(Field::image),
                                      "is a depth/stencil image (%s), but aspectMask (%s) is missing a STENCIL or DEPTH "
                                      "aspects\npResources[%" PRIu32 "].type = %s",
-                                     string_VkFormat(image_state->create_info.format),
+                                     string_VkFormat(image_state->GetFormat()),
                                      string_VkImageAspectFlags(image_view_ci.subresourceRange.aspectMask).c_str(), i,
                                      string_VkDescriptorType(resource.type));
                 }

layers/core_checks/cc_descriptor.cpp

@@ -311,19 +311,19 @@ bool CoreChecks::HasExternalMemoryImportSupport(const vvl::Image& image, VkExter
     // TODO - Want to use vvl::PnextChainExtract, but would need to cleanup (and test) rest of how we add the other pNext here
     // Note - some pNext structs that can be found in VkImageCreateInfo::pNext are not allowed in VkPhysicalDeviceImageFormatInfo2
     VkImageFormatListCreateInfo format_list = vku::InitStructHelper();
-    if (auto original_format_list = vku::FindStructInPNextChain<VkImageFormatListCreateInfo>(image.create_info.pNext)) {
+    if (auto original_format_list = vku::FindStructInPNextChain<VkImageFormatListCreateInfo>(image.GetPNext())) {
         format_list.pViewFormats = original_format_list->pViewFormats;
         format_list.viewFormatCount = original_format_list->viewFormatCount;
         vvl::PnextChainAdd(&external_info, &format_list);
     }
     VkImageStencilUsageCreateInfo stencil_usage = vku::InitStructHelper();
-    if (auto original_stencil_usage = vku::FindStructInPNextChain<VkImageStencilUsageCreateInfo>(image.create_info.pNext)) {
+    if (auto original_stencil_usage = vku::FindStructInPNextChain<VkImageStencilUsageCreateInfo>(image.GetPNext())) {
         stencil_usage.stencilUsage = original_stencil_usage->stencilUsage;
         vvl::PnextChainAdd(&external_info, &stencil_usage);
     }
     VkPhysicalDeviceImageViewImageFormatInfoEXT image_view_format = vku::InitStructHelper();
     if (auto original_image_view_format =
-            vku::FindStructInPNextChain<VkPhysicalDeviceImageViewImageFormatInfoEXT>(image.create_info.pNext)) {
+            vku::FindStructInPNextChain<VkPhysicalDeviceImageViewImageFormatInfoEXT>(image.GetPNext())) {
         image_view_format.imageViewType = original_image_view_format->imageViewType;
         vvl::PnextChainAdd(&external_info, &image_view_format);
     }
@@ -1187,7 +1187,7 @@ bool CoreChecks::PreCallValidateGetImageMemoryRequirements2(VkDevice device, con
 
     auto image_state = Get<vvl::Image>(pInfo->image);
     ASSERT_AND_RETURN_SKIP(image_state);
-    const VkFormat image_format = image_state->create_info.format;
+    const VkFormat image_format = image_state->GetFormat();
     const VkImageTiling image_tiling = image_state->GetTiling();
     const auto* image_plane_info = vku::FindStructInPNextChain<VkImagePlaneMemoryRequirementsInfo>(pInfo->pNext);
     if (!image_plane_info && image_state->disjoint) {
@@ -1956,7 +1956,7 @@ bool CoreChecks::ValidateBindImageMemory(uint32_t bindInfoCount, const VkBindIma
             if (!image_state || !image_state->disjoint) {
                 continue;
             }
-            const uint32_t total_planes = vkuFormatPlaneCount(image_state->create_info.format);
+            const uint32_t total_planes = vkuFormatPlaneCount(image_state->GetFormat());
             for (uint32_t i = 0; i < total_planes; i++) {
                 if (resource.second[i] == vvl::kNoIndex32) {
                     skip |= LogError("VUID-vkBindImageMemory2-pBindInfos-02858", resource.first, error_obj.location,
@@ -2086,20 +2086,19 @@ bool CoreChecks::ValidateBindImageMemoryResource(const VkBindImageMemoryInfo& bi
         // TODO - Want to use vvl::PnextChainExtract, but would need to cleanup (and test) rest of how we add the other
         // pNext here
         VkImageFormatListCreateInfo format_list = vku::InitStructHelper();
-        if (auto original_format_list = vku::FindStructInPNextChain<VkImageFormatListCreateInfo>(image_state.create_info.pNext)) {
+        if (auto original_format_list = vku::FindStructInPNextChain<VkImageFormatListCreateInfo>(image_state.GetPNext())) {
             format_list.pViewFormats = original_format_list->pViewFormats;
             format_list.viewFormatCount = original_format_list->viewFormatCount;
             vvl::PnextChainAdd(&image_format_info, &format_list);
         }
         VkImageStencilUsageCreateInfo stencil_usage = vku::InitStructHelper();
-        if (auto original_stencil_usage =
-                vku::FindStructInPNextChain<VkImageStencilUsageCreateInfo>(image_state.create_info.pNext)) {
+        if (auto original_stencil_usage = vku::FindStructInPNextChain<VkImageStencilUsageCreateInfo>(image_state.GetPNext())) {
             stencil_usage.stencilUsage = original_stencil_usage->stencilUsage;
             vvl::PnextChainAdd(&image_format_info, &stencil_usage);
         }
         VkPhysicalDeviceImageViewImageFormatInfoEXT image_view_format = vku::InitStructHelper();
         if (auto original_image_view_format =
-                vku::FindStructInPNextChain<VkPhysicalDeviceImageViewImageFormatInfoEXT>(image_state.create_info.pNext)) {
+                vku::FindStructInPNextChain<VkPhysicalDeviceImageViewImageFormatInfoEXT>(image_state.GetPNext())) {
             image_view_format.imageViewType = original_image_view_format->imageViewType;
             vvl::PnextChainAdd(&image_format_info, &image_view_format);
         }
@@ -2592,8 +2591,8 @@ bool CoreChecks::ValidateSparseMemoryBind(const VkSparseMemoryBind& bind, const
 bool CoreChecks::ValidateImageSubresourceSparseImageMemoryBind(vvl::Image const& image_state, VkImageSubresource const& subresource,
                                                                const Location& bind_loc, const Location& subresource_loc) const {
     bool skip = false;
-    skip |= ValidateImageAspectMask(image_state.VkHandle(), image_state.create_info.format, subresource.aspectMask,
-                                    image_state.disjoint, bind_loc, "VUID-VkSparseImageMemoryBindInfo-subresource-01106");
+    skip |= ValidateImageAspectMask(image_state.VkHandle(), image_state.GetFormat(), subresource.aspectMask, image_state.disjoint,
+                                    bind_loc, "VUID-VkSparseImageMemoryBindInfo-subresource-01106");
 
     if (subresource.mipLevel >= image_state.GetMipLevels()) {
         skip |=

layers/core_checks/cc_device_memory.cpp

@@ -396,7 +396,7 @@ bool CoreChecks::PreCallValidateExportMetalObjectsEXT(VkDevice device, VkExportM
                                 "VkImageCreateInfo structure",
                                 FormatHandle(metal_texture_ptr->image).c_str());
                         }
-                        auto format_plane_count = vkuFormatPlaneCount(image_info->create_info.format);
+                        auto format_plane_count = vkuFormatPlaneCount(image_info->GetFormat());
                         auto image_plane = metal_texture_ptr->plane;
                         if (!(format_plane_count > 1) && (image_plane != VK_IMAGE_ASPECT_PLANE_0_BIT)) {
                             skip |= LogError(
@@ -405,7 +405,7 @@ bool CoreChecks::PreCallValidateExportMetalObjectsEXT(VkDevice device, VkExportM
                                 "%s, and plane = %s, but image was created with format %s, which is not multiplaner and plane is "
                                 "required to be VK_IMAGE_ASPECT_PLANE_0_BIT",
                                 FormatHandle(metal_texture_ptr->image).c_str(), string_VkImageAspectFlags(image_plane).c_str(),
-                                string_VkFormat(image_info->create_info.format));
+                                string_VkFormat(image_info->GetFormat()));
                         }
                         if ((format_plane_count == 2) && (image_plane == VK_IMAGE_ASPECT_PLANE_2_BIT)) {
                             skip |= LogError(
@@ -415,7 +415,7 @@ bool CoreChecks::PreCallValidateExportMetalObjectsEXT(VkDevice device, VkExportM
                                 "cannot"
                                 "be VK_IMAGE_ASPECT_PLANE_2_BIT",
                                 FormatHandle(metal_texture_ptr->image).c_str(), string_VkImageAspectFlags(image_plane).c_str(),
-                                string_VkFormat(image_info->create_info.format));
+                                string_VkFormat(image_info->GetFormat()));
                         }
                     }
                 }
@@ -623,7 +623,7 @@ bool CoreChecks::ValidateAllocateMemoryMetal(const VkMemoryAllocateInfo& allocat
 
         // We can only validate images since we lack information to do the buffer call for the properties
         auto image_state_ptr = Get<vvl::Image>(dedicated_allocation_info->image);
-        VkFormat image_format = image_state_ptr->create_info.format;
+        VkFormat image_format = image_state_ptr->GetFormat();
         VkPhysicalDeviceExternalImageFormatInfo external_info = vku::InitStructHelper();
         external_info.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_MTLTEXTURE_BIT_EXT;
         VkPhysicalDeviceImageFormatInfo2 format_info = image_state_ptr->GetImageFormatInfo2(&external_info);