wined3d: Store the directional light direction in the lightDirn field.

It's only an implementation detail that the direction needs to be passed to the fixed function GL pipeline as GL_POSITION.

wined3d: Store the directional light direction in the lightDirn field.
540130bf · Matteo Bruni · Alexandre Julliard · b5affa6d · 540130bf · 540130bf
Commit 540130bf authored Apr 27, 2015 by Matteo Bruni Committed by Alexandre Julliard Apr 28, 2015
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

device.c dlls/wined3d/device.c +4 -4

glsl_shader.c dlls/wined3d/glsl_shader.c +3 -0

state.c dlls/wined3d/state.c +4 -1

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1531,10 +1531,10 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device,

        case WINED3D_LIGHT_DIRECTIONAL:
            /* Direction */
-            object->lightPosn[0] = -light->direction.x;
-            object->lightPosn[1] = -light->direction.y;
-            object->lightPosn[2] = -light->direction.z;
-            object->lightPosn[3] = 0.0f;
+            object->lightDirn[0] = -light->direction.x;
+            object->lightDirn[1] = -light->direction.y;
+            object->lightDirn[2] = -light->direction.z;
+            object->lightDirn[3] = 0.0f;
            object->exponent = 0.0f;
            object->cutoff = 180.0f;
            break;

--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7529,6 +7529,9 @@ static void glsl_vertex_pipe_view(struct wined3d_context *context, const struct 
    {
        if (!(light = state->lights[k]))
            continue;
+        if (light->OriginalParms.type == WINED3D_LIGHT_DIRECTIONAL)
+            gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightDirn);
+        else
            gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn);
        checkGLcall("glLightfv posn");
        gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, light->lightDirn);

--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3973,6 +3973,9 @@ static void transform_view(struct wined3d_context *context, const struct wined3d
    {
        if (!(light = state->lights[k]))
            continue;
+        if (light->OriginalParms.type == WINED3D_LIGHT_DIRECTIONAL)
+            gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightDirn);
+        else
            gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn);
        checkGLcall("glLightfv posn");
        gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, light->lightDirn);
@@ -4800,7 +4803,7 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D
            case WINED3D_LIGHT_DIRECTIONAL:
                /* Direction */
                /* Note GL uses w position of 0 for direction! */
-                gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn);
+                gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightDirn);
                checkGLcall("glLightfv");
                gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff);
                checkGLcall("glLightf");