summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordok666 <dok666>2003-05-26 13:49:58 +0000
committerdok666 <dok666>2003-05-26 13:49:58 +0000
commit07a37507bf67b2a2231b113288a2beca01b0c9ce (patch)
treeb3df325f9fa6c2891047a8e0b1e52aa6c39b9cdd
parente750ce4e96a4ac8efe7a1f8d9d55ba73666238ba (diff)
Reverted forced eye coords hack in run_vertex_stage.embedded-2-branch
Force eye coords in _mesa_update_tnl_spaces. Need to find out why eye coords aren't used where they are needed, e.g. chromium's title screen.
-rw-r--r--src/mesa/main/light.c4
-rw-r--r--src/mesa/tnl/t_vb_vertex.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 50e157abec4..1807c7800c9 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1,4 +1,4 @@
-/* $Id: light.c,v 1.54.4.2 2003/03/21 11:35:18 keithw Exp $ */
+/* $Id: light.c,v 1.54.4.2.4.1 2003/05/26 13:49:58 dok666 Exp $ */
/*
* Mesa 3-D graphics library
@@ -1324,7 +1324,7 @@ void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
ctx->Point._Attenuated ||
(ctx->Light.Enabled &&
!TEST_MAT_FLAGS( ctx->ModelviewMatrixStack.Top,
- MAT_FLAGS_LENGTH_PRESERVING)));
+ MAT_FLAGS_LENGTH_PRESERVING))) | NEED_EYE_LIGHT;
/* Check if the truth-value interpretations of the bitfields have
* changed:
diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index 10d781145e5..0c4681b9485 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_vertex.c,v 1.17.8.1 2003/05/06 00:01:41 dok666 Exp $ */
+/* $Id: t_vb_vertex.c,v 1.17.8.2 2003/05/26 13:49:59 dok666 Exp $ */
/*
* Mesa 3-D graphics library
@@ -141,7 +141,7 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
if (stage->changed_inputs) {
- if (1||ctx->_NeedEyeCoords) {
+ if (ctx->_NeedEyeCoords) {
/* Separate modelview transformation:
* Use combined ModelProject to avoid some depth artifacts
*/