freedreno/a3xx: add debug callback to emit

[mesa.git] / src / gallium / drivers / freedreno / a3xx / fd3_texture.c

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
index c573c0ea9c0c135b970f977ea94245882eab4625..9d54d41e1adb4a2a9089b4df2fb152f7afbbdb51 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
@@ -68,13 +68,13 @@ tex_clamp(unsigned wrap, bool clamp_to_edge)
 }
 
 static enum a3xx_tex_filter
-tex_filter(unsigned filter)
+tex_filter(unsigned filter, bool aniso)
 {
        switch (filter) {
        case PIPE_TEX_FILTER_NEAREST:
                return A3XX_TEX_NEAREST;
        case PIPE_TEX_FILTER_LINEAR:
-               return A3XX_TEX_LINEAR;
+               return aniso ? A3XX_TEX_ANISO : A3XX_TEX_LINEAR;
        default:
                DBG("invalid filter: %u", filter);
                return 0;
@@ -86,6 +86,7 @@ fd3_sampler_state_create(struct pipe_context *pctx,
                const struct pipe_sampler_state *cso)
 {
        struct fd3_sampler_stateobj *so = CALLOC_STRUCT(fd3_sampler_stateobj);
+       unsigned aniso = util_last_bit(MIN2(cso->max_anisotropy >> 1, 8));
        bool miplinear = false;
        bool clamp_to_edge;
 
@@ -114,9 +115,11 @@ fd3_sampler_state_create(struct pipe_context *pctx,
 
        so->texsamp0 =
                        COND(!cso->normalized_coords, A3XX_TEX_SAMP_0_UNNORM_COORDS) |
+                       COND(!cso->seamless_cube_map, A3XX_TEX_SAMP_0_CUBEMAPSEAMLESSFILTOFF) |
                        COND(miplinear, A3XX_TEX_SAMP_0_MIPFILTER_LINEAR) |
-                       A3XX_TEX_SAMP_0_XY_MAG(tex_filter(cso->mag_img_filter)) |
-                       A3XX_TEX_SAMP_0_XY_MIN(tex_filter(cso->min_img_filter)) |
+                       A3XX_TEX_SAMP_0_XY_MAG(tex_filter(cso->mag_img_filter, aniso)) |
+                       A3XX_TEX_SAMP_0_XY_MIN(tex_filter(cso->min_img_filter, aniso)) |
+                       A3XX_TEX_SAMP_0_ANISO(aniso) |
                        A3XX_TEX_SAMP_0_WRAP_S(tex_clamp(cso->wrap_s, clamp_to_edge)) |
                        A3XX_TEX_SAMP_0_WRAP_T(tex_clamp(cso->wrap_t, clamp_to_edge)) |
                        A3XX_TEX_SAMP_0_WRAP_R(tex_clamp(cso->wrap_r, clamp_to_edge));
@@ -146,6 +149,9 @@ fd3_sampler_states_bind(struct pipe_context *pctx,
        uint16_t saturate_s = 0, saturate_t = 0, saturate_r = 0;
        unsigned i;
 
+       if (!hwcso)
+               nr = 0;
+
        for (i = 0; i < nr; i++) {
                if (hwcso[i]) {
                        struct fd3_sampler_stateobj *sampler =
@@ -208,8 +214,8 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
 {
        struct fd3_pipe_sampler_view *so = CALLOC_STRUCT(fd3_pipe_sampler_view);
        struct fd_resource *rsc = fd_resource(prsc);
-       unsigned lvl = cso->u.tex.first_level;
-       unsigned miplevels = cso->u.tex.last_level - lvl;
+       unsigned lvl;
+       uint32_t sz2 = 0;
 
        if (!so)
                return NULL;
@@ -220,38 +226,51 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
        so->base.reference.count = 1;
        so->base.context = pctx;
 
-       so->tex_resource =  rsc;
-
        so->texconst0 =
                        A3XX_TEX_CONST_0_TYPE(tex_type(prsc->target)) |
                        A3XX_TEX_CONST_0_FMT(fd3_pipe2tex(cso->format)) |
-                       A3XX_TEX_CONST_0_MIPLVLS(miplevels) |
                        fd3_tex_swiz(cso->format, cso->swizzle_r, cso->swizzle_g,
                                                cso->swizzle_b, cso->swizzle_a);
 
        if (util_format_is_srgb(cso->format))
                so->texconst0 |= A3XX_TEX_CONST_0_SRGB;
 
-       so->texconst1 =
+       if (prsc->target == PIPE_BUFFER) {
+               lvl = 0;
+               so->texconst1 =
+                       A3XX_TEX_CONST_1_FETCHSIZE(fd3_pipe2fetchsize(cso->format)) |
+                       A3XX_TEX_CONST_1_WIDTH(cso->u.buf.last_element -
+                                                                  cso->u.buf.first_element + 1) |
+                       A3XX_TEX_CONST_1_HEIGHT(1);
+       } else {
+               unsigned miplevels;
+
+               lvl = fd_sampler_first_level(cso);
+               miplevels = fd_sampler_last_level(cso) - lvl;
+
+               so->texconst0 |= A3XX_TEX_CONST_0_MIPLVLS(miplevels);
+               so->texconst1 =
                        A3XX_TEX_CONST_1_FETCHSIZE(fd3_pipe2fetchsize(cso->format)) |
                        A3XX_TEX_CONST_1_WIDTH(u_minify(prsc->width0, lvl)) |
                        A3XX_TEX_CONST_1_HEIGHT(u_minify(prsc->height0, lvl));
+       }
        /* when emitted, A3XX_TEX_CONST_2_INDX() must be OR'd in: */
        so->texconst2 =
-                       A3XX_TEX_CONST_2_PITCH(rsc->slices[lvl].pitch * rsc->cpp);
+                       A3XX_TEX_CONST_2_PITCH(fd3_pipe2nblocksx(cso->format, rsc->slices[lvl].pitch) * rsc->cpp);
        switch (prsc->target) {
        case PIPE_TEXTURE_1D_ARRAY:
        case PIPE_TEXTURE_2D_ARRAY:
                so->texconst3 =
                                A3XX_TEX_CONST_3_DEPTH(prsc->array_size - 1) |
-                               A3XX_TEX_CONST_3_LAYERSZ1(rsc->slices[0].size0) |
-                               A3XX_TEX_CONST_3_LAYERSZ2(rsc->slices[0].size0);
+                               A3XX_TEX_CONST_3_LAYERSZ1(rsc->slices[0].size0);
                break;
        case PIPE_TEXTURE_3D:
                so->texconst3 =
                                A3XX_TEX_CONST_3_DEPTH(u_minify(prsc->depth0, lvl)) |
-                               A3XX_TEX_CONST_3_LAYERSZ1(rsc->slices[0].size0) |
-                               A3XX_TEX_CONST_3_LAYERSZ2(rsc->slices[0].size0);
+                               A3XX_TEX_CONST_3_LAYERSZ1(rsc->slices[lvl].size0);
+               while (lvl < cso->u.tex.last_level && sz2 != rsc->slices[lvl+1].size0)
+                       sz2 = rsc->slices[++lvl].size0;
+               so->texconst3 |= A3XX_TEX_CONST_3_LAYERSZ2(sz2);
                break;
        default:
                so->texconst3 = 0x00000000;