Mesa (main): mesa/main: Check for fbo attachments when importing EGL images to textures

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jul 28 20:47:38 UTC 2021


Module: Mesa
Branch: main
Commit: 3d64a97cf694a8f36d2a285a83b30c2558aac334
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d64a97cf694a8f36d2a285a83b30c2558aac334

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Wed Jul 21 10:30:26 2021 -0700

mesa/main: Check for fbo attachments when importing EGL images to textures

Fixes an assert when binding an fbo with a texture bound to one of its attachments,
if the texture was updated with an EGL image after it was bound.

Cc: mesa-stable
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11998>

---

 src/mesa/main/teximage.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 4f33e34a395..3b17a462c45 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3452,6 +3452,8 @@ egl_image_target_texture(struct gl_context *ctx,
    if (tex_storage)
       _mesa_set_texture_view_state(ctx, texObj, target, 1);
 
+   _mesa_update_fbo_texture(ctx, texObj, 0, 0);
+
    _mesa_unlock_texture(ctx, texObj);
 }
 



More information about the mesa-commit mailing list