aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/drawpix.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-08 08:31:07 +0000
committermarha <marha@users.sourceforge.net>2011-03-08 08:31:07 +0000
commit62f8e1becaed544f600e167508fe76bc953d647e (patch)
tree175c3d80e16613dbe92a497836bf685d1324803d /mesalib/src/mesa/main/drawpix.c
parentb1236880df6cbd13760a2adfaff9c22a89501d66 (diff)
parent8c74e7257ed453143c53086f884f6c6ff585379a (diff)
downloadvcxsrv-62f8e1becaed544f600e167508fe76bc953d647e.tar.gz
vcxsrv-62f8e1becaed544f600e167508fe76bc953d647e.tar.bz2
vcxsrv-62f8e1becaed544f600e167508fe76bc953d647e.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/drawpix.c')
-rw-r--r--mesalib/src/mesa/main/drawpix.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c
index b6a6799fd..ab6e61fe3 100644
--- a/mesalib/src/mesa/main/drawpix.c
+++ b/mesalib/src/mesa/main/drawpix.c
@@ -136,8 +136,6 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- _mesa_finish(ctx);
-
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx,
"glCopyPixels(%d, %d, %d, %d, %s) // from %s to %s at %d, %d\n",