Mesa (master): st/mesa: consider texture view format for fbo blits

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5d9bfcac0663e1dfc935f1d3b09e176c2d544532
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d9bfcac0663e1dfc935f1d3b09e176c2d544532

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Thu Jan  7 15:50:03 2021 +0100

st/mesa: consider texture view format for fbo blits

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4034
Acked-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8387>

---

 src/mesa/state_tracker/st_cb_blit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c
index fd82a7f9dd1..526fb7e7e78 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);