projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ac8a933)
meta: Disable GL_TEXTURE_EXTERNAL_OES in meta_begin()
authorChad Versace <chad.versace@linux.intel.com>
Thu, 22 Dec 2011 02:34:18 +0000 (18:34 -0800)
committerChad Versace <chad.versace@linux.intel.com>
Tue, 27 Dec 2011 18:20:25 +0000 (10:20 -0800)
If the meta flag MESA_META_TEXTURE is present, then disable the texture
target GL_TEXTURE_EXTERNAL_OES.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
src/mesa/drivers/common/meta.c patch | blob | history

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index e622673949a9791f131bd6864ec37134ab9829eb..5098680b6a821eecf088d893af7f1e6ab4150507 100644 (file)
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -588,6 +588,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
                _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
             if (ctx->Extensions.NV_texture_rectangle)
                _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_FALSE);
+            if (ctx->Extensions.OES_EGL_image_external)
+               _mesa_set_enable(ctx, GL_TEXTURE_EXTERNAL_OES, GL_FALSE);
             _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, GL_FALSE);
             _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, GL_FALSE);
             _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, GL_FALSE);