From 1625d911d7368a9a96411012c69512074a3ff506 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Wed, 2 Nov 2016 16:18:44 -0700 Subject: [PATCH] anv/blorp: Don't create linear ASTC surfaces for buffers Such a surface is not possible on our hardware. Without this change, ISL surface creation would fail with the next patch. Signed-off-by: Nanley Chery Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_blorp.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c index 87f242cb258..0feb5d5567a 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -126,6 +126,22 @@ get_blorp_surf_for_anv_buffer(struct anv_device *device, struct blorp_surf *blorp_surf, struct isl_surf *isl_surf) { + const struct isl_format_layout *fmtl = + isl_format_get_layout(format); + + /* ASTC is the only format which doesn't support linear layouts. + * Create an equivalently sized surface with ISL to get around this. + */ + if (fmtl->txc == ISL_TXC_ASTC) { + /* Use an equivalently sized format */ + format = ISL_FORMAT_R32G32B32A32_UINT; + assert(fmtl->bpb == isl_format_get_layout(format)->bpb); + + /* Shrink the dimensions for the new format */ + width = DIV_ROUND_UP(width, fmtl->bw); + height = DIV_ROUND_UP(height, fmtl->bh); + } + *blorp_surf = (struct blorp_surf) { .surf = isl_surf, .addr = { -- 2.30.2