OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/image: Use the has_matching_typed_storage_image_format helper from isl

Browse Source 
Reviewed-by: Chad Versace <chad.versace@intel.com>
This commit is contained in:
Jason Ekstrand
2016-04-15 17:08:18 -07:00
parent 65bd8317e2
commit ca8c5993bf
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/intel/vulkan/anv_image.c
View File

@@ -424,16 +424,6 @@ alloc_surface_state(struct anv_device *device,
} }
} }
static bool
has_matching_storage_typed_format(const struct anv_device *device,
enum isl_format format)
{
return (isl_format_get_layout(format)->bs <= 4 ||
(isl_format_get_layout(format)->bs <= 8 &&
(device->info.gen >= 8 || device->info.is_haswell)) ||
device->info.gen >= 9);
}
static enum isl_channel_select static enum isl_channel_select
remap_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component, remap_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component,
struct anv_format_swizzle format_swizzle) struct anv_format_swizzle format_swizzle)
@@ -574,7 +564,7 @@ anv_image_view_init(struct anv_image_view *iview,
if (image->usage & usage_mask & VK_IMAGE_USAGE_STORAGE_BIT) { if (image->usage & usage_mask & VK_IMAGE_USAGE_STORAGE_BIT) {
iview->storage_surface_state = alloc_surface_state(device, cmd_buffer); iview->storage_surface_state = alloc_surface_state(device, cmd_buffer);
if (has_matching_storage_typed_format(device, format)) { if (isl_has_matching_typed_storage_image_format(&device->info, format)) {
isl_view.usage = cube_usage | ISL_SURF_USAGE_STORAGE_BIT; isl_view.usage = cube_usage | ISL_SURF_USAGE_STORAGE_BIT;
isl_surf_fill_state(&device->isl_dev, isl_surf_fill_state(&device->isl_dev,
iview->storage_surface_state.map, iview->storage_surface_state.map,
@@ -677,7 +667,8 @@ void anv_buffer_view_init(struct anv_buffer_view *view,
view->storage_surface_state = alloc_surface_state(device, cmd_buffer); view->storage_surface_state = alloc_surface_state(device, cmd_buffer);
enum isl_format storage_format = enum isl_format storage_format =
has_matching_storage_typed_format(device, view->format) ? isl_has_matching_typed_storage_image_format(&device->info,
view->format) ?
isl_lower_storage_image_format(&device->info, view->format) : isl_lower_storage_image_format(&device->info, view->format) :
ISL_FORMAT_RAW; ISL_FORMAT_RAW;