diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-09 13:28:28 +0100 |
| commit | 19b61957dbf473cddbae72792ddeeaee4d4a7077 (patch) | |
| tree | 0839a8b0cc9c6ea5f3ae63cc34726d4ef936995d /mesalib/src/mesa/main/fbobject.c | |
| parent | 480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (diff) | |
| parent | 8d57b7fcb22cf1a52203ee57c745b64bba649249 (diff) | |
| download | vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.gz vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.bz2 vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 9 nov 2012
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 0758d5557..0618b7fab 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -2025,7 +2025,8 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, */ err = (texObj->Target != GL_TEXTURE_3D) && (texObj->Target != GL_TEXTURE_1D_ARRAY_EXT) && - (texObj->Target != GL_TEXTURE_2D_ARRAY_EXT); + (texObj->Target != GL_TEXTURE_2D_ARRAY_EXT) && + (texObj->Target != GL_TEXTURE_CUBE_MAP_ARRAY); } else { /* Make sure textarget is consistent with the texture's type */ @@ -2058,7 +2059,8 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, } } else if ((texObj->Target == GL_TEXTURE_1D_ARRAY_EXT) || - (texObj->Target == GL_TEXTURE_2D_ARRAY_EXT)) { + (texObj->Target == GL_TEXTURE_2D_ARRAY_EXT) || + (texObj->Target == GL_TEXTURE_CUBE_MAP_ARRAY)) { if (zoffset < 0 || zoffset >= (GLint) ctx->Const.MaxArrayTextureLayers) { _mesa_error(ctx, GL_INVALID_VALUE, |