radv/image: drop blk_d

This was pretty much unused.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 24f36203041cd1d54db4c1a7fd6dda64eb045c75..c6261d320bd36753a9673108599de72eb8b513fb 100644 (file)
--- 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 48d72b91471e189de92f99247581e3931a5c2a09..5858cfece5041db518c38f424c330ce86d827383 100644 (file)
--- 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 55bbd3014c3a65c7374ca76c7e79623a1afc4fb7..2cbf929514c2e3f6dddac17b3f53c523e1625738 100644 (file)
--- 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) {