KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panfrost: Optimise recalculation of max sampler view 

Previously we always searched through 128 sampler views for set
sampler views, now we never look above the maximum updated view.

Fixes: 304851422a ("panfrost: Fix set_sampler_views for big GL")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15366>
This commit is contained in:
Icecream95 2021-10-14 16:39:59 +13:00 committed by Marge Bot
parent 3e405afeb9
commit d5870c45ae
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gallium/drivers/panfrost/pan_context.c
View File

@ -627,12 +627,16 @@ panfrost_set_sampler_views(
struct panfrost_context *ctx = pan_context(pctx);
ctx->dirty_shader[shader] |= PAN_DIRTY_STAGE_TEXTURE;
unsigned new_nr = 0;
unsigned i;
for (i = 0; i < num_views; ++i) {
struct pipe_sampler_view *view = views ? views[i] : NULL;
unsigned p = i + start_slot;
if (view)
new_nr = p + 1;
if (take_ownership) {
pipe_sampler_view_reference((struct pipe_sampler_view **)&ctx->sampler_views[shader][p],
NULL);
@ -649,13 +653,21 @@ panfrost_set_sampler_views(
NULL);
}
/* Recalculate sampler view count */
ctx->sampler_view_count[shader] = 0;
/* If the sampler view count is higher than the greatest sampler view
* we touch, it can't change */
if (ctx->sampler_view_count[shader] > start_slot + num_views + unbind_num_trailing_slots)
return;
for (i = 0; i < ARRAY_SIZE(ctx->sampler_views[shader]); ++i) {
if (ctx->sampler_views[shader][i])
ctx->sampler_view_count[shader] = i + 1;
/* If we haven't set any sampler views here, search lower numbers for
* set sampler views */
if (new_nr == 0) {
for (i = 0; i < start_slot; ++i) {
if (ctx->sampler_views[shader][i])
new_nr = i + 1;
}
}
ctx->sampler_view_count[shader] = new_nr;
}
static void