diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
| commit | 230fe896faed312ef22d915e871fb5aee3ecfad0 (patch) | |
| tree | 971b0c0899c72496f97970319bfadfae383abbea /mesalib/src/mesa/drivers/common/meta.c | |
| parent | 180290f941da61bd80284d817e27c01cf789ee53 (diff) | |
| parent | b071050b9eda9d5e5185e582dbe9f4adba863ccc (diff) | |
| download | vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.gz vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.bz2 vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta.c')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 1250bd35c..f7dd06aeb 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * @@ -655,7 +654,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE); if (ctx->Extensions.ARB_texture_cube_map) _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE); - if (ctx->Extensions.OES_EGL_image_external) + if (_mesa_is_gles(ctx) && + ctx->Extensions.OES_EGL_image_external) _mesa_set_enable(ctx, GL_TEXTURE_EXTERNAL_OES, GL_FALSE); if (ctx->API == API_OPENGL_COMPAT) { @@ -3851,9 +3851,16 @@ _mesa_meta_CopyTexSubImage(struct gl_context *ctx, GLuint dims, */ _mesa_meta_begin(ctx, MESA_META_PIXEL_STORE); - ctx->Driver.TexSubImage(ctx, dims, texImage, - xoffset, yoffset, zoffset, width, height, 1, - format, type, buf, &ctx->Unpack); + if (texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY) { + assert(yoffset == 0); + ctx->Driver.TexSubImage(ctx, dims, texImage, + xoffset, zoffset, 0, width, 1, 1, + format, type, buf, &ctx->Unpack); + } else { + ctx->Driver.TexSubImage(ctx, dims, texImage, + xoffset, yoffset, zoffset, width, height, 1, + format, type, buf, &ctx->Unpack); + } _mesa_meta_end(ctx); |