radeonsi: remove old tilling handling

[mesa.git] / src / gallium / drivers / radeonsi / si_state.c

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 9a9a2506088de93ed6723cbec858800193a815ad..5df22dd5f3ade89295cbc6ec95aebcb90526b76e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1258,23 +1258,71 @@ static uint32_t si_translate_vertexformat(struct pipe_screen *screen,
                                          const struct util_format_description *desc,
                                          int first_non_void)
 {
-       uint32_t result;
+       unsigned type = desc->channel[first_non_void].type;
+       int i;
+
+       if (type == UTIL_FORMAT_TYPE_FIXED)
+               return V_008F0C_BUF_DATA_FORMAT_INVALID;
+
+       /* See whether the components are of the same size. */
+       for (i = 0; i < desc->nr_channels; i++) {
+               if (desc->channel[first_non_void].size != desc->channel[i].size)
+                       return V_008F0C_BUF_DATA_FORMAT_INVALID;
+       }
 
-       if (desc->channel[first_non_void].type == UTIL_FORMAT_TYPE_FIXED)
-               return ~0;
+       switch (desc->channel[first_non_void].size) {
+       case 8:
+               switch (desc->nr_channels) {
+               case 1:
+                       return V_008F0C_BUF_DATA_FORMAT_8;
+               case 2:
+                       return V_008F0C_BUF_DATA_FORMAT_8_8;
+               case 3:
+               case 4:
+                       return V_008F0C_BUF_DATA_FORMAT_8_8_8_8;
+               }
+               break;
+       case 16:
+               switch (desc->nr_channels) {
+               case 1:
+                       return V_008F0C_BUF_DATA_FORMAT_16;
+               case 2:
+                       return V_008F0C_BUF_DATA_FORMAT_16_16;
+               case 3:
+               case 4:
+                       return V_008F0C_BUF_DATA_FORMAT_16_16_16_16;
+               }
+               break;
+       case 32:
+               if (type != UTIL_FORMAT_TYPE_FLOAT)
+                       return V_008F0C_BUF_DATA_FORMAT_INVALID;
 
-       result = si_translate_texformat(screen, format, desc, first_non_void);
-       if (result == V_008F0C_BUF_DATA_FORMAT_INVALID ||
-           result > V_008F0C_BUF_DATA_FORMAT_32_32_32_32)
-               result = ~0;
+               switch (desc->nr_channels) {
+               case 1:
+                       return V_008F0C_BUF_DATA_FORMAT_32;
+               case 2:
+                       return V_008F0C_BUF_DATA_FORMAT_32_32;
+               case 3:
+                       return V_008F0C_BUF_DATA_FORMAT_32_32_32;
+               case 4:
+                       return V_008F0C_BUF_DATA_FORMAT_32_32_32_32;
+               }
+               break;
+       }
 
-       return result;
+       return V_008F0C_BUF_DATA_FORMAT_INVALID;
 }
 
 static bool si_is_vertex_format_supported(struct pipe_screen *screen, enum pipe_format format)
 {
-       return si_translate_vertexformat(screen, format, util_format_description(format),
-                                        util_format_get_first_non_void_channel(format)) != ~0U;
+       const struct util_format_description *desc;
+       int first_non_void;
+       unsigned data_format;
+
+       desc = util_format_description(format);
+       first_non_void = util_format_get_first_non_void_channel(format);
+       data_format = si_translate_vertexformat(screen, format, desc, first_non_void);
+       return data_format != V_008F0C_BUF_DATA_FORMAT_INVALID;
 }
 
 static bool si_is_colorbuffer_format_supported(enum pipe_format format)
@@ -1757,7 +1805,7 @@ static struct pipe_sampler_view *si_create_sampler_view(struct pipe_context *ctx
        unsigned format, num_format, /*endian,*/ tiling_index;
        uint32_t pitch = 0;
        unsigned char state_swizzle[4], swizzle[4];
-       unsigned height, depth, width;
+       unsigned height, depth, width, offset_level, last_level;
        int first_non_void;
        uint64_t va;
 
@@ -1804,11 +1852,12 @@ static struct pipe_sampler_view *si_create_sampler_view(struct pipe_context *ctx
        /* not supported any more */
        //endian = si_colorformat_endian_swap(format);
 
-       height = texture->height0;
-       depth = texture->depth0;
-       width = texture->width0;
-       pitch = align(tmp->pitch_in_blocks[0] *
-                     util_format_get_blockwidth(state->format), 8);
+       offset_level = state->u.tex.first_level;
+       last_level = state->u.tex.last_level - offset_level;
+       width = tmp->surface.level[offset_level].npix_x;
+       height = tmp->surface.level[offset_level].npix_y;
+       depth = tmp->surface.level[offset_level].npix_z;
+       pitch = tmp->surface.level[offset_level].nblk_x * util_format_get_blockwidth(state->format);
 
        if (texture->target == PIPE_TEXTURE_1D_ARRAY) {
                height = 1;
@@ -1859,12 +1908,9 @@ static struct pipe_sampler_view *si_create_sampler_view(struct pipe_context *ctx
        }
 
        va = r600_resource_va(ctx->screen, texture);
-       if (state->u.tex.last_level) {
-               view->state[0] = (va + tmp->offset[1]) >> 8;
-       } else {
-               view->state[0] = (va + tmp->offset[0]) >> 8;
-       }
-       view->state[1] = (S_008F14_BASE_ADDRESS_HI((va + tmp->offset[0]) >> 40) |
+       va += tmp->surface.level[offset_level].offset;
+       view->state[0] = va >> 8;
+       view->state[1] = (S_008F14_BASE_ADDRESS_HI(va >> 40) |
                          S_008F14_DATA_FORMAT(format) |
                          S_008F14_NUM_FORMAT(num_format));
        view->state[2] = (S_008F18_WIDTH(width - 1) |
@@ -1873,8 +1919,8 @@ static struct pipe_sampler_view *si_create_sampler_view(struct pipe_context *ctx
                          S_008F1C_DST_SEL_Y(si_map_swizzle(swizzle[1])) |
                          S_008F1C_DST_SEL_Z(si_map_swizzle(swizzle[2])) |
                          S_008F1C_DST_SEL_W(si_map_swizzle(swizzle[3])) |
-                         S_008F1C_BASE_LEVEL(state->u.tex.first_level) |
-                         S_008F1C_LAST_LEVEL(state->u.tex.last_level) |
+                         S_008F1C_BASE_LEVEL(offset_level) |
+                         S_008F1C_LAST_LEVEL(last_level) |
                          S_008F1C_TILING_INDEX(tiling_index) |
                          S_008F1C_TYPE(si_tex_dim(texture->target)));
        view->state[4] = (S_008F20_DEPTH(depth - 1) | S_008F20_PITCH(pitch - 1));