diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2007-07-17 11:06:31 +0100 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2007-07-17 11:06:31 +0100 |
commit | 6101fe641cd506422d0b2735dfcaa61174684ec4 (patch) | |
tree | 78f14b3d199fbb9133076798dcd49e5992327d2e /src/mesa/main/image.h | |
parent | bb1b01616b6cb9b0a1cab74e10940ce346cb8a3d (diff) | |
parent | 7b410f366fa117a03a7e838562215d2dca3f8cbc (diff) |
Merge branch 'origin' into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/main/image.h')
-rw-r--r-- | src/mesa/main/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h index 990398a7c4..2a16989fa7 100644 --- a/src/mesa/main/image.h +++ b/src/mesa/main/image.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 + * Version: 7.1 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -181,7 +181,7 @@ _mesa_pack_stencil_span( const GLcontext *ctx, GLuint n, extern void _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n, - GLenum dstType, GLvoid *dest, GLfloat depthScale, + GLenum dstType, GLvoid *dest, GLuint depthMax, GLenum srcType, const GLvoid *source, const struct gl_pixelstore_attrib *srcPacking ); |