From f5947c2bc72a630d1abd2a12221d8dafd3a24be4 Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Mon, 12 Nov 2012 13:38:08 +0200 Subject: [PATCH] i965: enable image external sampling for imported dma-buffers Signed-off-by: Topi Pohjolainen Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/intel_extensions.c | 1 + src/mesa/drivers/dri/i965/intel_tex_image.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index 409d40b2740..655467c3cfb 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -122,6 +122,7 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.OES_EGL_image = true; ctx->Extensions.OES_draw_texture = true; ctx->Extensions.OES_standard_derivatives = true; + ctx->Extensions.OES_EGL_image_external = true; if (brw->gen >= 6) ctx->Const.GLSLVersion = 140; diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c index 178541d89bd..7db0deb50db 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c @@ -379,6 +379,13 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target, return; } + 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. */ -- 2.30.2