swrast: move null pointer check earlier in _swrast_map_teximage()
There's no reason to compute texel size, stride, etc. if there's no image data to map. Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
@@ -218,6 +218,15 @@ _swrast_map_teximage(struct gl_context *ctx,
|
||||
|
||||
check_map_teximage(texImage, slice, x, y, w, h);
|
||||
|
||||
if (!swImage->Buffer) {
|
||||
/* Either glTexImage was called with a NULL <pixels> argument or
|
||||
* we ran out of memory when allocating texture memory,
|
||||
*/
|
||||
*mapOut = NULL;
|
||||
*rowStrideOut = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
texelSize = _mesa_get_format_bytes(texImage->TexFormat);
|
||||
stride = _mesa_format_row_stride(texImage->TexFormat, texImage->Width);
|
||||
_mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);
|
||||
@@ -225,12 +234,6 @@ _swrast_map_teximage(struct gl_context *ctx,
|
||||
assert(x % bw == 0);
|
||||
assert(y % bh == 0);
|
||||
|
||||
if (!swImage->Buffer) {
|
||||
/* probably ran out of memory when allocating tex mem */
|
||||
*mapOut = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
/* This function can only be used with a swrast-allocated buffer, in which
|
||||
* case ImageSlices is populated with pointers into Buffer.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user