Zebediah Figura : wined3d: Return void from wined3d_device_set_light_enable().
Alexandre Julliard
julliard at winehq.org
Thu Mar 5 16:35:26 CST 2020
Module: wine
Branch: master
Commit: 99ac513ce43bb7f1eb0e93ef561e706900a49491
URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ac513ce43bb7f1eb0e93ef561e706900a49491
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Mar 4 22:46:50 2020 -0600
wined3d: Return void from wined3d_device_set_light_enable().
Signed-off-by: Zebediah Figura <z.figura12 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 | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 567c2e8e64..4224472df5 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1472,7 +1472,7 @@ static void wined3d_device_set_light(struct wined3d_device *device,
wined3d_cs_emit_set_light(device->cs, object);
}
-static HRESULT wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable)
+static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable)
{
struct wined3d_light_info *light_info;
@@ -1487,14 +1487,12 @@ static HRESULT wined3d_device_set_light_enable(struct wined3d_device *device, UI
if (!(light_info = wined3d_light_state_get_light(&device->state.light_state, light_idx)))
{
FIXME("Adding default lights has failed dismally\n");
- return WINED3DERR_INVALIDCALL;
+ return;
}
}
wined3d_light_state_enable_light(&device->state.light_state, &device->adapter->d3d_info, light_info, enable);
wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable);
-
- return WINED3D_OK;
}
static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device,
More information about the wine-cvs
mailing list