diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-01 12:19:11 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-03 13:43:53 -0800 |
| commit | 407b8cc5e0e0e0382b7a350480a7654fcb2a164f (patch) | |
| tree | a1e297ea09435109cdcdbe128853f2d77fae5e81 /src/vulkan/anv_image.c | |
| parent | 3f6abd0161c4f0c5f4716d1b97a2378219469b7a (diff) | |
vk/0.210.0: Get rid of VkImageAspect
Diffstat (limited to 'src/vulkan/anv_image.c')
| -rw-r--r-- | src/vulkan/anv_image.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c index 0fe2df10a7a..6c39b355958 100644 --- a/src/vulkan/anv_image.c +++ b/src/vulkan/anv_image.c @@ -430,16 +430,18 @@ void anv_GetImageSubresourceLayout( { ANV_FROM_HANDLE(anv_image, image, _image); - switch (pSubresource->aspect) { - case VK_IMAGE_ASPECT_COLOR: + assert(__builtin_popcount(pSubresource->aspectMask) == 1); + + switch (pSubresource->aspectMask) { + case VK_IMAGE_ASPECT_COLOR_BIT: anv_surface_get_subresource_layout(image, &image->color_surface, pSubresource, pLayout); break; - case VK_IMAGE_ASPECT_DEPTH: + case VK_IMAGE_ASPECT_DEPTH_BIT: anv_surface_get_subresource_layout(image, &image->depth_surface, pSubresource, pLayout); break; - case VK_IMAGE_ASPECT_STENCIL: + case VK_IMAGE_ASPECT_STENCIL_BIT: anv_surface_get_subresource_layout(image, &image->stencil_surface, pSubresource, pLayout); break; @@ -520,7 +522,7 @@ anv_validate_CreateImageView(VkDevice _device, image->format->isl_layout->bs); } - if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL) { + if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) { /* FINISHME: Is it legal to have an R8 view of S8? */ assert(image->format->has_stencil); assert(view_format_info->has_stencil); |