From 8b4588b090826a2da7c1b99497ed07705b149ae1 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 16 May 2017 10:29:44 -0400 Subject: [PATCH] mesa/st: fix yuv EGLImage's MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Don't reject YUV formats that the driver doesn't handle natively, since mesa/st already knows how to lower this in shader. Reported-by: Nicolas Dechesne Fixes: 83e9de2 ("st/mesa: EGLImageTarget* error handling") Cc: 17.1 Tested-by: Nicolas Dechesne Reviewed-by: Nicolai Hähnle --- src/mesa/state_tracker/st_cb_eglimage.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c index 3a62ef7..a104b64 100644 --- a/src/mesa/state_tracker/st_cb_eglimage.c +++ b/src/mesa/state_tracker/st_cb_eglimage.c @@ -39,6 +39,35 @@ #include "st_sampler_view.h" #include "util/u_surface.h" +static bool +is_format_supported(struct pipe_screen *screen, enum pipe_format format, + unsigned nr_samples, unsigned usage) +{ + bool supported = screen->is_format_supported(screen, format, PIPE_TEXTURE_2D, + nr_samples, usage); + + /* for sampling, some formats can be emulated.. it doesn't matter that + * the surface will have a format that the driver can't cope with because + * we'll give it sampler view formats that it can deal with and generate + * a shader variant that converts. + */ + if ((usage == PIPE_BIND_SAMPLER_VIEW) && !supported) { + if (format == PIPE_FORMAT_IYUV) { + supported = screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, + PIPE_TEXTURE_2D, nr_samples, + usage); + } else if (format == PIPE_FORMAT_NV12) { + supported = screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, + PIPE_TEXTURE_2D, nr_samples, + usage) && + screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM, + PIPE_TEXTURE_2D, nr_samples, + usage); + } + } + + return supported; +} /** * Return the surface of an EGLImage. @@ -65,8 +94,7 @@ st_egl_image_get_surface(struct gl_context *ctx, GLeglImageOES image_handle, return NULL; } - if (!screen->is_format_supported(screen, stimg.format, PIPE_TEXTURE_2D, - stimg.texture->nr_samples, usage)) { + if (!is_format_supported(screen, stimg.format, stimg.texture->nr_samples, usage)) { /* unable to specify a texture object using the specified EGL image */ _mesa_error(ctx, GL_INVALID_OPERATION, "%s(format not supported)", error); return NULL; -- 2.7.4