freedreno/a6xx: fix 3d tex layout

Fixes dEQP-GLES3.functional.texture.specification.texstorage3d.size.3d_2x2x2_2_levels

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
index 3d7b79fc66f3275ed9559dd206cd9cbd3ad0114e..8f8f7f20d1f9ca6353840b0205fcf5aa4526c51b 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c
@@ -133,7 +133,7 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
                 * range gets into range, we stop reducing it.
                 */
                if (prsc->target == PIPE_TEXTURE_3D) {
-                       if (level <= 1 || (rsc->slices[level - 1].size0 > 0xf000)) {
+                       if (level < 1 || (rsc->slices[level - 1].size0 > 0xf000)) {
                                slice->size0 = align(blocks * rsc->cpp, alignment);
                        } else {
                                slice->size0 = rsc->slices[level - 1].size0;
@@ -145,11 +145,12 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma
                size += slice->size0 * depth * layers_in_level;
 
 #if 0
-               debug_printf("%s: %ux%ux%u@%u:\t%2u: stride=%4u, size=%6u,%7u, aligned_height=%3u, blocks=%u\n",
+               debug_printf("%s: %ux%ux%u@%u:\t%2u: stride=%4u, size=%6u,%7u, aligned_height=%3u, blocks=%u, offset=0x%x\n",
                                util_format_name(prsc->format),
                                width, height, depth, rsc->cpp,
                                level, slice->pitch * rsc->cpp,
-                               slice->size0, size, aligned_height, blocks);
+                               slice->size0, size, aligned_height, blocks,
+                               slice->offset);
 #endif
 
                depth = u_minify(depth, 1);