diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-07-08 08:53:19 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-07-08 08:53:19 -0600 |
| commit | 64359af07188c06dcc6a9a95ba05f7e8209a7379 (patch) | |
| tree | 9bb1fdc60e8f2efeffbc64f47bc71172cb3a62aa /src/mesa/main | |
| parent | a164d3aee063580503e5e9a77980059d52c486d7 (diff) | |
check depthScale value for optimized ushort->uint case (fixes bug 11474)
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/image.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index e874719e64..e5b9ce8280 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -3882,6 +3882,16 @@ _mesa_pack_stencil_span( const GLcontext *ctx, GLuint n, } \ } while (0) + +/** + * Unpack a row of depth/z values from memory, returning GLushort, GLuint + * or GLfloat values. + * The glPixelTransfer (scale/bias) params will be applied. + * + * \param dstType one of GL_UNSIGNED_SHORT, GL_UNSIGNED_INT, GL_FLOAT + * \param depthScale scale factor (max value) for returned GLushort or + * GLuint values (ignored for GLfloat). + */ void _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n, GLenum dstType, GLvoid *dest, GLfloat depthScale, @@ -3907,7 +3917,9 @@ _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n, } return; } - if (srcType == GL_UNSIGNED_SHORT && dstType == GL_UNSIGNED_INT) { + if (srcType == GL_UNSIGNED_SHORT + && dstType == GL_UNSIGNED_INT + && depthScale == (GLfloat) 0xffffffff) { const GLushort *src = (const GLushort *) source; GLuint *dst = (GLuint *) dest; GLuint i; |