diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
| commit | 3b79162ea5c5be078326f2e0ea85b0f84c02f166 (patch) | |
| tree | 6826d1ef026f16ec12d35ee6bd4a892d0a05b7e0 /mesalib/src/mesa/swrast/s_depth.c | |
| parent | 4284aeba874b9168f2228c59639bec8346a56796 (diff) | |
| parent | b729d9e1cc1c60e415da24143cabcbaccb525ed7 (diff) | |
| download | vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.gz vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.bz2 vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.zip | |
svn merge ^/branches/released
Diffstat (limited to 'mesalib/src/mesa/swrast/s_depth.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_depth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_depth.c b/mesalib/src/mesa/swrast/s_depth.c index 26e23f02d..7086cae0c 100644 --- a/mesalib/src/mesa/swrast/s_depth.c +++ b/mesalib/src/mesa/swrast/s_depth.c @@ -1211,6 +1211,7 @@ _swrast_read_depth_span_float( GLcontext *ctx, struct gl_renderbuffer *rb, if (!rb) { /* really only doing this to prevent FP exceptions later */ _mesa_bzero(depth, n * sizeof(GLfloat)); + return; } ASSERT(rb->_BaseFormat == GL_DEPTH_COMPONENT); @@ -1273,7 +1274,8 @@ _swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb, { if (!rb) { /* really only doing this to prevent FP exceptions later */ - _mesa_bzero(depth, n * sizeof(GLfloat)); + _mesa_bzero(depth, n * sizeof(GLuint)); + return; } ASSERT(rb->_BaseFormat == GL_DEPTH_COMPONENT); |