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

tc: always track fb attachments

Browse Source 
this should have no measurable impact on perf

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25624>
This commit is contained in:
Mike Blumenkrantz
2023-10-04 13:42:52 -04:00
committed by Marge Bot
parent 6d236917a9
commit 39de1ce660
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/util/u_threaded_context.c
+10 -17
View File
@@ -1460,7 +1460,14 @@ tc_set_framebuffer_state(struct pipe_context *_pipe,
p->state.layers = fb->layers;
p->state.nr_cbufs = nr_cbufs;
for (unsigned i = 0; i < nr_cbufs; i++) {
p->state.cbufs[i] = NULL;
pipe_surface_reference(&p->state.cbufs[i], fb->cbufs[i]);
/* full tracking requires storing the fb attachment resources */
tc->fb_resources[i] = fb->cbufs[i] ? fb->cbufs[i]->texture : NULL;
}
memset(&tc->fb_resources[nr_cbufs], 0,
sizeof(void*) * (PIPE_MAX_COLOR_BUFS - nr_cbufs));
if (tc->options.parse_renderpass_info) {
/* ensure this is treated as the first fb set if no fb activity has occurred */
if (!tc->renderpass_info_recording->has_draw &&
@@ -1476,17 +1483,6 @@ tc_set_framebuffer_state(struct pipe_context *_pipe,
bool zsbuf_changed = tc->fb_resources[PIPE_MAX_COLOR_BUFS] !=
(fb->zsbuf ? fb->zsbuf->texture : NULL);
for (unsigned i = 0; i < nr_cbufs; i++) {
p->state.cbufs[i] = NULL;
pipe_surface_reference(&p->state.cbufs[i], fb->cbufs[i]);
/* full tracking requires storing the fb attachment resources */
tc->fb_resources[i] = fb->cbufs[i] ? fb->cbufs[i]->texture : NULL;
}
memset(&tc->fb_resources[nr_cbufs], 0,
sizeof(void*) * (PIPE_MAX_COLOR_BUFS - nr_cbufs));
tc->fb_resources[PIPE_MAX_COLOR_BUFS] = fb->zsbuf ? fb->zsbuf->texture : NULL;
tc->fb_resolve = fb->resolve;
if (tc->seen_fb_state) {
/* this is the end of a renderpass, so increment the renderpass info */
tc_batch_increment_renderpass_info(tc, tc->next, false);
@@ -1503,12 +1499,9 @@ tc_set_framebuffer_state(struct pipe_context *_pipe,
}
/* future fb state changes will increment the index */
tc->seen_fb_state = true;
} else {
for (unsigned i = 0; i < nr_cbufs; i++) {
p->state.cbufs[i] = NULL;
pipe_surface_reference(&p->state.cbufs[i], fb->cbufs[i]);
}
}
tc->fb_resources[PIPE_MAX_COLOR_BUFS] = fb->zsbuf ? fb->zsbuf->texture : NULL;
tc->fb_resolve = fb->resolve;
tc->in_renderpass = false;
p->state.zsbuf = NULL;
pipe_surface_reference(&p->state.zsbuf, fb->zsbuf);