etnaviv: clear texture cache and flush ts when texture is modified
Signed-off-by: Jonathan Marek <jonathan@marek.ca> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
parent
6dc650fe71
commit
5403b36653
|
@ -263,10 +263,18 @@ etna_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info)
|
||||||
resource_read(ctx, indexbuf);
|
resource_read(ctx, indexbuf);
|
||||||
|
|
||||||
/* Mark textures as being read */
|
/* Mark textures as being read */
|
||||||
for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
|
for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
|
||||||
if (ctx->sampler_view[i])
|
if (ctx->sampler_view[i]) {
|
||||||
resource_read(ctx, ctx->sampler_view[i]->texture);
|
resource_read(ctx, ctx->sampler_view[i]->texture);
|
||||||
|
|
||||||
|
/* if texture was modified since the last update,
|
||||||
|
* we need to clear the texture cache and possibly
|
||||||
|
* resolve/update ts
|
||||||
|
*/
|
||||||
|
etna_update_sampler_source(ctx->sampler_view[i], i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
list_for_each_entry(struct etna_hw_query, hq, &ctx->active_hw_queries, node)
|
list_for_each_entry(struct etna_hw_query, hq, &ctx->active_hw_queries, node)
|
||||||
resource_written(ctx, hq->prsc);
|
resource_written(ctx, hq->prsc);
|
||||||
|
|
||||||
|
|
|
@ -73,14 +73,26 @@ etna_bind_sampler_states(struct pipe_context *pctx, enum pipe_shader_type shader
|
||||||
ctx->dirty |= ETNA_DIRTY_SAMPLERS;
|
ctx->dirty |= ETNA_DIRTY_SAMPLERS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static bool
|
||||||
etna_configure_sampler_ts(struct etna_sampler_ts *sts, struct pipe_sampler_view *pview, bool enable)
|
etna_configure_sampler_ts(struct etna_sampler_ts *sts, struct pipe_sampler_view *pview, bool enable)
|
||||||
{
|
{
|
||||||
|
bool dirty = (sts->enable != enable);
|
||||||
|
|
||||||
assert(sts);
|
assert(sts);
|
||||||
sts->enable = enable;
|
sts->enable = enable;
|
||||||
if (enable) {
|
|
||||||
|
if (!enable) {
|
||||||
|
sts->TS_SAMPLER_CONFIG = 0;
|
||||||
|
sts->TS_SAMPLER_STATUS_BASE.bo = NULL;
|
||||||
|
return dirty;
|
||||||
|
}
|
||||||
|
|
||||||
struct etna_resource *rsc = etna_resource(pview->texture);
|
struct etna_resource *rsc = etna_resource(pview->texture);
|
||||||
struct etna_resource_level *lev = &rsc->levels[0];
|
struct etna_resource_level *lev = &rsc->levels[0];
|
||||||
|
|
||||||
|
if (lev->clear_value != sts->TS_SAMPLER_CLEAR_VALUE)
|
||||||
|
dirty = true;
|
||||||
|
|
||||||
assert(rsc->ts_bo && lev->ts_valid);
|
assert(rsc->ts_bo && lev->ts_valid);
|
||||||
|
|
||||||
sts->mode = lev->ts_mode;
|
sts->mode = lev->ts_mode;
|
||||||
|
@ -93,11 +105,8 @@ etna_configure_sampler_ts(struct etna_sampler_ts *sts, struct pipe_sampler_view
|
||||||
sts->TS_SAMPLER_STATUS_BASE.bo = rsc->ts_bo;
|
sts->TS_SAMPLER_STATUS_BASE.bo = rsc->ts_bo;
|
||||||
sts->TS_SAMPLER_STATUS_BASE.offset = lev->ts_offset;
|
sts->TS_SAMPLER_STATUS_BASE.offset = lev->ts_offset;
|
||||||
sts->TS_SAMPLER_STATUS_BASE.flags = ETNA_RELOC_READ;
|
sts->TS_SAMPLER_STATUS_BASE.flags = ETNA_RELOC_READ;
|
||||||
} else {
|
|
||||||
sts->TS_SAMPLER_CONFIG = 0;
|
return dirty;
|
||||||
sts->TS_SAMPLER_STATUS_BASE.bo = NULL;
|
|
||||||
}
|
|
||||||
/* n.b.: relies on caller to mark ETNA_DIRTY_SAMPLER_VIEWS */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return true if the GPU can use sampler TS with this sampler view.
|
/* Return true if the GPU can use sampler TS with this sampler view.
|
||||||
|
@ -121,6 +130,7 @@ etna_can_use_sampler_ts(struct pipe_sampler_view *view, int num)
|
||||||
*/
|
*/
|
||||||
struct etna_resource *rsc = etna_resource(view->texture);
|
struct etna_resource *rsc = etna_resource(view->texture);
|
||||||
struct etna_screen *screen = etna_screen(rsc->base.screen);
|
struct etna_screen *screen = etna_screen(rsc->base.screen);
|
||||||
|
|
||||||
return VIV_FEATURE(screen, chipMinorFeatures2, TEXTURE_TILED_READ) &&
|
return VIV_FEATURE(screen, chipMinorFeatures2, TEXTURE_TILED_READ) &&
|
||||||
num < VIVS_TS_SAMPLER__LEN &&
|
num < VIVS_TS_SAMPLER__LEN &&
|
||||||
rsc->base.target != PIPE_BUFFER &&
|
rsc->base.target != PIPE_BUFFER &&
|
||||||
|
@ -129,7 +139,7 @@ etna_can_use_sampler_ts(struct pipe_sampler_view *view, int num)
|
||||||
rsc->levels[0].ts_valid;
|
rsc->levels[0].ts_valid;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
void
|
||||||
etna_update_sampler_source(struct pipe_sampler_view *view, int num)
|
etna_update_sampler_source(struct pipe_sampler_view *view, int num)
|
||||||
{
|
{
|
||||||
struct etna_resource *base = etna_resource(view->texture);
|
struct etna_resource *base = etna_resource(view->texture);
|
||||||
|
@ -147,6 +157,7 @@ etna_update_sampler_source(struct pipe_sampler_view *view, int num)
|
||||||
etna_copy_resource(view->context, &to->base, &from->base, 0,
|
etna_copy_resource(view->context, &to->base, &from->base, 0,
|
||||||
view->texture->last_level);
|
view->texture->last_level);
|
||||||
to->seqno = from->seqno;
|
to->seqno = from->seqno;
|
||||||
|
ctx->dirty |= ETNA_DIRTY_TEXTURE_CACHES;
|
||||||
} else if ((to == from) && etna_resource_needs_flush(to)) {
|
} else if ((to == from) && etna_resource_needs_flush(to)) {
|
||||||
if (ctx->ts_for_sampler_view && etna_can_use_sampler_ts(view, num)) {
|
if (ctx->ts_for_sampler_view && etna_can_use_sampler_ts(view, num)) {
|
||||||
enable_sampler_ts = true;
|
enable_sampler_ts = true;
|
||||||
|
@ -156,10 +167,16 @@ etna_update_sampler_source(struct pipe_sampler_view *view, int num)
|
||||||
etna_copy_resource(view->context, &to->base, &from->base, 0,
|
etna_copy_resource(view->context, &to->base, &from->base, 0,
|
||||||
view->texture->last_level);
|
view->texture->last_level);
|
||||||
to->flush_seqno = from->seqno;
|
to->flush_seqno = from->seqno;
|
||||||
|
ctx->dirty |= ETNA_DIRTY_TEXTURE_CACHES;
|
||||||
}
|
}
|
||||||
|
} else if ((to == from) && (to->flush_seqno < from->seqno)) {
|
||||||
|
to->flush_seqno = from->seqno;
|
||||||
|
ctx->dirty |= ETNA_DIRTY_TEXTURE_CACHES;
|
||||||
}
|
}
|
||||||
if (ctx->ts_for_sampler_view) {
|
if (ctx->ts_for_sampler_view &&
|
||||||
etna_configure_sampler_ts(ctx->ts_for_sampler_view(view), view, enable_sampler_ts);
|
etna_configure_sampler_ts(ctx->ts_for_sampler_view(view), view, enable_sampler_ts)) {
|
||||||
|
ctx->dirty |= ETNA_DIRTY_SAMPLER_VIEWS | ETNA_DIRTY_TEXTURE_CACHES;
|
||||||
|
ctx->dirty_sampler_views |= (1 << num);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -277,11 +294,6 @@ etna_set_sampler_views(struct pipe_context *pctx, enum pipe_shader_type shader,
|
||||||
|
|
||||||
ctx->dirty |= ETNA_DIRTY_SAMPLER_VIEWS | ETNA_DIRTY_TEXTURE_CACHES;
|
ctx->dirty |= ETNA_DIRTY_SAMPLER_VIEWS | ETNA_DIRTY_TEXTURE_CACHES;
|
||||||
|
|
||||||
for (unsigned idx = 0; idx < num_views; ++idx) {
|
|
||||||
if (views[idx])
|
|
||||||
etna_update_sampler_source(views[idx], idx);
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (shader) {
|
switch (shader) {
|
||||||
case PIPE_SHADER_FRAGMENT:
|
case PIPE_SHADER_FRAGMENT:
|
||||||
etna_fragtex_set_sampler_views(ctx, num_views, views);
|
etna_fragtex_set_sampler_views(ctx, num_views, views);
|
||||||
|
|
|
@ -61,4 +61,8 @@ etna_texture_handle_incompatible(struct pipe_context *pctx, struct pipe_resource
|
||||||
uint32_t
|
uint32_t
|
||||||
active_samplers_bits(struct etna_context *ctx);
|
active_samplers_bits(struct etna_context *ctx);
|
||||||
|
|
||||||
|
/* update TS / cache for a sampler if required */
|
||||||
|
void
|
||||||
|
etna_update_sampler_source(struct pipe_sampler_view *view, int num);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue