diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-23 14:18:06 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-23 14:18:06 +1100 |
| commit | dcf04ee23c0131c2a3fdb267d132d6b27db393c4 (patch) | |
| tree | d1a3fa9823f28c37dc8d7d8649d68e2f9a7c4b47 /src/mesa/main/teximage.c | |
| parent | 75b85fd33abe143d9cca6f8405f0a4243b6a5ddb (diff) | |
| parent | a35c1ca3ad4361fee30d21ef13d8d37ae91aee66 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/main/teximage.c')
| -rw-r--r-- | src/mesa/main/teximage.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index f15e404527..384e145520 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -2323,9 +2323,6 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format, return; } - if (!pixels) - return; - _mesa_lock_texture(ctx, texObj); { texImage = _mesa_select_tex_image(ctx, texObj, target, level); |