diff options
author | marha <marha@users.sourceforge.net> | 2011-12-29 00:17:36 +0100 |
---|---|---|
committer | Marc Haesen <marc@hc-consult.be> | 2011-12-29 00:17:36 +0100 |
commit | d515b895dc5151d102f33b577cafbf63473bbafa (patch) | |
tree | 98986aec1f43152c3c5f4f8f8a19d29f88b42d83 /mesalib/src/mesa/drivers/common/meta.c | |
parent | ecb8be4d2a289c5308f3f23929116d2fe6aafa4b (diff) | |
parent | 9715b7fab0757c86e1bb151f3dce0b324bcff692 (diff) | |
download | vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.gz vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.tar.bz2 vcxsrv-d515b895dc5151d102f33b577cafbf63473bbafa.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta.c')
-rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index e62267394..5098680b6 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/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); |