mesa: Branch 'master' - 4 commits

[Brian Paul]

 docs/relnotes-6.5.3.html    |    3 ++-
 docs/shading.html           |    2 +-
 src/mesa/swrast/s_context.c |    2 +-
 src/mesa/swrast/s_span.c    |   19 ++++++++++++++-----
 4 files changed, 18 insertions(+), 8 deletions(-)

New commits:
diff-tree 884af408644e3fa9aa0ffc544f84ec4a7f3a93b9 (from 30a79f76fc4ae3bbf2307489bf9da1527f124e91)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Apr 18 12:09:40 2007 -0600

    check _PreferPixelFog in _swrast_span_default_fog(), see bug 10669

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index b0c04ad..c6efea3 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * 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"),
@@ -69,14 +69,23 @@ _swrast_span_default_z( GLcontext *ctx, 
 
 
 /**
- * Init span's fog interpolation values to the RasterPos fog.
+ * Init span's fogcoord interpolation values to the RasterPos fog.
  * Used during setup for glDraw/CopyPixels.
  */
 void
 _swrast_span_default_fog( GLcontext *ctx, SWspan *span )
 {
-   span->attrStart[FRAG_ATTRIB_FOGC][0]
-      = _swrast_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
+   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   GLfloat fogVal; /* a coord or a blend factor */
+   if (swrast->_PreferPixelFog) {
+      /* fog blend factors will be computed from fog coordinates per pixel */
+      fogVal = ctx->Current.RasterDistance;
+   }
+   else {
+      /* fog blend factor should be computed from fogcoord now */
+      fogVal = _swrast_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
+   }
+   span->attrStart[FRAG_ATTRIB_FOGC][0] = fogVal;
    span->attrStepX[FRAG_ATTRIB_FOGC][0] = 0.0;
    span->attrStepY[FRAG_ATTRIB_FOGC][0] = 0.0;
    span->interpMask |= SPAN_FOG;
diff-tree 30a79f76fc4ae3bbf2307489bf9da1527f124e91 (from 8598f550916449b99351a51e2a20e4c4cff021d3)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Apr 18 12:08:18 2007 -0600

    improved fog comment

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index c8efb96..55b835b 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -155,7 +155,7 @@ _swrast_update_polygon( GLcontext *ctx )
 
 /**
  * Update the _PreferPixelFog field to indicate if we need to compute
- * fog factors per-fragment.
+ * fog blend factors (from the fog coords) per-fragment.
  */
 static void
 _swrast_update_fog_hint( GLcontext *ctx )
diff-tree 8598f550916449b99351a51e2a20e4c4cff021d3 (from 6d01f3f1ec21da5bdf3191869ee0be42b3c11d57)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Apr 18 09:30:07 2007 -0600

    glean glsl test now does over 150 tests

diff --git a/docs/shading.html b/docs/shading.html
index fd96a41..3a10f1b 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -294,7 +294,7 @@ A new <a href="http://glean.sf.net" targ
 been create to exercise the GLSL compiler.
 </p>
 <p>
-The <em>glsl1</em> test runs over 130 sub-tests to check that the language
+The <em>glsl1</em> test runs over 150 sub-tests to check that the language
 features and built-in functions work properly.
 This test should be run frequently while working on the compiler to catch
 regressions.
diff-tree 6d01f3f1ec21da5bdf3191869ee0be42b3c11d57 (from e3caa5f891125d273174ff4a136c8ca313430138)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Apr 18 09:28:38 2007 -0600

    added href to shading language info

diff --git a/docs/relnotes-6.5.3.html b/docs/relnotes-6.5.3.html
index b0da0c5..8f6ea8b 100644
--- a/docs/relnotes-6.5.3.html
+++ b/docs/relnotes-6.5.3.html
@@ -25,7 +25,8 @@ TBD
 <h2>New features</h2>
 <ul>
 <li>OpenGL 2.0 and 2.1 API support.
-<li>Entirely new Shading Language code generator.
+<li>Entirely new Shading Language code generator.  See the
+<a href="shading.html">Shading Language</a> page for more information.
 <li>Much faster software execution of vertex, fragment shaders.
 <li>New vertex buffer object (vbo) infrastructure
 <li>Updated glext.h file (version 39)