diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-28 23:31:50 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-28 23:31:50 +0100 |
| commit | 9715b7fab0757c86e1bb151f3dce0b324bcff692 (patch) | |
| tree | 805e01d9e21e3f5316e8827dd59173a7a5cfd4ae /mesalib/src/mesa/swrast | |
| parent | 0fd2d56b0fc0ce74c5f3e5e23cb26b0d1a075ba1 (diff) | |
| download | vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.tar.gz vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.tar.bz2 vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.zip | |
xserver libX11 mesa xkeyboard-config git update 28 dec 2011
Diffstat (limited to 'mesalib/src/mesa/swrast')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texture.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_texture.c b/mesalib/src/mesa/swrast/s_texture.c index 76a31eeae..ffd78a2b8 100644 --- a/mesalib/src/mesa/swrast/s_texture.c +++ b/mesalib/src/mesa/swrast/s_texture.c @@ -189,8 +189,15 @@ _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); + assert(x % bw == 0); + assert(y % bh == 0); + 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 || |