From a6fe1eeb058c746da96cb9afae59f4bad7f1fb0c Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 7 Jan 2021 15:50:46 +0100 Subject: [PATCH] mesa/fbo: don't check_end_texture_render on fb read change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/fbobject.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index fb3ecace034..798f59d2499 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -3121,9 +3121,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); }