diff options
| author | Jason Ekstrand <[email protected]> | 2016-07-08 22:11:06 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-07-13 11:47:37 -0700 |
| commit | fc3650a0a9eca29a9498f663d489ab729f55f65f (patch) | |
| tree | 58d4b157cbc50708ba85cf59fe759a9730559b9b /src/intel/vulkan | |
| parent | 1f0433f07575b797f6073c0b421adbc5658e1107 (diff) | |
isl: Kill off isl_format_layout::bs
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/anv_image.c | 4 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_meta_copy.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 77d99313135..23fdd936846 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -639,7 +639,7 @@ void anv_buffer_view_init(struct anv_buffer_view *view, anv_fill_buffer_surface_state(device, view->surface_state, view->format, view->offset, view->range, - isl_format_get_layout(view->format)->bs); + isl_format_get_layout(view->format)->bpb / 8); } else { view->surface_state = (struct anv_state){ 0 }; } @@ -657,7 +657,7 @@ void anv_buffer_view_init(struct anv_buffer_view *view, storage_format, view->offset, view->range, (storage_format == ISL_FORMAT_RAW ? 1 : - isl_format_get_layout(storage_format)->bs)); + isl_format_get_layout(storage_format)->bpb / 8)); isl_buffer_fill_image_param(&device->isl_dev, &view->storage_image_param, diff --git a/src/intel/vulkan/anv_meta_copy.c b/src/intel/vulkan/anv_meta_copy.c index a5844f0299d..6a9f9c4b9af 100644 --- a/src/intel/vulkan/anv_meta_copy.c +++ b/src/intel/vulkan/anv_meta_copy.c @@ -75,7 +75,7 @@ blit_surf_for_image(const struct anv_image* image, .bo = image->bo, .tiling = surf->isl.tiling, .base_offset = image->offset + surf->offset, - .bs = isl_format_get_layout(surf->isl.format)->bs, + .bs = isl_format_get_layout(surf->isl.format)->bpb / 8, .pitch = isl_surf_get_row_pitch(&surf->isl), }; } @@ -168,7 +168,7 @@ meta_copy_buffer_to_image(struct anv_cmd_buffer *cmd_buffer, .bo = buffer->bo, .tiling = ISL_TILING_LINEAR, .base_offset = buffer->offset + pRegions[r].bufferOffset, - .bs = isl_format_get_layout(buf_format)->bs, + .bs = isl_format_get_layout(buf_format)->bpb / 8, .pitch = buf_extent_el.width * buf_bsurf.bs, }; |