From: Dave Airlie Date: Tue, 2 May 2017 00:12:36 +0000 (+1000) Subject: radv/image: drop blk_d X-Git-Tag: upstream/18.1.0~10280 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d0f792f067585edb6496bc4deec6af3875835e3;p=platform%2Fupstream%2Fmesa.git radv/image: drop blk_d This was pretty much unused. Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Dave Airlie --- diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 24f3620..c6261d32 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -70,7 +70,6 @@ radv_init_surface(struct radv_device *device, surface->blk_w = vk_format_get_blockwidth(pCreateInfo->format); surface->blk_h = vk_format_get_blockheight(pCreateInfo->format); - surface->blk_d = 1; surface->bpe = vk_format_get_blocksize(pCreateInfo->format); /* align byte per element on dword */ diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index 48d72b9..5858cfe 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -186,7 +186,6 @@ struct radeon_surf { /* These are inputs to the calculator. */ uint32_t blk_w; uint32_t blk_h; - uint32_t blk_d; uint32_t bpe; uint32_t flags; diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c index 55bbd30..2cbf929 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c @@ -60,7 +60,7 @@ static int radv_amdgpu_surface_sanity(const struct radeon_surf_info *surf_info, !surf_info->array_size) return -EINVAL; - if (!surf->blk_w || !surf->blk_h || !surf->blk_d) + if (!surf->blk_w || !surf->blk_h) return -EINVAL; switch (surf_info->samples) {