Eric's mesa-depth32.diff

diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index 1e07607c46380e9161d35cbd0b891da22f66b721..8d61ff4126cff41b94c78c00a4626e7a99964148 100644 (file)
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -43,14 +43,15 @@ void
 _mesa_ClearDepth( GLclampd depth )
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLfloat tmp = (GLfloat) CLAMP( depth, 0.0, 1.0 );
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (ctx->Depth.Clear == tmp)
+   depth = CLAMP( depth, 0.0, 1.0 );
+
+   if (ctx->Depth.Clear == depth)
       return;
 
    FLUSH_VERTICES(ctx, _NEW_DEPTH);
-   ctx->Depth.Clear = tmp;
+   ctx->Depth.Clear = depth;
    if (ctx->Driver.ClearDepth)
       (*ctx->Driver.ClearDepth)( ctx, ctx->Depth.Clear );
 }

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c996dbbe7bec4ffa9597f130f39fcd8f1b009a72..2b51a4168a0df26e86d1736730b51cc1c130c2f0 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -473,7 +473,7 @@ struct gl_current_attrib {
  */
 struct gl_depthbuffer_attrib {
    GLenum Func;                        /**< Function for depth buffer compare */
-   GLfloat Clear;              /**< Value to clear depth buffer to */
+   GLclampd Clear;             /**< Value to clear depth buffer to */
    GLboolean Test;             /**< Depth buffering enabled flag */
    GLboolean Mask;             /**< Depth buffer writable? */
    GLboolean OcclusionTest;    /**< GL_HP_occlusion_test */