diff options
| author | Brian <[email protected]> | 2007-05-21 10:55:15 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-05-21 10:55:15 -0600 |
| commit | 724a155552a81d41c1513ff156d6a893857ac905 (patch) | |
| tree | e309bbc24176cb211af95de311f58d95e344b000 | |
| parent | d38b74a3163d14fc0fe82048250168c2af802355 (diff) | |
if light position is local, treat it as a homogeneous coord and divide by W (see bug 11009)
| -rw-r--r-- | docs/relnotes-7.0.html | 1 | ||||
| -rw-r--r-- | src/mesa/main/light.c | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/docs/relnotes-7.0.html b/docs/relnotes-7.0.html index ba1d67c41ec..76c5eaa19a6 100644 --- a/docs/relnotes-7.0.html +++ b/docs/relnotes-7.0.html @@ -39,6 +39,7 @@ TBD <li>Specifying an invalid texture unit as a sampler could lead to a crash <li>The GLX protocol request for glXDestroyPBuffer() was incorrect (bug 10983) <li>ARB vp state.light[n].half value was incorrect (bug 10987) +<li>Fixed a positional light source bug (bug 11009) </ul> diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 92d8a0ae0d4..6e057614bad 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 + * Version: 7.0 * - * Copyright (C) 1999-2005 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"), @@ -1117,6 +1117,13 @@ compute_light_positions( GLcontext *ctx ) } light->_VP_inf_spot_attenuation = 1.0; } + else { + /* positional light w/ homogeneous coordinate, divide by W */ + GLfloat wInv = 1.0 / light->_Position[3]; + light->_Position[0] *= wInv; + light->_Position[1] *= wInv; + light->_Position[2] *= wInv; + } if (light->_Flags & LIGHT_SPOT) { if (ctx->_NeedEyeCoords) { |