From 274c5945591db739e36894e02ebf2a6d70bb0f4e Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 7 Jan 2021 15:50:03 +0100 Subject: [PATCH] st/mesa: consider texture view format for fbo blits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4034 Acked-by: Gert Wollny Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 5d9bfcac0663e1dfc935f1d3b09e176c2d544532) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_cb_blit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1760e516716..ec1b73b0f91 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -27922,7 +27922,7 @@ "description": "st/mesa: consider texture view format for fbo blits", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index cf55eff6e5c..b00f07a65a2 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -196,7 +196,7 @@ st_BlitFramebuffer(struct gl_context *ctx, blit.src.resource = srcObj->pt; blit.src.level = srcAtt->TextureLevel; blit.src.box.z = srcAtt->Zoffset + srcAtt->CubeMapFace; - blit.src.format = srcObj->pt->format; + blit.src.format = srcObj->surface_based ? srcObj->surface_format : srcObj->pt->format; if (!ctx->Color.sRGBEnabled) blit.src.format = util_format_linear(blit.src.format);