From b26f510978d3695dcede49892d6702a605cfbcc5 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Wed, 13 Jan 2021 14:31:05 -0800 Subject: [PATCH] gallium: Flush GL API resources in eglCreateImage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some drivers need to be able to remove compression from resources before they are handed to consumers that wouldn't understand or expect it. Cc: mesa-stable Reviewed-by: Marek Olšák Part-of: --- src/gallium/frontends/dri/dri_helpers.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/dri/dri_helpers.c b/src/gallium/frontends/dri/dri_helpers.c index c73e442444c..bf71e23e91e 100644 --- a/src/gallium/frontends/dri/dri_helpers.c +++ b/src/gallium/frontends/dri/dri_helpers.c @@ -258,7 +258,9 @@ dri2_create_image_from_renderbuffer2(__DRIcontext *context, int renderbuffer, void *loaderPrivate, unsigned *error) { - struct gl_context *ctx = ((struct st_context *)dri_context(context)->st)->ctx; + struct st_context *st_ctx = (struct st_context *)dri_context(context)->st; + struct gl_context *ctx = st_ctx->ctx; + struct pipe_context *p_ctx = st_ctx->pipe; struct gl_renderbuffer *rb; struct pipe_resource *tex; __DRIimage *img; @@ -300,6 +302,13 @@ dri2_create_image_from_renderbuffer2(__DRIcontext *context, pipe_resource_reference(&img->texture, tex); + /* If the resource supports EGL_MESA_image_dma_buf_export, make sure that + * it's in a shareable state. Do this now while we still have the access to + * the context. + */ + if (dri2_get_mapping_by_format(img->dri_format)) + p_ctx->flush_resource(p_ctx, tex); + *error = __DRI_IMAGE_ERROR_SUCCESS; return img; } @@ -338,7 +347,9 @@ dri2_create_from_texture(__DRIcontext *context, int target, unsigned texture, void *loaderPrivate) { __DRIimage *img; - struct gl_context *ctx = ((struct st_context *)dri_context(context)->st)->ctx; + struct st_context *st_ctx = (struct st_context *)dri_context(context)->st; + struct gl_context *ctx = st_ctx->ctx; + struct pipe_context *p_ctx = st_ctx->pipe; struct gl_texture_object *obj; struct pipe_resource *tex; GLuint face = 0; @@ -389,6 +400,13 @@ dri2_create_from_texture(__DRIcontext *context, int target, unsigned texture, pipe_resource_reference(&img->texture, tex); + /* If the resource supports EGL_MESA_image_dma_buf_export, make sure that + * it's in a shareable state. Do this now while we still have the access to + * the context. + */ + if (dri2_get_mapping_by_format(img->dri_format)) + p_ctx->flush_resource(p_ctx, tex); + *error = __DRI_IMAGE_ERROR_SUCCESS; return img; }