Mesa (master): mesa: remove leftovers from color indexed rendering.
Mathias Fröhlich
frohlich at kemper.freedesktop.org
Mon Dec 26 20:48:19 UTC 2011
Module: Mesa
Branch: master
Commit: 31bf243a92454758fb4b8efc6bd8ccac99b67b6e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=31bf243a92454758fb4b8efc6bd8ccac99b67b6e
Author: Mathias Fröhlich <Mathias.Froehlich at web.de>
Date: Mon Dec 26 21:45:56 2011 +0100
mesa: remove leftovers from color indexed rendering.
Remove gl_light::_dli and gl_light::_sli.
Both are only used for a value previously used in
color indexed rendering. Also both variables are only used
and never written.
Signed-off-by: Mathias Froehlich <Mathias.Froehlich at web.de>
---
src/mesa/main/mtypes.h | 2 --
src/mesa/tnl/t_rasterpos.c | 7 +------
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 02452aa..7068d5a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -683,8 +683,6 @@ struct gl_light
GLfloat _MatAmbient[2][3]; /**< material ambient * light ambient */
GLfloat _MatDiffuse[2][3]; /**< material diffuse * light diffuse */
GLfloat _MatSpecular[2][3]; /**< material spec * light specular */
- GLfloat _dli; /**< CI diffuse light intensity */
- GLfloat _sli; /**< CI specular light intensity */
/*@}*/
};
diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c
index 0492490..a7e4397 100644
--- a/src/mesa/tnl/t_rasterpos.c
+++ b/src/mesa/tnl/t_rasterpos.c
@@ -105,13 +105,12 @@ userclip_point( struct gl_context *ctx, const GLfloat v[] )
/**
- * Compute lighting for the raster position. Both RGB and CI modes computed.
+ * Compute lighting for the raster position. RGB modes computed.
* \param ctx the context
* \param vertex vertex location
* \param normal normal vector
* \param Rcolor returned color
* \param Rspec returned specular color (if separate specular enabled)
- * \param Rindex returned color index
*/
static void
shade_rastpos(struct gl_context *ctx,
@@ -123,7 +122,6 @@ shade_rastpos(struct gl_context *ctx,
/*const*/ GLfloat (*base)[3] = ctx->Light._BaseColor;
const struct gl_light *light;
GLfloat diffuseColor[4], specularColor[4]; /* for RGB mode only */
- GLfloat diffuseCI = 0.0, specularCI = 0.0; /* for CI mode only */
_mesa_validate_all_lighting_tables( ctx );
@@ -191,7 +189,6 @@ shade_rastpos(struct gl_context *ctx,
/* Ambient + diffuse */
COPY_3V(diffuseContrib, light->_MatAmbient[0]);
ACC_SCALE_SCALAR_3V(diffuseContrib, n_dot_VP, light->_MatDiffuse[0]);
- diffuseCI += n_dot_VP * light->_dli * attenuation;
/* Specular */
{
@@ -232,8 +229,6 @@ shade_rastpos(struct gl_context *ctx,
ACC_SCALE_SCALAR_3V( diffuseContrib, spec_coef,
light->_MatSpecular[0]);
}
- /*assert(light->_sli > 0.0);*/
- specularCI += spec_coef * light->_sli * attenuation;
}
}
}
More information about the mesa-commit
mailing list