blob: b89d78e05bd1ba11dc778989d09123ddbf599963 [file] [log] [blame]
From 882f43cabf27d37b35a0e15eda24dcabe99dd38a Mon Sep 17 00:00:00 2001
From: Zach Reizner <zachr@google.com>
Date: Fri, 3 Oct 2014 16:20:10 -0700
Subject: [PATCH 12/39] CHROMIUM: i965: remove read-only restriction of
imported buffers
Previously, there was a patch that already did this but there was
collateral damage to the OES_EGL_image_external extension that turned it
off. This change remodels the original patches to keep
OES_EGL_image_external turned on.
BUG=chromium:436842
TEST=None
Signed-off-by: Prince Agyeman <prince.agyeman@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: James Ausmus <james.ausmus@intel.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
---
src/mesa/drivers/dri/i965/intel_image.h | 3 ---
src/mesa/drivers/dri/i965/intel_screen.c | 1 -
src/mesa/drivers/dri/i965/intel_tex_image.c | 10 ----------
3 files changed, 14 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/intel_image.h b/src/mesa/drivers/dri/i965/intel_image.h
index cf06105..d0c5351 100644
--- a/src/mesa/drivers/dri/i965/intel_image.h
+++ b/src/mesa/drivers/dri/i965/intel_image.h
@@ -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;
-
/**
* Provided by EGL_EXT_image_dma_buf_import.
* \{
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 5adb8ef..10001a2 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1014,7 +1014,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;
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index beed160..1d12e56 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -333,16 +333,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.
*/
--
2.7.4