Matteo Bruni : wined3d: Implement WINED3D_LIGHT_PARALLELPOINT support in the GLSL ffp.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 213f7d9f4580482d8e8194dc27c92f00d454425f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=213f7d9f4580482d8e8194dc27...

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Thu Apr 30 23:22:18 2015 +0200

wined3d: Implement WINED3D_LIGHT_PARALLELPOINT support in the GLSL ffp.

---

 dlls/ddraw/light.c         |  3 ---
 dlls/wined3d/device.c      |  9 ++++++++-
 dlls/wined3d/glsl_shader.c | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c
index a3660a3..0cc237d 100644
--- a/dlls/ddraw/light.c
+++ b/dlls/ddraw/light.c
@@ -175,9 +175,6 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data)
     if ((!data->dltType) || (data->dltType > D3DLIGHT_PARALLELPOINT))
          return DDERR_INVALIDPARAMS;
 
-    if (data->dltType == D3DLIGHT_PARALLELPOINT)
-        FIXME("D3DLIGHT_PARALLELPOINT not implemented.\n");
-
     /* Translate D3DLIGHT2 structure to D3DLIGHT7. */
     light7->dltType = data->dltType;
     light7->dcvDiffuse = data->dcvColor;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 1f4216a..6b40c62 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1455,7 +1455,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device,
     {
         case WINED3D_LIGHT_POINT:
         case WINED3D_LIGHT_SPOT:
-        case WINED3D_LIGHT_PARALLELPOINT:
         case WINED3D_LIGHT_GLSPOT:
             /* Incorrect attenuation values can cause the gl driver to crash.
              * Happens with Need for speed most wanted. */
@@ -1467,6 +1466,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device,
             break;
 
         case WINED3D_LIGHT_DIRECTIONAL:
+        case WINED3D_LIGHT_PARALLELPOINT:
             /* Ignores attenuation */
             break;
 
@@ -1582,6 +1582,13 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device,
             /* FIXME: Range */
             break;
 
+        case WINED3D_LIGHT_PARALLELPOINT:
+            object->position.x = light->position.x;
+            object->position.y = light->position.y;
+            object->position.z = light->position.z;
+            object->position.w = 1.0f;
+            break;
+
         default:
             FIXME("Unrecognized light type %#x.\n", light->type);
     }
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 909b158..b9d95e6 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1186,6 +1186,11 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *c
             GL_EXTCALL(glUniform3fv(prog->vs.light_location[light].direction, 1, &vec4.x));
             break;
 
+        case WINED3D_LIGHT_PARALLELPOINT:
+            multiply_vector_matrix(&vec4, &light_info->position, view);
+            GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].position, 1, &vec4.x));
+            break;
+
         default:
             FIXME("Unrecognized light type %#x.\n", light_info->OriginalParms.type);
     }
@@ -5538,6 +5543,18 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer
                         " * ffp_light[%u].specular;\n", i);
                 break;
 
+            case WINED3D_LIGHT_PARALLELPOINT:
+                shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz;\n", i);
+                if (!settings->normal)
+                    break;
+                shader_addline(buffer, "dir = normalize(ffp_light[%u].position.xyz);\n", i);
+                shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)"
+                        " * ffp_light[%u].diffuse.xyz;\n", i);
+                shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n");
+                shader_addline(buffer, "if (t > 0.0) specular += pow(t, ffp_material.shininess)"
+                        " * ffp_light[%u].specular;\n", i);
+                break;
+
             default:
                 if (light_type)
                     FIXME("Unhandled light type %#x.\n", light_type);