freedreno: Fix acc query handling in the presence of batch reordering.

[mesa.git] / src / gallium / drivers / freedreno / a6xx / fd6_texture.c

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_texture.c b/src/gallium/drivers/freedreno/a6xx/fd6_texture.c
index 7508b6a44fb8b93ef396614a1e79b11e4427523b..e0883815ca989c3bfbcb94629ce2cba79903ac43 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_texture.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_texture.c
@@ -29,7 +29,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/hash_table.h"
 
 #include "fd6_texture.h"
@@ -220,6 +220,7 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
 {
        struct fd6_pipe_sampler_view *so = CALLOC_STRUCT(fd6_pipe_sampler_view);
        struct fd_resource *rsc = fd_resource(prsc);
+       struct fdl_slice *slice = NULL;
        enum pipe_format format = cso->format;
        unsigned lvl, layers = 0;
 
@@ -255,6 +256,7 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
                unsigned miplevels;
 
                lvl = fd_sampler_first_level(cso);
+               slice = fd_resource_slice(rsc, lvl);
                miplevels = fd_sampler_last_level(cso) - lvl;
                layers = cso->u.tex.last_layer - cso->u.tex.first_layer + 1;
 
@@ -265,8 +267,7 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
                so->texconst2 =
                        A6XX_TEX_CONST_2_FETCHSIZE(fd6_pipe2fetchsize(format)) |
                        A6XX_TEX_CONST_2_PITCH(
-                                       util_format_get_nblocksx(
-                                                       format, rsc->slices[lvl].pitch) * rsc->cpp);
+                               util_format_get_nblocksx(format, slice->pitch) * rsc->layout.cpp);
                so->offset = fd_resource_offset(rsc, lvl, cso->u.tex.first_layer);
                so->ubwc_offset = fd_resource_ubwc_offset(rsc, lvl, cso->u.tex.first_layer);
                so->ubwc_enabled = fd_resource_ubwc_enabled(rsc, lvl);
@@ -276,11 +277,6 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
                                cso->swizzle_r, cso->swizzle_g,
                                cso->swizzle_b, cso->swizzle_a);
 
-       if (so->ubwc_enabled) {
-               so->texconst9 |= A6XX_TEX_CONST_9_FLAG_BUFFER_ARRAY_PITCH(rsc->ubwc_size);
-               so->texconst10 |= A6XX_TEX_CONST_10_FLAG_BUFFER_PITCH(rsc->ubwc_pitch);
-       }
-
        so->texconst2 |= A6XX_TEX_CONST_2_TYPE(fd6_tex_type(cso->target));
 
        switch (cso->target) {
@@ -288,28 +284,29 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
        case PIPE_TEXTURE_1D:
        case PIPE_TEXTURE_2D:
                so->texconst3 =
-                       A6XX_TEX_CONST_3_ARRAY_PITCH(rsc->layer_size);
+                       A6XX_TEX_CONST_3_ARRAY_PITCH(rsc->layout.layer_size);
                so->texconst5 =
                        A6XX_TEX_CONST_5_DEPTH(1);
                break;
        case PIPE_TEXTURE_1D_ARRAY:
        case PIPE_TEXTURE_2D_ARRAY:
                so->texconst3 =
-                       A6XX_TEX_CONST_3_ARRAY_PITCH(rsc->layer_size);
+                       A6XX_TEX_CONST_3_ARRAY_PITCH(rsc->layout.layer_size);
                so->texconst5 =
                        A6XX_TEX_CONST_5_DEPTH(layers);
                break;
        case PIPE_TEXTURE_CUBE:
        case PIPE_TEXTURE_CUBE_ARRAY:
                so->texconst3 =
-                       A6XX_TEX_CONST_3_ARRAY_PITCH(rsc->layer_size);
+                       A6XX_TEX_CONST_3_ARRAY_PITCH(rsc->layout.layer_size);
                so->texconst5 =
                        A6XX_TEX_CONST_5_DEPTH(layers / 6);
                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);
+                       A6XX_TEX_CONST_3_MIN_LAYERSZ(
+                               fd_resource_slice(rsc, prsc->last_level)->size0) |
+                       A6XX_TEX_CONST_3_ARRAY_PITCH(slice->size0);
                so->texconst5 =
                        A6XX_TEX_CONST_5_DEPTH(u_minify(prsc->depth0, lvl));
                break;
@@ -318,7 +315,17 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
        }
 
        if (so->ubwc_enabled) {
-               so->texconst3 |= A6XX_TEX_CONST_3_FLAG | A6XX_TEX_CONST_3_UNK27;
+               struct fdl_slice *ubwc_base_slice = &rsc->layout.ubwc_slices[lvl];
+
+               uint32_t block_width, block_height;
+               fdl6_get_ubwc_blockwidth(&rsc->layout, &block_width, &block_height);
+
+               so->texconst3 |= A6XX_TEX_CONST_3_FLAG | A6XX_TEX_CONST_3_TILE_ALL;
+               so->texconst9 |= A6XX_TEX_CONST_9_FLAG_BUFFER_ARRAY_PITCH(rsc->layout.ubwc_layer_size >> 2);
+               so->texconst10 |=
+                       A6XX_TEX_CONST_10_FLAG_BUFFER_PITCH(ubwc_base_slice->pitch) |
+                       A6XX_TEX_CONST_10_FLAG_BUFFER_LOGW(util_logbase2_ceil(DIV_ROUND_UP(u_minify(prsc->width0, lvl), block_width))) |
+                       A6XX_TEX_CONST_10_FLAG_BUFFER_LOGH(util_logbase2_ceil(DIV_ROUND_UP(u_minify(prsc->height0, lvl), block_height)));
        }
 
        return &so->base;