diff options
| author | Anuj Phogat <[email protected]> | 2014-03-21 11:19:42 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2014-05-01 10:58:40 -0700 |
| commit | c1743707a1286a71eb4e82b976eb3f1815f2ecf4 (patch) | |
| tree | 563a1e413eeb1ec1573ee582b4fbaf6ba6303f41 /src/mesa | |
| parent | 29b8e894d15cf960c624189fad7d0cf1fdc9c405 (diff) | |
mesa: Allow FLOAT_32_UNSIGNED_INT_24_8_REV in get_tex_depth_stencil()
Fixes a crash in Khronos OpenGL CTS packed_pixels tests.
Cc: <[email protected]>
Signed-off-by: Anuj Phogat <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texgetimage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 09c22357a03..1ac707d134c 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -131,8 +131,8 @@ get_tex_depth_stencil(struct gl_context *ctx, GLuint dimensions, GLint img, row; assert(format == GL_DEPTH_STENCIL); - assert(type == GL_UNSIGNED_INT_24_8); - /* XXX type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV is not handled yet */ + assert(type == GL_UNSIGNED_INT_24_8 || + type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV); for (img = 0; img < depth; img++) { GLubyte *srcMap; |