KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/a6xx: fix 3d texture layout 

Maybe not 100% perfect, but seems to be a pretty good approximation of
that.

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2018-12-18 10:34:23 -05:00
parent 8f60f1381d
commit 51a44c3aac
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/drivers/freedreno/a6xx/fd6_resource.c
View File

@ -73,7 +73,19 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
pitchalign = tile_alignment[rsc->cpp].pitchalign;
aligned_height = align(aligned_height, heightalign);
} else {
pitchalign = 64;
if (prsc->target == PIPE_TEXTURE_3D) {
unsigned a;
if (width >= 64) {
a = util_next_power_of_two(MAX2(width, height));
} else {
a = 16;
}
pitchalign = align(a, 64);
aligned_height = align(aligned_height, a);
} else {
pitchalign = 64;
}
/* The blits used for mem<->gmem work at a granularity of
* 32x32, which can cause faults due to over-fetch on the

2
src/gallium/drivers/freedreno/a6xx/fd6_texture.c
View File

@ -325,12 +325,12 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
break;
case PIPE_TEXTURE_3D:
so->texconst3 =
A6XX_TEX_CONST_3_MIN_LAYERSZ(rsc->slices[prsc->last_level].size0) |
A6XX_TEX_CONST_3_ARRAY_PITCH(rsc->slices[lvl].size0);
so->texconst5 =
A6XX_TEX_CONST_5_DEPTH(u_minify(prsc->depth0, lvl));
break;
default:
so->texconst3 = 0x00000000;
break;
}

2
src/gallium/drivers/freedreno/freedreno_resource.h
View File

@ -41,7 +41,7 @@
* programmed with the start address of each mipmap level, and hw
* derives the layer offset within the level.
*
* Texture Layout on a4xx:
* Texture Layout on a4xx+:
*
* For cubemap and 2d array, each layer contains all of it's mipmap
* levels (layer_first layout).