mesa: Branch 'master'

[Haihao Xiang]

 src/mesa/main/rastpos.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree d85667950f6797f63fa0863e6882390c2adaaf2b (from 79d59d017325820c793d57dfd95b7c4c85722ee3)
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Thu Mar 8 22:54:14 2007 +0800

        remove a if-statement
    
        glMaterial changes the current specular exponent or glLight changes
        the intensity distribution of the light, but _mesa_update_state doesn't
        update the corresponding light table. So they must be updated at this time.

diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index d4f0fa2..4a0c24f 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -133,8 +133,7 @@ shade_rastpos(GLcontext *ctx,
    GLfloat diffuseColor[4], specularColor[4];  /* for RGB mode only */
    GLfloat diffuseCI = 0.0, specularCI = 0.0;  /* for CI mode only */
 
-   if (!ctx->_ShineTable[0] || !ctx->_ShineTable[1])
-      _mesa_validate_all_lighting_tables( ctx );
+   _mesa_validate_all_lighting_tables( ctx );
 
    COPY_3V(diffuseColor, base[0]);
    diffuseColor[3] = CLAMP(