fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Lift restriction in external textures for EGLImage support

Browse source 
Fixes Skqp's unitTest_EGLImageTest test.

For Intel platforms, we support external textures only for EGLImages
created with EGL_EXT_image_dma_buf_import. This restriction seems to
be Intel specific and not present for other platforms.

While running SKQP test - unitTest_EGLImageTest, GL_INVALID is sent
to the test because of this restriction.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105301
Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
This commit is contained in:
Aditya Swarup 2018-10-31 17:12:40 -07:00 • committed by Chad Versace
parent c5a4c26450
commit a5c39ed974
3 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/i965/intel_image.h
View file

@ -89,9 +89,6 @@ struct __DRIimageRec {
GLuint tile_y;
bool has_depthstencil;
/** The image was created with EGL_EXT_image_dma_buf_import. */
bool dma_buf_imported;
/** Offset of the auxiliary compression surface in the bo. */
uint32_t aux_offset;

2
src/mesa/drivers/dri/i965/intel_screen.c
View file

@ -957,7 +957,6 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate)
image->tile_y = orig_image->tile_y;
image->has_depthstencil = orig_image->has_depthstencil;
image->data = loaderPrivate;
image->dma_buf_imported = orig_image->dma_buf_imported;
image->aux_offset = orig_image->aux_offset;
image->aux_pitch = orig_image->aux_pitch;
@ -1237,7 +1236,6 @@ intel_create_image_from_dma_bufs2(__DRIscreen *dri_screen,
return NULL;
}
image->dma_buf_imported = true;
image->yuv_color_space = yuv_color_space;
image->sample_range = sample_range;
image->horizontal_siting = horizontal_siting;

10
src/mesa/drivers/dri/i965/intel_tex_image.c
View file

@ -614,16 +614,6 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
if (image == NULL)
return;
/* We support external textures only for EGLImages created with
* EGL_EXT_image_dma_buf_import. We may lift that restriction in the future.
*/
if (target == GL_TEXTURE_EXTERNAL_OES && !image->dma_buf_imported) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glEGLImageTargetTexture2DOES(external target is enabled only "
"for images created with EGL_EXT_image_dma_buf_import");
return;
}
/* Disallow depth/stencil textures: we don't have a way to pass the
* separate stencil miptree of a GL_DEPTH_STENCIL texture through.
*/