diff options
author | Marek Olšák <[email protected]> | 2011-06-21 05:08:28 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2011-06-24 22:09:27 +0200 |
commit | 100a37587f9919d986e6af6f7e2ddecdc5bcfd09 (patch) | |
tree | 720c3cf7cd9ce23cff474818d3c5c673777954c9 /src/mesa/main | |
parent | 12c105b5de7dfb0e1c1f1fbe4ee71ddd54b020a7 (diff) |
mesa: don't allocate memory in _mesa_unpack_depth_span if we don't need it
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/pack.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index 7d541dcd4d2..a232a51c355 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -4683,7 +4683,7 @@ _mesa_unpack_depth_span( struct gl_context *ctx, GLuint n, GLenum srcType, const GLvoid *source, const struct gl_pixelstore_attrib *srcPacking ) { - GLfloat *depthTemp, *depthValues; + GLfloat *depthTemp = NULL, *depthValues; GLboolean needClamp = GL_FALSE; /* Look for special cases first. @@ -4729,16 +4729,16 @@ _mesa_unpack_depth_span( struct gl_context *ctx, GLuint n, /* general case path follows */ - depthTemp = (GLfloat *) malloc(n * sizeof(GLfloat)); - if (!depthTemp) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking"); - return; - } - if (dstType == GL_FLOAT) { depthValues = (GLfloat *) dest; } else { + depthTemp = (GLfloat *) malloc(n * sizeof(GLfloat)); + if (!depthTemp) { + _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking"); + return; + } + depthValues = depthTemp; } |