fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv/image: Stop using anv_format for image create validation

Browse source
This commit is contained in:
Jason Ekstrand 2016-05-13 16:52:41 -07:00
parent 990a7420b6
commit c87429c5f1
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/intel/vulkan/anv_image.c
View file

@ -332,7 +332,6 @@ anv_validate_CreateImageView(VkDevice _device,
{
ANV_FROM_HANDLE(anv_image, image, pCreateInfo->image);
const VkImageSubresourceRange *subresource;
MAYBE_UNUSED const struct anv_format *view_format_info;
/* Validate structure type before dereferencing it. */
assert(pCreateInfo);
@ -346,7 +345,6 @@ anv_validate_CreateImageView(VkDevice _device,
/* Validate format is in range before using it. */
assert(pCreateInfo->format >= VK_FORMAT_BEGIN_RANGE);
assert(pCreateInfo->format <= VK_FORMAT_END_RANGE);
view_format_info = anv_format_for_vk_format(pCreateInfo->format);
/* Validate channel swizzles. */
assert(pCreateInfo->components.r >= VK_COMPONENT_SWIZZLE_BEGIN_RANGE);
@ -379,16 +377,14 @@ anv_validate_CreateImageView(VkDevice _device,
assert(subresource->aspectMask == VK_IMAGE_ASPECT_COLOR_BIT);
assert(image->aspects == VK_IMAGE_ASPECT_COLOR_BIT);
assert(view_format_aspects == VK_IMAGE_ASPECT_COLOR_BIT);
assert(view_format_info->isl_layout->bs ==
image->format->isl_layout->bs);
} else if (subresource->aspectMask & ds_flags) {
assert((subresource->aspectMask & ~ds_flags) == 0);
assert(pCreateInfo->format == image->vk_format);
if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) {
assert(image->aspects & VK_IMAGE_ASPECT_DEPTH_BIT);
assert(view_format_aspects & VK_IMAGE_ASPECT_DEPTH_BIT);
assert(view_format_info->isl_layout->bs ==
image->format->isl_layout->bs);
}
if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) {