mesa: Branch 'master' - 3 commits

[Brian Paul]

 docs/relnotes-6.5.3.html      |    1 +
 src/mesa/swrast/s_linetemp.h  |   11 ++++++-----
 src/mesa/swrast/s_pointtemp.h |    6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
diff-tree f1fbaf39ff9b818c17c3a3f35e9517b4d826ec61 (from parents)
Merge: ade39f53f659ab9774ab14ebfefd18eb71f1d4ac c2b185cff82a6cdb723cda4e05ffe1a213a9de3e
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Jan 6 14:55:07 2007 -0700

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff-tree ade39f53f659ab9774ab14ebfefd18eb71f1d4ac (from 113b0a7f2e83f02ae9da6977ff416df5cf9671de)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Jan 6 12:58:28 2007 -0700

    document 32-bit Z line/point fix

diff --git a/docs/relnotes-6.5.3.html b/docs/relnotes-6.5.3.html
index cc3df08..3e84b12 100644
--- a/docs/relnotes-6.5.3.html
+++ b/docs/relnotes-6.5.3.html
@@ -30,6 +30,7 @@ TBD
 <ul>
 <li>Fog was errantly applied when a fragment shader was enabled (bug 9346)
 <li>glPush/PopClientAttrib didn't handle VBO bindings correctly (bug 9445)
+<li>With 32-bit Z buffer, the fragment Z of lines and points was sometimes wrong.
 </ul>
 
 
diff-tree 113b0a7f2e83f02ae9da6977ff416df5cf9671de (from b530d96216f8a01e2dd4100941f6b1aa4d9dfbcd)
Author: Brian <brian at yutani.localnet.net>
Date:   Sat Jan 6 12:55:17 2007 -0700

    Use GLuint instead of GLint to store intermediate Z values.  Fixes problems when using 32-bit Z buffer.

diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h
index f5b2d95..8b39185 100644
--- a/src/mesa/swrast/s_linetemp.h
+++ b/src/mesa/swrast/s_linetemp.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  6.5.3
  *
- * Copyright (C) 1999-2005  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"),
@@ -80,14 +80,15 @@ NAME( GLcontext *ctx, const SWvertex *ve
    GLint numPixels;
    GLint xstep, ystep;
 #if defined(DEPTH_TYPE)
-   const GLint depthBits = ctx->Visual.depthBits;
+   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;
    const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0;
    struct gl_renderbuffer *zrb = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer;
 #define FixedToDepth(F)  ((F) >> fixedToDepthShift)
    GLint zPtrXstep, zPtrYstep;
    DEPTH_TYPE *zPtr;
 #elif defined(INTERP_Z)
-   const GLint depthBits = ctx->Visual.depthBits;
+   const GLint depthBits = ctx->DrawBuffer->Visual.depthBits;
+/*ctx->Visual.depthBits;*/
 #endif
 #ifdef PIXEL_ADDRESS
    PIXEL_TYPE *pixelPtr;
@@ -268,7 +269,7 @@ NAME( GLcontext *ctx, const SWvertex *ve
       }
       else {
          /* don't use fixed point */
-         span.z = (GLint) vert0->win[2];
+         span.z = (GLuint) vert0->win[2];
          span.zStep = (GLint) ((vert1->win[2] - vert0->win[2]) / numPixels);
       }
    }
diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h
index 6316833..083f1eb 100644
--- a/src/mesa/swrast/s_pointtemp.h
+++ b/src/mesa/swrast/s_pointtemp.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.2
+ * Version:  6.5.3
  *
- * 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"),
@@ -194,7 +194,7 @@ NAME ( GLcontext *ctx, const SWvertex *v
    {{
       GLint x, y;
       const GLfloat radius = 0.5F * size;
-      const GLint z = (GLint) (vert->win[2] + 0.5F);
+      const GLuint z = (GLuint) (vert->win[2] + 0.5F);
       GLuint count;
 #if FLAGS & SMOOTH
       const GLfloat rmin = radius - 0.7071F;  /* 0.7071 = sqrt(2)/2 */