radv: remove radeon_surf_level::nblk_z

We're not using thick tiling modes, so we can just derive the value
ourselves.

Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Nicolai Hähnle 2017-05-10 22:25:15 +02:00 committed by Dave Airlie
parent 34b7fb47b6
commit e156eaedb4
3 changed files with 1 additions and 6 deletions

View File

@ -854,7 +854,7 @@ void radv_GetImageSubresourceLayout(
pLayout->depthPitch = surface->level[level].slice_size;
pLayout->size = surface->level[level].slice_size;
if (image->type == VK_IMAGE_TYPE_3D)
pLayout->size *= surface->level[level].nblk_z;
pLayout->size *= u_minify(image->info.depth, level);
}

View File

@ -169,7 +169,6 @@ struct radeon_surf_level {
uint64_t slice_size;
uint32_t nblk_x;
uint32_t nblk_y;
uint32_t nblk_z;
uint32_t mode;
uint64_t dcc_offset;
uint64_t dcc_fast_clear_size;

View File

@ -205,10 +205,6 @@ static int radv_compute_level(ADDR_HANDLE addrlib,
surf_level->slice_size = AddrSurfInfoOut->sliceSize;
surf_level->nblk_x = AddrSurfInfoOut->pitch;
surf_level->nblk_y = AddrSurfInfoOut->height;
if (type == RADEON_SURF_TYPE_3D)
surf_level->nblk_z = AddrSurfInfoOut->depth;
else
surf_level->nblk_z = 1;
switch (AddrSurfInfoOut->tileMode) {
case ADDR_TM_LINEAR_ALIGNED: