anv: Remove the anv_format member from anv_image

This commit is contained in:
Jason Ekstrand
2016-05-13 16:52:15 -07:00
parent be94a23b44
commit fbc23d93e0
3 changed files with 2 additions and 4 deletions

View File

@@ -227,7 +227,6 @@ anv_image_create(VkDevice _device,
image->type = pCreateInfo->imageType;
image->extent = pCreateInfo->extent;
image->vk_format = pCreateInfo->format;
image->format = format;
image->aspects = vk_format_aspects(image->vk_format);
image->levels = pCreateInfo->mipLevels;
image->array_size = pCreateInfo->arrayLayers;

View File

@@ -717,7 +717,7 @@ void anv_CmdResolveImage(
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.image = src_image_h,
.viewType = anv_meta_get_view_type(src_image),
.format = src_image->format->vk_format,
.format = src_image->vk_format,
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.baseMipLevel = region->srcSubresource.mipLevel,
@@ -734,7 +734,7 @@ void anv_CmdResolveImage(
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.image = dest_image_h,
.viewType = anv_meta_get_view_type(dest_image),
.format = dest_image->format->vk_format,
.format = dest_image->vk_format,
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.baseMipLevel = region->dstSubresource.mipLevel,

View File

@@ -1560,7 +1560,6 @@ struct anv_image {
* of the actual surface formats.
*/
VkFormat vk_format;
const struct anv_format *format;
VkImageAspectFlags aspects;
VkExtent3D extent;
uint32_t levels;