diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-20 21:40:25 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-27 10:26:14 -0800 |
| commit | 9d5b8f7709d7cce1493cc0b38c750ad1173f7327 (patch) | |
| tree | 402f5094bf48991f0a1dbd040da0d890c766164b /src/intel/vulkan/anv_image.c | |
| parent | b70a8d40fa1bdb21376b96534c846ba8c1c82878 (diff) | |
| download | external_mesa3d-9d5b8f7709d7cce1493cc0b38c750ad1173f7327.zip external_mesa3d-9d5b8f7709d7cce1493cc0b38c750ad1173f7327.tar.gz external_mesa3d-9d5b8f7709d7cce1493cc0b38c750ad1173f7327.tar.bz2 | |
anv: Remove unneeded fiels from anv_image_view
Diffstat (limited to 'src/intel/vulkan/anv_image.c')
| -rw-r--r-- | src/intel/vulkan/anv_image.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 11ceea3..145db6d 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -514,14 +514,15 @@ anv_image_view_init(struct anv_image_view *iview, iview->vk_format = pCreateInfo->format; struct anv_format_swizzle swizzle; - iview->format = anv_get_isl_format(pCreateInfo->format, iview->aspect_mask, - image->tiling, &swizzle); + enum isl_format format = anv_get_isl_format(pCreateInfo->format, + range->aspectMask, + image->tiling, &swizzle); iview->base_layer = range->baseArrayLayer; iview->base_mip = range->baseMipLevel; struct isl_view isl_view = { - .format = iview->format, + .format = format, .base_level = range->baseMipLevel, .levels = range->levelCount, .base_array_layer = range->baseArrayLayer, @@ -540,7 +541,7 @@ anv_image_view_init(struct anv_image_view *iview, struct isl_extent4d level0_extent_px; - if (!isl_format_is_compressed(iview->format) && + if (!isl_format_is_compressed(format) && isl_format_is_compressed(image->format->isl_format)) { /* Scale the ImageView extent by the backing Image. This is used * internally when an uncompressed ImageView is created on a @@ -613,7 +614,7 @@ anv_image_view_init(struct anv_image_view *iview, if (image->usage & VK_IMAGE_USAGE_STORAGE_BIT) { iview->storage_surface_state = alloc_surface_state(device, cmd_buffer); - if (has_matching_storage_typed_format(device, iview->format)) { + if (has_matching_storage_typed_format(device, format)) { isl_view.usage = cube_usage | ISL_SURF_USAGE_STORAGE_BIT; isl_surf_fill_state(&device->isl_dev, iview->storage_surface_state.map, |