freedreno: Convert the slice struct to the new resource header.

[mesa.git] / src / gallium / drivers / freedreno / a2xx / fd2_texture.c

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_texture.c b/src/gallium/drivers/freedreno/a2xx/fd2_texture.c
index 089c337118fb2a477d81c32f542008a2fd834c30..a2bd72e9efe4ec288762cca30169a365393c8a96 100644 (file)
--- a/src/gallium/drivers/freedreno/a2xx/fd2_texture.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_texture.c
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
  * Copyright (C) 2012-2013 Rob Clark <robclark@freedesktop.org>
  *
@@ -74,6 +72,22 @@ tex_filter(unsigned filter)
        }
 }
 
+static enum sq_tex_filter
+mip_filter(unsigned filter)
+{
+       switch (filter) {
+       case PIPE_TEX_MIPFILTER_NONE:
+               return SQ_TEX_FILTER_BASEMAP;
+       case PIPE_TEX_MIPFILTER_NEAREST:
+               return SQ_TEX_FILTER_POINT;
+       case PIPE_TEX_MIPFILTER_LINEAR:
+               return SQ_TEX_FILTER_BILINEAR;
+       default:
+               DBG("invalid filter: %u", filter);
+               return 0;
+       }
+}
+
 static void *
 fd2_sampler_state_create(struct pipe_context *pctx,
                const struct pipe_sampler_state *cso)
@@ -85,6 +99,11 @@ fd2_sampler_state_create(struct pipe_context *pctx,
 
        so->base = *cso;
 
+       /* TODO
+        * cso->max_anisotropy
+        * cso->normalized_coords (dealt with by shader for rect textures?)
+        */
+
        /* SQ_TEX0_PITCH() must be OR'd in later when we know the bound texture: */
        so->tex0 =
                A2XX_SQ_TEX_0_CLAMP_X(tex_clamp(cso->wrap_s)) |
@@ -93,10 +112,12 @@ fd2_sampler_state_create(struct pipe_context *pctx,
 
        so->tex3 =
                A2XX_SQ_TEX_3_XY_MAG_FILTER(tex_filter(cso->mag_img_filter)) |
-               A2XX_SQ_TEX_3_XY_MIN_FILTER(tex_filter(cso->min_img_filter));
+               A2XX_SQ_TEX_3_XY_MIN_FILTER(tex_filter(cso->min_img_filter)) |
+               A2XX_SQ_TEX_3_MIP_FILTER(mip_filter(cso->min_mip_filter));
 
-       so->tex4 = 0x00000000; /* ??? */
-       so->tex5 = 0x00000200; /* ??? */
+       so->tex4 = 0;
+       if (cso->min_mip_filter != PIPE_TEX_MIPFILTER_NONE)
+               so->tex4 = A2XX_SQ_TEX_4_LOD_BIAS(cso->lod_bias);
 
        return so;
 }
@@ -123,12 +144,33 @@ fd2_sampler_states_bind(struct pipe_context *pctx,
        fd_sampler_states_bind(pctx, shader, start, nr, hwcso);
 }
 
+static enum sq_tex_dimension
+tex_dimension(unsigned target)
+{
+       switch (target) {
+       default:
+               assert(0);
+       case PIPE_TEXTURE_1D:
+               assert(0); /* TODO */
+               return SQ_TEX_DIMENSION_1D;
+       case PIPE_TEXTURE_RECT:
+       case PIPE_TEXTURE_2D:
+               return SQ_TEX_DIMENSION_2D;
+       case PIPE_TEXTURE_3D:
+               assert(0); /* TODO */
+               return SQ_TEX_DIMENSION_3D;
+       case PIPE_TEXTURE_CUBE:
+               return SQ_TEX_DIMENSION_CUBE;
+       }
+}
+
 static struct pipe_sampler_view *
 fd2_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
                const struct pipe_sampler_view *cso)
 {
        struct fd2_pipe_sampler_view *so = CALLOC_STRUCT(fd2_pipe_sampler_view);
        struct fd_resource *rsc = fd_resource(prsc);
+       struct surface_format fmt = fd2_pipe2surface(cso->format);
 
        if (!so)
                return NULL;
@@ -139,14 +181,31 @@ fd2_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
        so->base.reference.count = 1;
        so->base.context = pctx;
 
-       so->fmt = fd2_pipe2surface(cso->format);
-
-       so->tex0 = A2XX_SQ_TEX_0_PITCH(rsc->slices[0].pitch);
+       struct fdl_slice *slice0 = fd_resource_slice(rsc, 0);
+       so->tex0 =
+               A2XX_SQ_TEX_0_SIGN_X(fmt.sign) |
+               A2XX_SQ_TEX_0_SIGN_Y(fmt.sign) |
+               A2XX_SQ_TEX_0_SIGN_Z(fmt.sign) |
+               A2XX_SQ_TEX_0_SIGN_W(fmt.sign) |
+               A2XX_SQ_TEX_0_PITCH(slice0->pitch) |
+               COND(rsc->tile_mode, A2XX_SQ_TEX_0_TILED);
+       so->tex1 =
+               A2XX_SQ_TEX_1_FORMAT(fmt.format) |
+               A2XX_SQ_TEX_1_CLAMP_POLICY(SQ_TEX_CLAMP_POLICY_OGL);
        so->tex2 =
                A2XX_SQ_TEX_2_HEIGHT(prsc->height0 - 1) |
                A2XX_SQ_TEX_2_WIDTH(prsc->width0 - 1);
-       so->tex3 = fd2_tex_swiz(cso->format, cso->swizzle_r, cso->swizzle_g,
-                       cso->swizzle_b, cso->swizzle_a);
+       so->tex3 =
+               A2XX_SQ_TEX_3_NUM_FORMAT(fmt.num_format) |
+               fd2_tex_swiz(cso->format, cso->swizzle_r, cso->swizzle_g,
+                            cso->swizzle_b, cso->swizzle_a) |
+               A2XX_SQ_TEX_3_EXP_ADJUST(fmt.exp_adjust);
+
+       so->tex4 =
+               A2XX_SQ_TEX_4_MIP_MIN_LEVEL(fd_sampler_first_level(cso)) |
+               A2XX_SQ_TEX_4_MIP_MAX_LEVEL(fd_sampler_last_level(cso));
+
+       so->tex5 = A2XX_SQ_TEX_5_DIMENSION(tex_dimension(prsc->target));
 
        return &so->base;
 }