diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-11 08:47:29 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-11 08:47:29 +0200 |
| commit | 0b43e0b4ddbd9fdac70658164f3dbf653067a4de (patch) | |
| tree | 96f2c71cec2c8c7e34b1f2e0c1518bea14adfcf2 /mesalib/src/mesa/swrast | |
| parent | 47a6ae678489d7082b5d7da35d1a92b4233fb5eb (diff) | |
| download | vcxsrv-0b43e0b4ddbd9fdac70658164f3dbf653067a4de.tar.gz vcxsrv-0b43e0b4ddbd9fdac70658164f3dbf653067a4de.tar.bz2 vcxsrv-0b43e0b4ddbd9fdac70658164f3dbf653067a4de.zip | |
mesa update 11 july 2011
Diffstat (limited to 'mesalib/src/mesa/swrast')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_blit.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast/s_readpix.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c index 3516a41bf..7f53f19eb 100644 --- a/mesalib/src/mesa/swrast/s_blit.c +++ b/mesalib/src/mesa/swrast/s_blit.c @@ -568,9 +568,6 @@ _swrast_BlitFramebuffer(struct gl_context *ctx, }; GLint i; - if (!ctx->DrawBuffer->_NumColorDrawBuffers) - return; - if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1, &dstX0, &dstY0, &dstX1, &dstY1)) { return; diff --git a/mesalib/src/mesa/swrast/s_readpix.c b/mesalib/src/mesa/swrast/s_readpix.c index 214f2ea1a..66ca39293 100644 --- a/mesalib/src/mesa/swrast/s_readpix.c +++ b/mesalib/src/mesa/swrast/s_readpix.c @@ -446,7 +446,7 @@ read_depth_stencil_pixels(struct gl_context *ctx, GLfloat depthVals[MAX_WIDTH]; _swrast_read_depth_span_float(ctx, depthRb, width, x, y + i, depthVals); - _mesa_pack_depth_stencil_span(ctx, width, depthStencilDst, + _mesa_pack_depth_stencil_span(ctx, width, type, depthStencilDst, depthVals, stencilVals, packing); } } |