diff options
| author | Brian Paul <[email protected]> | 2012-01-12 09:51:21 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-01-12 13:02:19 -0700 |
| commit | a240c998ac649d79f423bb0c445993132cd56f97 (patch) | |
| tree | 489b451daccfd832622e7b0904bd1da7fb01c6cf /src/mesa/main/texstore.c | |
| parent | 2f0fa456e31a7030c911a563b62c84d448b09800 (diff) | |
mesa: fix incorrect float vs. int values in a few places
In the first case, the newImage[] array contains GLuint values.
In the second case, the parameter type is GLuint, but the maxDepth
value is never used in this case (GL_FLOAT_32_UNSIGNED_INT_24_8_REV).
Pass ~OU just to be safe.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/main/texstore.c')
| -rw-r--r-- | src/mesa/main/texstore.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 512965fc3ae..a9c64cedee9 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -515,9 +515,9 @@ make_temp_uint_image(struct gl_context *ctx, GLuint dims, for (k = 0; k < texComponents; k++) { GLint j = map[k]; if (j == ZERO) - newImage[i * texComponents + k] = 0.0F; + newImage[i * texComponents + k] = 0; else if (j == ONE) - newImage[i * texComponents + k] = 1.0F; + newImage[i * texComponents + k] = 1; else newImage[i * texComponents + k] = tempImage[i * logComponents + j]; } @@ -4094,7 +4094,7 @@ _mesa_texstore_z32f_x24s8(TEXSTORE_PARAMS) _mesa_unpack_depth_span(ctx, srcWidth, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, /* dst type */ dstRow, /* dst addr */ - 1.0f, srcType, src, srcPacking); + ~0U, srcType, src, srcPacking); if (srcFormat != GL_DEPTH_COMPONENT) _mesa_unpack_stencil_span(ctx, srcWidth, |