diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-09-17 02:43:38 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-09-20 18:14:23 +0200 |
| commit | 168554904bc079650124fbd026d9b75834eabc92 (patch) | |
| tree | 547cfa6b60b504090c31f373495d20fa532ff7c8 | |
| parent | 363dfb83f1ca7f1ab09eec30aeb89732c5ce3e02 (diff) | |
st/mesa: fix assertion failure in GetTexImage for cubemaps
Can be reproduced with mesa/demos/src/tests/blitfb.
NOTE: This is a candidate for the 7.9 branch.
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 124cd32e13e..cd5001475c9 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -240,6 +240,12 @@ get_texture_dims(GLenum target) return 1; case GL_TEXTURE_2D: case GL_TEXTURE_CUBE_MAP_ARB: + case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB: + case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB: + case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB: + case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB: + case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB: + case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB: case GL_TEXTURE_RECTANGLE_NV: case GL_TEXTURE_2D_ARRAY_EXT: return 2; |