diff options
| author | Matt Turner <mattst88@gmail.com> | 2015-07-12 23:15:01 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2015-07-29 09:34:52 -0700 |
| commit | c92b2a1d7b286de8641512970a87c94809fbbc3f (patch) | |
| tree | dfba41a970e59d8ae177856ee99519b7405128ce /src/mesa/tnl/t_vb_normals.c | |
| parent | 2b47ef715ad33f6c4a4881b10240d792ba9e60b2 (diff) | |
| download | external_mesa3d-c92b2a1d7b286de8641512970a87c94809fbbc3f.zip external_mesa3d-c92b2a1d7b286de8641512970a87c94809fbbc3f.tar.gz external_mesa3d-c92b2a1d7b286de8641512970a87c94809fbbc3f.tar.bz2 | |
tnl: Avoid double promotion.
There are a couple of unrelated changes in t_vb_lighttmp.h that I hope
you'll excuse -- there's a block of code that's duplicated modulo a few
trivial differences that I took the liberty of fixing.
Diffstat (limited to 'src/mesa/tnl/t_vb_normals.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_normals.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index 9aee1a2..6fc89c2 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -114,7 +114,7 @@ validate_normal_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage) store->NormalTransform = _mesa_normal_tab[transform | NORM_NORMALIZE]; } else if (ctx->Transform.RescaleNormals && - ctx->_ModelViewInvScale != 1.0) { + ctx->_ModelViewInvScale != 1.0F) { store->NormalTransform = _mesa_normal_tab[transform | NORM_RESCALE]; } else { @@ -131,7 +131,7 @@ validate_normal_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage) store->NormalTransform = _mesa_normal_tab[NORM_NORMALIZE]; } else if (!ctx->Transform.RescaleNormals && - ctx->_ModelViewInvScale != 1.0) { + ctx->_ModelViewInvScale != 1.0F) { store->NormalTransform = _mesa_normal_tab[NORM_RESCALE]; } else { |