diff options
| author | Brian Paul <brianp@vmware.com> | 2011-12-26 14:49:57 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-12-26 15:22:26 -0700 |
| commit | 08a81c8697cae18e118437936456aa36f82ceeed (patch) | |
| tree | 97a1ed6dd145f5d24f2ac38e67bf2bc5249cbbf2 | |
| parent | 62f2d6ef034559257e01235c3562d821bdade4f5 (diff) | |
swrast: replace assertion with conditional in _swrast_map_teximage()
Just in case we ran out of memory when trying to allocate the texture
memory.
| -rw-r--r-- | src/mesa/swrast/s_texture.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index 76a31eeae73..e31cd62679b 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -189,8 +189,12 @@ _swrast_map_teximage(struct gl_context *ctx, stride = _mesa_format_row_stride(texImage->TexFormat, texImage->Width); _mesa_get_format_block_size(texImage->TexFormat, &bw, &bh); - assert(swImage->Buffer); - + if (!swImage->Buffer) { + /* probably ran out of memory when allocating tex mem */ + *mapOut = NULL; + return; + } + map = swImage->Buffer; if (texImage->TexObject->Target == GL_TEXTURE_3D || |