X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_cb_eglimage.c;h=d6b93c3dbe8bdba18f161ff8f9c0140f81e7f48e;hb=42d31e0516d64bca45a45f73e6a2f7f40e6daa4b;hp=a924f8722327921c5867a6b12270cf571235cd3b;hpb=64644ec3b21884d4a974fa29087fa98c4ed9e112;p=mesa.git diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c index a924f872232..d6b93c3dbe8 100644 --- a/src/mesa/state_tracker/st_cb_eglimage.c +++ b/src/mesa/state_tracker/st_cb_eglimage.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * @@ -26,18 +25,84 @@ * Chia-I Wu */ +#include "main/errors.h" #include "main/texobj.h" -#include "main/texfetch.h" #include "main/teximage.h" #include "util/u_inlines.h" #include "util/u_format.h" #include "st_cb_eglimage.h" #include "st_cb_fbo.h" +#include "st_context.h" #include "st_texture.h" #include "st_format.h" #include "st_manager.h" +#include "st_sampler_view.h" +#include "util/u_surface.h" -#if FEATURE_OES_EGL_image +static bool +is_format_supported(struct pipe_screen *screen, enum pipe_format format, + unsigned nr_samples, unsigned nr_storage_samples, + unsigned usage) +{ + bool supported = screen->is_format_supported(screen, format, PIPE_TEXTURE_2D, + nr_samples, nr_storage_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, + nr_storage_samples, usage); + } else if (format == PIPE_FORMAT_NV12) { + supported = screen->is_format_supported(screen, PIPE_FORMAT_R8_UNORM, + PIPE_TEXTURE_2D, nr_samples, + nr_storage_samples, usage) && + screen->is_format_supported(screen, PIPE_FORMAT_R8G8_UNORM, + PIPE_TEXTURE_2D, nr_samples, + nr_storage_samples, usage); + } + } + + return supported; +} + +/** + * Return the gallium texture of an EGLImage. + */ +static bool +st_get_egl_image(struct gl_context *ctx, GLeglImageOES image_handle, + unsigned usage, const char *error, struct st_egl_image *out) +{ + struct st_context *st = st_context(ctx); + struct pipe_screen *screen = st->pipe->screen; + struct st_manager *smapi = + (struct st_manager *) st->iface.st_context_private; + + if (!smapi || !smapi->get_egl_image) + return false; + + memset(out, 0, sizeof(*out)); + if (!smapi->get_egl_image(smapi, (void *) image_handle, out)) { + /* image_handle does not refer to a valid EGL image object */ + _mesa_error(ctx, GL_INVALID_VALUE, "%s(image handle not found)", error); + return false; + } + + if (!is_format_supported(screen, out->format, out->texture->nr_samples, + out->texture->nr_storage_samples, usage)) { + /* unable to specify a texture object using the specified EGL image */ + pipe_resource_reference(&out->texture, NULL); + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(format not supported)", error); + return false; + } + + return true; +} /** * Return the base format just like _mesa_base_fbo_format does. @@ -52,7 +117,7 @@ st_pipe_format_to_base_format(enum pipe_format format) base_format = GL_DEPTH_STENCIL; } else { - if (format == PIPE_FORMAT_S8_USCALED) + if (format == PIPE_FORMAT_S8_UINT) base_format = GL_STENCIL_INDEX; else base_format = GL_DEPTH_COMPONENT; @@ -70,26 +135,42 @@ st_pipe_format_to_base_format(enum pipe_format format) } static void -st_egl_image_target_renderbuffer_storage(GLcontext *ctx, +st_egl_image_target_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, GLeglImageOES image_handle) { - struct st_context *st = ctx->st; struct st_renderbuffer *strb = st_renderbuffer(rb); - struct pipe_surface *ps; - unsigned usage; + struct st_egl_image stimg; + + if (st_get_egl_image(ctx, image_handle, PIPE_BIND_RENDER_TARGET, + "glEGLImageTargetRenderbufferStorage", + &stimg)) { + struct pipe_context *pipe = st_context(ctx)->pipe; + struct pipe_surface *ps, surf_tmpl; + + u_surface_default_template(&surf_tmpl, stimg.texture); + surf_tmpl.format = stimg.format; + surf_tmpl.u.tex.level = stimg.level; + surf_tmpl.u.tex.first_layer = stimg.layer; + surf_tmpl.u.tex.last_layer = stimg.layer; + ps = pipe->create_surface(pipe, stimg.texture, &surf_tmpl); + pipe_resource_reference(&stimg.texture, NULL); + + if (!ps) + return; - usage = PIPE_BIND_RENDER_TARGET | PIPE_BIND_BLIT_SOURCE | PIPE_BIND_BLIT_DESTINATION; - ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage); - if (ps) { strb->Base.Width = ps->width; strb->Base.Height = ps->height; strb->Base.Format = st_pipe_format_to_mesa_format(ps->format); - strb->Base.DataType = st_format_datatype(ps->format); strb->Base._BaseFormat = st_pipe_format_to_base_format(ps->format); strb->Base.InternalFormat = strb->Base._BaseFormat; - pipe_surface_reference(&strb->surface, ps); + struct pipe_surface **psurf = + util_format_is_srgb(ps->format) ? &strb->surface_srgb : + &strb->surface_linear; + + pipe_surface_reference(psurf, ps); + strb->surface = *psurf; pipe_resource_reference(&strb->texture, ps->texture); pipe_surface_reference(&ps, NULL); @@ -97,17 +178,20 @@ st_egl_image_target_renderbuffer_storage(GLcontext *ctx, } static void -st_bind_surface(GLcontext *ctx, GLenum target, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage, - struct pipe_surface *ps) +st_bind_egl_image(struct gl_context *ctx, + struct gl_texture_object *texObj, + struct gl_texture_image *texImage, + struct st_egl_image *stimg) { + struct st_context *st = st_context(ctx); struct st_texture_object *stObj; struct st_texture_image *stImage; GLenum internalFormat; + mesa_format texFormat; /* map pipe format to base format */ - if (util_format_get_component_bits(ps->format, UTIL_FORMAT_COLORSPACE_RGB, 3) > 0) + if (util_format_get_component_bits(stimg->format, + UTIL_FORMAT_COLORSPACE_RGB, 3) > 0) internalFormat = GL_RGBA; else internalFormat = GL_RGB; @@ -117,37 +201,61 @@ st_bind_surface(GLcontext *ctx, GLenum target, /* switch to surface based */ if (!stObj->surface_based) { - _mesa_clear_texture_object(ctx, texObj); + _mesa_clear_texture_object(ctx, texObj, NULL); stObj->surface_based = GL_TRUE; } - _mesa_init_teximage_fields(ctx, target, texImage, - ps->width, ps->height, 1, 0, internalFormat); - texImage->TexFormat = st_pipe_format_to_mesa_format(ps->format); - _mesa_set_fetch_functions(texImage, 2); + texFormat = st_pipe_format_to_mesa_format(stimg->format); + + /* TODO RequiredTextureImageUnits should probably be reset back + * to 1 somewhere if different texture is bound?? + */ + if (texFormat == MESA_FORMAT_NONE) { + switch (stimg->format) { + case PIPE_FORMAT_NV12: + texFormat = MESA_FORMAT_R_UNORM8; + texObj->RequiredTextureImageUnits = 2; + break; + case PIPE_FORMAT_IYUV: + texFormat = MESA_FORMAT_R_UNORM8; + texObj->RequiredTextureImageUnits = 3; + break; + default: + unreachable("bad YUV format!"); + } + } - /* FIXME create a non-default sampler view from the pipe_surface? */ - pipe_resource_reference(&stImage->pt, ps->texture); + _mesa_init_teximage_fields(ctx, texImage, + stimg->texture->width0, stimg->texture->height0, + 1, 0, internalFormat, texFormat); - _mesa_dirty_texobj(ctx, texObj, GL_TRUE); + pipe_resource_reference(&stObj->pt, stimg->texture); + st_texture_release_all_sampler_views(st, stObj); + pipe_resource_reference(&stImage->pt, stObj->pt); + if (st->pipe->screen->resource_changed) + st->pipe->screen->resource_changed(st->pipe->screen, stImage->pt); + + stObj->surface_format = stimg->format; + stObj->level_override = stimg->level; + stObj->layer_override = stimg->layer; + + _mesa_dirty_texobj(ctx, texObj); } static void -st_egl_image_target_texture_2d(GLcontext *ctx, GLenum target, +st_egl_image_target_texture_2d(struct gl_context *ctx, GLenum target, struct gl_texture_object *texObj, struct gl_texture_image *texImage, GLeglImageOES image_handle) { - struct st_context *st = ctx->st; - struct pipe_surface *ps; - unsigned usage; - - usage = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_BLIT_DESTINATION | PIPE_BIND_BLIT_SOURCE; - ps = st_manager_get_egl_image_surface(st, (void *) image_handle, usage); - if (ps) { - st_bind_surface(ctx, target, texObj, texImage, ps); - pipe_surface_reference(&ps, NULL); - } + struct st_egl_image stimg; + + if (!st_get_egl_image(ctx, image_handle, PIPE_BIND_SAMPLER_VIEW, + "glEGLImageTargetTexture2D", &stimg)) + return; + + st_bind_egl_image(ctx, texObj, texImage, &stimg); + pipe_resource_reference(&stimg.texture, NULL); } void @@ -156,5 +264,3 @@ st_init_eglimage_functions(struct dd_function_table *functions) functions->EGLImageTargetTexture2D = st_egl_image_target_texture_2d; functions->EGLImageTargetRenderbufferStorage = st_egl_image_target_renderbuffer_storage; } - -#endif /* FEATURE_OES_EGL_image */