From 5d0f792f067585edb6496bc4deec6af3875835e3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 2 May 2017 10:12:36 +1000 Subject: [PATCH] radv/image: drop blk_d This was pretty much unused. Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Dave Airlie --- src/amd/vulkan/radv_image.c | 1 - src/amd/vulkan/radv_radeon_winsys.h | 1 - src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 24f36203041..c6261d320bd 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 48d72b91471..5858cfece50 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 55bbd3014c3..2cbf929514c 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) { -- 2.30.2