#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"
+#include "fd6_resource.h"
#include "fd6_format.h"
#include "fd6_emit.h"
A6XX_TEX_SAMP_0_WRAP_R(tex_clamp(cso->wrap_r, clamp_to_edge, &so->needs_border));
so->texsamp1 =
+ COND(cso->min_mip_filter == PIPE_TEX_MIPFILTER_NONE,
+ A6XX_TEX_SAMP_1_MIPFILTER_LINEAR_FAR) |
COND(!cso->seamless_cube_map, A6XX_TEX_SAMP_1_CUBEMAPSEAMLESSFILTOFF) |
COND(!cso->normalized_coords, A6XX_TEX_SAMP_1_UNNORM_COORDS);
- if (cso->min_mip_filter != PIPE_TEX_MIPFILTER_NONE) {
- so->texsamp0 |= A6XX_TEX_SAMP_0_LOD_BIAS(cso->lod_bias);
- so->texsamp1 |=
- A6XX_TEX_SAMP_1_MIN_LOD(cso->min_lod) |
- A6XX_TEX_SAMP_1_MAX_LOD(cso->max_lod);
- }
+ so->texsamp0 |= A6XX_TEX_SAMP_0_LOD_BIAS(cso->lod_bias);
+ so->texsamp1 |=
+ A6XX_TEX_SAMP_1_MIN_LOD(cso->min_lod) |
+ A6XX_TEX_SAMP_1_MAX_LOD(cso->max_lod);
if (cso->compare_mode)
so->texsamp1 |= A6XX_TEX_SAMP_1_COMPARE_FUNC(cso->compare_func); /* maps 1:1 */
{
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;
+ unsigned lvl, layers = 0;
if (!so)
return NULL;
+ fd6_validate_format(fd_context(pctx), rsc, format);
+
if (format == PIPE_FORMAT_X32_S8X24_UINT) {
rsc = rsc->stencil;
format = rsc->base.format;
so->base.context = pctx;
so->seqno = ++fd6_context(fd_context(pctx))->tex_seqno;
- so->texconst0 =
- A6XX_TEX_CONST_0_FMT(fd6_pipe2tex(format)) |
- A6XX_TEX_CONST_0_SAMPLES(fd_msaa_samples(prsc->nr_samples)) |
- fd6_tex_swiz(prsc, cso->format, cso->swizzle_r, cso->swizzle_g,
- cso->swizzle_b, cso->swizzle_a);
-
- if (util_format_is_srgb(format)) {
- so->texconst0 |= A6XX_TEX_CONST_0_SRGB;
- }
-
if (cso->target == PIPE_BUFFER) {
unsigned elements = cso->u.buf.size / util_format_get_blocksize(format);
so->offset = cso->u.buf.offset;
} else {
unsigned miplevels;
- enum a6xx_tile_mode tile_mode = TILE6_LINEAR;
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;
- if (!fd_resource_level_linear(prsc, lvl))
- tile_mode = fd_resource(prsc)->tile_mode;
-
- so->texconst0 |= A6XX_TEX_CONST_0_MIPLVLS(miplevels) |
- A6XX_TEX_CONST_0_TILE_MODE(tile_mode);
+ so->texconst0 |= A6XX_TEX_CONST_0_MIPLVLS(miplevels);
so->texconst1 =
A6XX_TEX_CONST_1_WIDTH(u_minify(prsc->width0, lvl)) |
A6XX_TEX_CONST_1_HEIGHT(u_minify(prsc->height0, lvl));
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_enabled = rsc->ubwc_size && u_minify(prsc->width0, lvl) >= 16;
+ so->ubwc_offset = fd_resource_ubwc_offset(rsc, lvl, cso->u.tex.first_layer);
+ so->ubwc_enabled = fd_resource_ubwc_enabled(rsc, lvl);
}
+ so->texconst0 |= fd6_tex_const_0(prsc, lvl, cso->format,
+ cso->swizzle_r, cso->swizzle_g,
+ cso->swizzle_b, cso->swizzle_a);
+
if (so->ubwc_enabled) {
- so->texconst9 |= A6XX_TEX_CONST_9_FLAG_BUFFER_PITCH(rsc->ubwc_size);
- so->texconst10 |= A6XX_TEX_CONST_10_FLAG_BUFFER_ARRAY_PITCH(rsc->ubwc_pitch);
+ so->texconst9 |= A6XX_TEX_CONST_9_FLAG_BUFFER_ARRAY_PITCH(rsc->layout.ubwc_size);
+ so->texconst10 |= A6XX_TEX_CONST_10_FLAG_BUFFER_PITCH(rsc->layout.ubwc_slices[lvl].pitch);
}
so->texconst2 |= A6XX_TEX_CONST_2_TYPE(fd6_tex_type(cso->target));
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;
break;
}
+ if (so->ubwc_enabled) {
+ so->texconst3 |= A6XX_TEX_CONST_3_FLAG | A6XX_TEX_CONST_3_TILE_ALL;
+ }
+
return &so->base;
}
}
struct fd6_texture_state *
-fd6_texture_state(struct fd_context *ctx, enum a6xx_state_block sb,
+fd6_texture_state(struct fd_context *ctx, enum pipe_shader_type type,
struct fd_texture_stateobj *tex)
{
struct fd6_context *fd6_ctx = fd6_context(ctx);
needs_border |= sampler->needs_border;
}
- key.bcolor_offset = fd6_border_color_offset(ctx, sb, tex);
+ key.type = type;
+ key.bcolor_offset = fd6_border_color_offset(ctx, type, tex);
uint32_t hash = key_hash(&key);
struct hash_entry *entry =
state->stateobj = fd_ringbuffer_new_object(ctx->pipe, 0x1000);
state->needs_border = needs_border;
- fd6_emit_textures(ctx->pipe, state->stateobj, sb, tex, key.bcolor_offset,
- NULL, NULL, NULL);
+ fd6_emit_textures(ctx->pipe, state->stateobj, type, tex, key.bcolor_offset,
+ NULL, NULL);
/* NOTE: uses copy of key in state obj, because pointer passed by caller
* is probably on the stack
projects / mesa.git / blobdiff