diff options
| author | Keith Whitwell <[email protected]> | 2008-09-21 22:30:55 -0700 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-21 22:30:55 -0700 |
| commit | dace236c5fffa29d59e4d12fa865889bbecbdd24 (patch) | |
| tree | ea6a1d6fde371ad9ebbd7f050de8f35860e56213 /src/mesa/main/readpix.c | |
| parent | e61793a7c01588f2e6235f1271af4c58fa8adad4 (diff) | |
| parent | 6fd15dd80666ccb1e9b99cedd306e32cc7cee989 (diff) | |
Merge branch 'master' into gallium-0.2
Conflicts:
src/mesa/glapi/glapi.h
src/mesa/main/api_exec.c
src/mesa/main/attrib.c
src/mesa/main/clear.c
src/mesa/main/context.c
src/mesa/main/mfeatures.h
src/mesa/main/mipmap.c
src/mesa/main/mipmap.h
src/mesa/main/readpix.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texformat.c
src/mesa/main/texparam.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_context.c
src/mesa/x86/common_x86_asm.S
Diffstat (limited to 'src/mesa/main/readpix.c')
| -rw-r--r-- | src/mesa/main/readpix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index dc22808e5bb..dfdd297b6e7 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -105,8 +105,7 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type, } break; case GL_DEPTH_COMPONENT: - if ((drawing && !_mesa_dest_buffer_exists(ctx, format)) || - (!drawing && !_mesa_source_buffer_exists(ctx, format))) { + if ((drawing && !_mesa_dest_buffer_exists(ctx, format))) { _mesa_error(ctx, GL_INVALID_OPERATION, "gl%sPixels(no depth buffer)", readDraw); return GL_TRUE; |