Module: Mesa Branch: master Commit: 19db1a540c248e330284a6c9733633d0695677a3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=19db1a540c248e330284a6c9733633d0695677a3
Author: Marek Olšák <[email protected]> Date: Sun Apr 26 10:50:24 2020 -0400 radeonsi: add a workaround to fix KHR-GL45.texture_view.view_classes on gfx9 Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4761> --- src/gallium/drivers/radeonsi/si_texture.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index afe79550fe1..c1cf4c86893 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -1843,6 +1843,21 @@ static void *si_texture_transfer_map(struct pipe_context *ctx, struct pipe_resou assert(!(texture->flags & SI_RESOURCE_FLAG_TRANSFER)); assert(box->width && box->height && box->depth); + /* If we are uploading into FP16 or R11G11B10_FLOAT via a blit, CB clobbers NaNs, + * so in order to preserve them exactly, we have to use the compute blit. + * The compute blit is used only when the destination doesn't have DCC, so + * disable it here, which is kinda a hack. + * + * This makes KHR-GL45.texture_view.view_classes pass on gfx9. + * gfx10 has the same issue, but the test doesn't use a large enough texture + * to enable DCC and fail, so it always passes. + */ + const struct util_format_description *desc = util_format_description(texture->format); + if (vi_dcc_enabled(tex, level) && + desc->channel[0].type == UTIL_FORMAT_TYPE_FLOAT && + desc->channel[0].size < 32) + si_texture_disable_dcc(sctx, tex); + if (tex->is_depth) { /* Depth textures use staging unconditionally. */ use_staging_texture = true; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
