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/state_tracker/st_texture.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/state_tracker/st_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_texture.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c index d6dbf8d6c..5a4dcaab2 100644 --- a/mesalib/src/mesa/state_tracker/st_texture.c +++ b/mesalib/src/mesa/state_tracker/st_texture.c @@ -165,6 +165,13 @@ st_gl_texture_dims_to_pipe_dims(GLenum texture, *depthOut = 1; *layersOut = depthIn; break; + case GL_TEXTURE_CUBE_MAP_ARRAY: + case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY: + *widthOut = widthIn; + *heightOut = heightIn; + *depthOut = 1; + *layersOut = depthIn; + break; default: assert(0 && "Unexpected texture in st_gl_texture_dims_to_pipe_dims()"); /* fall-through */ @@ -277,7 +284,8 @@ st_texture_image_data(struct st_context *st, GLuint layers; if (dst->target == PIPE_TEXTURE_1D_ARRAY || - dst->target == PIPE_TEXTURE_2D_ARRAY) + dst->target == PIPE_TEXTURE_2D_ARRAY || + dst->target == PIPE_TEXTURE_CUBE_ARRAY) layers = dst->array_size; else layers = u_minify(dst->depth0, level); |