Paul Gofman : wined3d: Fix specular alpha value in process_vertices_stride ().

Alexandre Julliard julliard at winehq.org
Tue Jun 4 16:28:13 CDT 2019


Module: wine
Branch: master
Commit: 43fec1bbe9882a468553a67456db620a9eeb7ef4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=43fec1bbe9882a468553a67456db620a9eeb7ef4

Author: Paul Gofman <gofmanp at gmail.com>
Date:   Wed May 22 12:39:27 2019 +0300

wined3d: Fix specular alpha value in process_vertices_stride().

Signed-off-by: Paul Gofman <gofmanp at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/device.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d8dacde..6cfc2b2 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3185,8 +3185,7 @@ static void wined3d_colour_from_mcs(struct wined3d_color *colour, enum wined3d_m
         case WINED3D_MCS_COLOR2:
             if (!(stream_info->use_map & (1u << WINED3D_FFP_SPECULAR)))
             {
-                colour->r = colour->g = colour->b = 0.0f;
-                colour->a = 1.0f;
+                colour->r = colour->g = colour->b = colour->a = 0.0f;
                 return;
             }
             element = &stream_info->elements[WINED3D_FFP_SPECULAR];
@@ -3840,7 +3839,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO
                 specular_colour.r = specular.r * material_specular.r;
                 specular_colour.g = specular.g * material_specular.g;
                 specular_colour.b = specular.b * material_specular.b;
-                specular_colour.a = 1.0f;
+                specular_colour.a = ls.legacy_lighting ? 0.0f : material_specular.a;
             }
             else
             {




More information about the wine-cvs mailing list