Analogous to bound textures/images. We should also update the resident descriptors and disable COMPRESSION_EN for avoiding useless DCC fetches, but I postpone this optimization for a separate series.
v2: - store pipe_sampler_view instead of si_sampler_view Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> --- src/gallium/drivers/radeonsi/si_blit.c | 62 +++++++++++++++++++++++++++ src/gallium/drivers/radeonsi/si_descriptors.c | 16 +++++++ 2 files changed, 78 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 998288dba2..343ca35736 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -611,6 +611,64 @@ static void si_check_render_feedback_images(struct si_context *sctx, } } +static void si_check_render_feedback_resident_textures(struct si_context *sctx) +{ + unsigned num_resident_tex_handles; + unsigned i; + + num_resident_tex_handles = sctx->resident_tex_handles.size / + sizeof(struct si_texture_handle *); + + for (i = 0; i < num_resident_tex_handles; i++) { + struct si_texture_handle *tex_handle = + *util_dynarray_element(&sctx->resident_tex_handles, + struct si_texture_handle *, i); + struct pipe_sampler_view *view; + struct r600_texture *tex; + + view = tex_handle->view; + if (view->texture->target == PIPE_BUFFER) + continue; + + tex = (struct r600_texture *)view->texture; + + si_check_render_feedback_texture(sctx, tex, + view->u.tex.first_level, + view->u.tex.last_level, + view->u.tex.first_layer, + view->u.tex.last_layer); + } +} + +static void si_check_render_feedback_resident_images(struct si_context *sctx) +{ + unsigned num_resident_img_handles; + unsigned i; + + num_resident_img_handles = sctx->resident_img_handles.size / + sizeof(struct si_image_handle *); + + for (i = 0; i < num_resident_img_handles; i++) { + struct si_image_handle *img_handle = + *util_dynarray_element(&sctx->resident_img_handles, + struct si_image_handle *, i); + struct pipe_image_view *view; + struct r600_texture *tex; + + view = &img_handle->view; + if (view->resource->target == PIPE_BUFFER) + continue; + + tex = (struct r600_texture *)view->resource; + + si_check_render_feedback_texture(sctx, tex, + view->u.tex.level, + view->u.tex.level, + view->u.tex.first_layer, + view->u.tex.last_layer); + } +} + static void si_check_render_feedback(struct si_context *sctx) { @@ -621,6 +679,10 @@ static void si_check_render_feedback(struct si_context *sctx) si_check_render_feedback_images(sctx, &sctx->images[i]); si_check_render_feedback_textures(sctx, &sctx->samplers[i]); } + + si_check_render_feedback_resident_images(sctx); + si_check_render_feedback_resident_textures(sctx); + sctx->need_check_render_feedback = false; } diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index e40f1230c4..195ec4ef99 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -2248,6 +2248,13 @@ static void si_make_texture_handle_resident(struct pipe_context *ctx, sview = (struct si_sampler_view *)tex_handle->view; if (resident) { + if (sview->base.texture->target != PIPE_BUFFER) { + struct r600_texture *rtex = + (struct r600_texture *)sview->base.texture; + + si_update_check_render_feedback(sctx, rtex); + } + /* Add the texture handle to the per-context list. */ util_dynarray_append(&sctx->resident_tex_handles, struct si_texture_handle *, tex_handle); @@ -2350,6 +2357,15 @@ static void si_make_image_handle_resident(struct pipe_context *ctx, view = &img_handle->view; if (resident) { + struct r600_resource *res = + (struct r600_resource *)view->resource; + + if (res->b.b.target != PIPE_BUFFER) { + struct r600_texture *rtex = (struct r600_texture *)res; + + si_update_check_render_feedback(sctx, rtex); + } + /* Add the image handle to the per-context list. */ util_dynarray_append(&sctx->resident_img_handles, struct si_image_handle *, img_handle); -- 2.13.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev