From dac3bc986281cdce3299bc197c0f19429b321747 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 7 Jun 2019 10:31:59 -0700 Subject: [PATCH] freedreno/a6xx: handle non-UBWC-compatible texture views Signed-off-by: Rob Clark Reviewed-by: Kristian H. Kristensen --- src/gallium/drivers/freedreno/a6xx/fd6_resource.c | 18 ++++++++++++++++++ src/gallium/drivers/freedreno/a6xx/fd6_resource.h | 2 ++ src/gallium/drivers/freedreno/a6xx/fd6_texture.c | 3 +++ 3 files changed, 23 insertions(+) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c index ca475f3..d855ad1 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.c @@ -260,6 +260,24 @@ fd6_fill_ubwc_buffer_sizes(struct fd_resource *rsc) return meta_size; } +/** + * Ensure the rsc is in an ok state to be used with the specified format. + * This handles the case of UBWC buffers used with non-UBWC compatible + * formats, by triggering an uncompress. + */ +void +fd6_validate_format(struct fd_context *ctx, struct fd_resource *rsc, + enum pipe_format format) +{ + if (!rsc->ubwc_size) + return; + + if (ok_ubwc_format(fd6_pipe2color(format))) + return; + + fd_resource_uncompress(ctx, rsc); +} + uint32_t fd6_setup_slices(struct fd_resource *rsc) { diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.h b/src/gallium/drivers/freedreno/a6xx/fd6_resource.h index 83b6fb2..80751d4 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.h @@ -31,6 +31,8 @@ #include "freedreno_resource.h" uint32_t fd6_fill_ubwc_buffer_sizes(struct fd_resource *rsc); +void fd6_validate_format(struct fd_context *ctx, struct fd_resource *rsc, + enum pipe_format format); uint32_t fd6_setup_slices(struct fd_resource *rsc); #endif /* FD6_RESOURCE_H_ */ diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_texture.c b/src/gallium/drivers/freedreno/a6xx/fd6_texture.c index 608aa08..2cb69e0 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_texture.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_texture.c @@ -33,6 +33,7 @@ #include "util/hash_table.h" #include "fd6_texture.h" +#include "fd6_resource.h" #include "fd6_format.h" #include "fd6_emit.h" @@ -225,6 +226,8 @@ fd6_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc, if (!so) return NULL; + fd6_validate_format(fd_context(pctx), rsc, format); + if (format == PIPE_FORMAT_X32_S8X24_UINT) { rsc = rsc->stencil; format = rsc->base.format; -- 2.7.4