diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-09-19 15:14:56 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-10-14 15:39:41 -0700 |
| commit | 0340548c8e89d724fe6752fe7a665787c4adf361 (patch) | |
| tree | 00b7524fd72c7d18982cf67f74ea2a4a9cb24446 /src/intel/vulkan/anv_image.c | |
| parent | 146ee31159744941685a3ad04839b125dc0acce4 (diff) | |
| download | external_mesa3d-0340548c8e89d724fe6752fe7a665787c4adf361.tar.gz external_mesa3d-0340548c8e89d724fe6752fe7a665787c4adf361.tar.bz2 external_mesa3d-0340548c8e89d724fe6752fe7a665787c4adf361.zip | |
anv/image: Rework our handling of 3-D image array ranges
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/intel/vulkan/anv_image.c')
| -rw-r--r-- | src/intel/vulkan/anv_image.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index f125aa65b0..c40768405f 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -512,6 +512,18 @@ anv_image_view_init(struct anv_image_view *iview, .depth = anv_minify(image->extent.depth , range->baseMipLevel), }; + if (image->type == VK_IMAGE_TYPE_3D && + usage_mask != VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) { + /* Meta renders to 3D texture slices. When it does so, it passes + * usage_mask == VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT. Since meta is the + * only thing that uses a non-zero usage_mask, this lets us easily + * detect the one case where we actually want an array range used for + * 3-D textures. + */ + isl_view.base_array_layer = 0; + isl_view.array_len = iview->extent.depth; + } + isl_surf_usage_flags_t cube_usage; if (pCreateInfo->viewType == VK_IMAGE_VIEW_TYPE_CUBE || pCreateInfo->viewType == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY) { @@ -572,10 +584,6 @@ anv_image_view_init(struct anv_image_view *iview, isl_view.usage = cube_usage | ISL_SURF_USAGE_STORAGE_BIT; isl_view.format = isl_lower_storage_image_format(&device->info, isl_view.format); - if (image->type == VK_IMAGE_TYPE_3D) { - isl_view.base_array_layer = 0; - isl_view.array_len = iview->extent.depth; - } isl_surf_fill_state(&device->isl_dev, iview->storage_surface_state.map, .surf = &surface->isl, |