Module: Mesa Branch: staging/20.3 Commit: a731f0353e6be6465c70889eb498a17ce6d22215 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a731f0353e6be6465c70889eb498a17ce6d22215
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Thu Jan 7 15:50:46 2021 +0100 mesa/fbo: don't check_end_texture_render on fb read change Otherwise this resets is_rtt to false in st/mesa, and then breaks fbo + texture view. This change also aligns the code with the comment above: * Note that if the ReadBuffer has texture attachments we don't consider * that a render-to-texture case. Acked-by: Gert Wollny <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8387> (cherry picked from commit a6fe1eeb058c746da96cb9afae59f4bad7f1fb0c) --- .pick_status.json | 2 +- src/mesa/main/fbobject.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1021e7d578b..1760e516716 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -27913,7 +27913,7 @@ "description": "mesa/fbo: don't check_end_texture_render on fb read change", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 103b285e4b0..5a96b0e538f 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -3122,9 +3122,6 @@ _mesa_bind_framebuffers(struct gl_context *ctx, if (bindReadBuf) { FLUSH_VERTICES(ctx, _NEW_BUFFERS); - /* check if old readbuffer was render-to-texture */ - check_end_texture_render(ctx, oldReadFb); - _mesa_reference_framebuffer(&ctx->ReadBuffer, newReadFb); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
