wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Alexandre Julliard : dinput: Add error check to silence a compiler warning.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 6925fb0bb6e9dfdc641295908cc6ed68f69f2e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6925fb0bb6e9dfdc64129590… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 19:38:36 2019 +0100 dinput: Add error check to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 885f1f4..db5878b 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -298,10 +298,11 @@ static void assign_action(HWND dialog) int obj = lv_get_cur_item(dialog); int old_action = lv_get_item_data(dialog, obj); int used_obj; - - DIDEVICEOBJECTINSTANCEW ddo = device->ddo[obj]; + DWORD type; if (old_action == action) return; + if (obj < 0) return; + type = device->ddo[obj].dwType; /* Clear old action */ if (old_action != -1) @@ -320,7 +321,7 @@ static void assign_action(HWND dialog) lv_set_action(dialog, used_obj, -1, lpdiaf); /* Set new action */ - lpdiaf->rgoAction[action].dwObjID = ddo.dwType; + lpdiaf->rgoAction[action].dwObjID = type; lpdiaf->rgoAction[action].guidInstance = device->ddi.guidInstance; lpdiaf->rgoAction[action].dwHow = DIAH_USERCONFIG;

1 0

Józef Kucia : wined3d: Mark dcl_input_ps_{siv, sgv} shader instructions as implemented.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 71ddc97b919b4a008b26605fd2c5aa670c2b4abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ddc97b919b4a008b26605f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 13 11:15:12 2019 +0100 wined3d: Mark dcl_input_ps_{siv, sgv} shader instructions as implemented. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 49bfe39..78eed3e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11415,8 +11415,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PS */ shader_glsl_nop, - /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, - /* WINED3DSIH_DCL_INPUT_PS_SIV */ NULL, + /* WINED3DSIH_DCL_INPUT_PS_SGV */ shader_glsl_nop, + /* WINED3DSIH_DCL_INPUT_PS_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_SGV */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INTERFACE */ NULL,

1 0

Andrey Gusev : mscoree: Fix condition in CorDebug_Release().
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 1e4c1730fb7a2bcb469815f7a756eb1fdf58b7e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e4c1730fb7a2bcb469815f7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 11 19:16:06 2019 +0200 mscoree: Fix condition in CorDebug_Release(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/cordebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/cordebug.c b/dlls/mscoree/cordebug.c index 22424c6..15e7fad 100644 --- a/dlls/mscoree/cordebug.c +++ b/dlls/mscoree/cordebug.c @@ -581,7 +581,7 @@ static ULONG WINAPI CorDebug_Release(ICorDebug *iface) if(This->runtimehost) ICLRRuntimeHost_Release(This->runtimehost); - if(This->pCallback) + if(This->pCallback2) ICorDebugManagedCallback2_Release(This->pCallback2); if(This->pCallback)

1 0

Michael Stefaniuc : d3d11/tests: Remove useless casts to self.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: f9eb08b45aac60929ffbe7c556a4b938bb1676cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9eb08b45aac60929ffbe7c5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 23:43:33 2019 +0100 d3d11/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 27b0775..90488ed 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2198,7 +2198,7 @@ static void test_create_texture1d(void) desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, (ID3D11Texture1D **)&texture); + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D11Texture1D_Release(texture); @@ -2572,7 +2572,7 @@ static void test_create_texture2d(void) desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; desc.MiscFlags = tests[i].misc_flags; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); todo_wine_if(todo) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x (format %#x).\n", @@ -2845,7 +2845,7 @@ static void test_create_texture3d(void) { desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; - hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, (ID3D11Texture3D **)&texture); + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -8536,8 +8536,8 @@ static void test_cube_maps(void) { for (j = 0; j < ARRAY_SIZE(data); ++j) data[j] = sub_resource_idx; - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, sub_resource_idx, NULL, - data, texture_desc.Width * sizeof(*data), 0); + ID3D11DeviceContext_UpdateSubresource(context, texture, sub_resource_idx, NULL, data, + texture_desc.Width * sizeof(*data), 0); } expected_result.y = expected_result.z = 0.0f; @@ -21344,7 +21344,7 @@ static void test_sampleinfo_instruction(void) continue; } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); @@ -21380,7 +21380,7 @@ static void test_sampleinfo_instruction(void) continue; } - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr);

1 0

Michael Stefaniuc : d3d10/tests: Remove useless casts to self.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 5f299d2c87ab418eda40976ec6c3d899a7c38ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f299d2c87ab418eda40976e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 23:43:32 2019 +0100 d3d10/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f299d2c87ab418eda40…

1 0

Michael Stefaniuc : ddraw/tests: Remove useless casts to self.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 0df36ddfa48f092f8635dfff27d86cc92b32274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0df36ddfa48f092f8635dfff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 23:43:30 2019 +0100 ddraw/tests: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 680738e..1dc8856 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2258,7 +2258,7 @@ static void test_wndproc(void) (LONG_PTR)DefWindowProcA, proc); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); - proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)ddraw_proc); + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, ddraw_proc); ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)DefWindowProcA, proc); ref = IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index fced3d9..91300ed 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2391,7 +2391,7 @@ static void test_wndproc(void) (LONG_PTR)DefWindowProcA, proc); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); - proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)ddraw_proc); + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, ddraw_proc); ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)DefWindowProcA, proc); ref = IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5b73015..d192cdf 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2541,7 +2541,7 @@ static void test_wndproc(void) (LONG_PTR)DefWindowProcA, proc); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); - proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)ddraw_proc); + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, ddraw_proc); ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)DefWindowProcA, proc); ref = IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c3ffa45..b43b538 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2216,7 +2216,7 @@ static void test_wndproc(void) (LONG_PTR)DefWindowProcA, proc); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); - proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)ddraw_proc); + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, ddraw_proc); ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)DefWindowProcA, proc); ref = IDirectDraw7_Release(ddraw);

1 0

Matteo Bruni : d3d10core/tests: Simplify test_cb_relative_addressing() a bit.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 2d46fb247645612f5ffcaf4e6c1c2b218196e35b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d46fb247645612f5ffcaf4e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 12 18:26:00 2019 +0100 d3d10core/tests: Simplify test_cb_relative_addressing() a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 9c322ed..b9b83f4 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1389,6 +1389,9 @@ static void draw_quad_vs_(unsigned int line, struct d3d10core_test_context *cont ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); } + if (!context->vb) + context->vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(quad), quad); + if (context->vs_code != vs_code) { if (context->vs) @@ -1400,9 +1403,6 @@ static void draw_quad_vs_(unsigned int line, struct d3d10core_test_context *cont context->vs_code = vs_code; } - if (!context->vb) - context->vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(quad), quad); - ID3D10Device_IASetInputLayout(context->device, context->input_layout); ID3D10Device_IASetPrimitiveTopology(context->device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); stride = sizeof(*quad); @@ -10338,10 +10338,6 @@ static void test_cb_relative_addressing(void) DWORD color; HRESULT hr; - static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = - { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - }; static const DWORD vs_code[] = { #if 0 @@ -10451,10 +10447,6 @@ float4 main(const ps_in v) : SV_TARGET device = test_context.device; - hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), - vs_code, sizeof(vs_code), &test_context.input_layout); - ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); - colors_cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(colors), &colors); index_cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(index), NULL);

1 0

Józef Kucia : ddraw/tests: Destroy viewport in test_lighting_interface_versions() (Valgrind).
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 9844d73b6605bb076d93b1485b9c3582e4ea9896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9844d73b6605bb076d93b148… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 18:06:25 2019 +0100 ddraw/tests: Destroy viewport in test_lighting_interface_versions() (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36381 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 1 + dlls/ddraw/tests/ddraw4.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3dda289..fced3d9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3996,6 +3996,7 @@ static void test_lighting_interface_versions(void) destroy_material(background); destroy_material(emissive); + destroy_viewport(device, viewport); IDirectDrawSurface_Release(rt); IDirect3DDevice2_Release(device); ref = IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bed5acd..5b73015 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4894,6 +4894,7 @@ static void test_lighting_interface_versions(void) } destroy_material(emissive); + destroy_viewport(device, viewport); IDirectDrawSurface4_Release(rt); ref = IDirect3DDevice3_Release(device); ok(ref == 0, "Device not properly released, refcount %u.\n", ref);

1 0

Zebediah Figura : wined3d: Store lights in the wined3d_stateblock_state structure.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: d2fa2624e94fc487b5656c9a8d4a4dc7e3193784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2fa2624e94fc487b5656c9a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 10:45:07 2019 -0600 wined3d: Store lights in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 32 ++++++++++++++++++++++++-------- dlls/wined3d/stateblock.c | 25 ++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3e03470..6831c63 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1608,7 +1608,12 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (FAILED(hr = wined3d_light_state_set_light(&device->update_state->light_state, light_idx, light, &object))) + if (FAILED(hr = wined3d_light_state_set_light(&device->update_stateblock_state->light_state, light_idx, light, &object))) + return hr; + if (device->recording) + return WINED3D_OK; + + if (FAILED(hr = wined3d_light_state_set_light(&device->state.light_state, light_idx, light, &object))) return hr; /* Initialize the object. */ @@ -1697,8 +1702,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, FIXME("Unrecognized light type %#x.\n", light->type); } - if (!device->recording) - wined3d_cs_emit_set_light(device->cs, object); + wined3d_cs_emit_set_light(device->cs, object); return WINED3D_OK; } @@ -1723,25 +1727,37 @@ HRESULT CDECL wined3d_device_get_light(const struct wined3d_device *device, HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) { struct wined3d_light_info *light_info; + HRESULT hr; TRACE("device %p, light_idx %u, enable %#x.\n", device, light_idx, enable); + if (!(light_info = wined3d_light_state_get_light(&device->update_stateblock_state->light_state, light_idx))) + { + if (FAILED(hr = wined3d_light_state_set_light(&device->update_stateblock_state->light_state, light_idx, + &WINED3D_default_light, &light_info))) + return hr; + } + wined3d_light_state_enable_light(&device->update_stateblock_state->light_state, + &device->adapter->d3d_info, light_info, enable); + + if (device->recording) + return WINED3D_OK; + /* Special case - enabling an undefined light creates one with a strict set of parameters. */ - if (!(light_info = wined3d_light_state_get_light(&device->update_state->light_state, light_idx))) + if (!(light_info = wined3d_light_state_get_light(&device->state.light_state, light_idx))) { TRACE("Light enabled requested but light not defined, so defining one!\n"); wined3d_device_set_light(device, light_idx, &WINED3D_default_light); - if (!(light_info = wined3d_light_state_get_light(&device->update_state->light_state, light_idx))) + 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; } } - wined3d_light_state_enable_light(&device->update_state->light_state, &device->adapter->d3d_info, light_info, enable); - if (!device->recording) - wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); + 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; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b5409ba..65f953f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1013,7 +1013,7 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->stateblock_state.ps = state->ps; } - wined3d_state_record_lights(&stateblock->state.light_state, &src_state->light_state); + wined3d_state_record_lights(&stateblock->stateblock_state.light_state, &state->light_state); TRACE("Capture done.\n"); } @@ -1057,12 +1057,18 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); } - for (i = 0; i < ARRAY_SIZE(stateblock->state.light_state.light_map); ++i) + for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state.light_map); ++i) { const struct wined3d_light_info *light; + struct wined3d_light_info *new_light; - LIST_FOR_EACH_ENTRY(light, &stateblock->state.light_state.light_map[i], struct wined3d_light_info, entry) + LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state.light_map[i], struct wined3d_light_info, entry) { + if (SUCCEEDED(wined3d_light_state_set_light(&state->light_state, light->OriginalIndex, + &light->OriginalParms, &new_light))) + { + wined3d_light_state_enable_light(&state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); + } wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } @@ -1526,6 +1532,13 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, const struct wined3d_device *device, DWORD flags) { + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(state->light_state.light_map); i++) + { + list_init(&state->light_state.light_map[i]); + } + if (flags & WINED3D_STATE_INIT_DEFAULT) stateblock_state_init_default(state, &device->adapter->d3d_info); } @@ -1548,7 +1561,8 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, switch (type) { case WINED3D_SBT_ALL: - stateblock_init_lights(stateblock->state.light_state.light_map, device->state.light_state.light_map); + stateblock_init_lights(stateblock->stateblock_state.light_state.light_map, + device->stateblock_state.light_state.light_map); stateblock_savedstates_set_all(&stateblock->changed, d3d_info->limits.vs_uniform_count, d3d_info->limits.ps_uniform_count); break; @@ -1559,7 +1573,8 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, break; case WINED3D_SBT_VERTEX_STATE: - stateblock_init_lights(stateblock->state.light_state.light_map, device->state.light_state.light_map); + stateblock_init_lights(stateblock->stateblock_state.light_state.light_map, + device->stateblock_state.light_state.light_map); stateblock_savedstates_set_vertex(&stateblock->changed, d3d_info->limits.vs_uniform_count); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fbd7f41..eaca69b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3007,6 +3007,8 @@ struct wined3d_stateblock_state struct wined3d_material material; struct wined3d_viewport viewport; RECT scissor_rect; + + struct wined3d_light_state light_state; }; struct wined3d_device

1 0

Zebediah Figura : wined3d: Introduce wined3d_state_set_light() helper.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: de8eb61d973e00dbcfcff3f3e9683e2e59b0be88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8eb61d973e00dbcfcff3f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 10:45:06 2019 -0600 wined3d: Introduce wined3d_state_set_light() helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 +++-------------- dlls/wined3d/stateblock.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c29380..3e03470 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1573,8 +1573,8 @@ void CDECL wined3d_device_multiply_transform(struct wined3d_device *device, HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, UINT light_idx, const struct wined3d_light *light) { - UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); struct wined3d_light_info *object = NULL; + HRESULT hr; float rho; TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); @@ -1608,16 +1608,8 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (!(object = wined3d_light_state_get_light(&device->update_state->light_state, light_idx))) - { - TRACE("Adding new light\n"); - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - list_add_head(&device->update_state->light_state.light_map[hash_idx], &object->entry); - object->glIndex = -1; - object->OriginalIndex = light_idx; - } + if (FAILED(hr = wined3d_light_state_set_light(&device->update_state->light_state, light_idx, light, &object))) + return hr; /* Initialize the object. */ TRACE("Light %u setting to type %#x, diffuse %s, specular %s, ambient %s, " @@ -1629,9 +1621,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, light->direction.x, light->direction.y, light->direction.z, light->range, light->falloff, light->theta, light->phi); - /* Save away the information. */ - object->OriginalParms = *light; - switch (light->type) { case WINED3D_LIGHT_POINT: diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index afddd11..b5409ba 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -627,6 +627,33 @@ struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_li return NULL; } +HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, + const struct wined3d_light *params, struct wined3d_light_info **light_info) +{ + struct wined3d_light_info *object; + unsigned int hash_idx; + + if (!(object = wined3d_light_state_get_light(state, light_idx))) + { + TRACE("Adding new light.\n"); + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate light info.\n"); + return E_OUTOFMEMORY; + } + + hash_idx = LIGHTMAP_HASHFUNC(light_idx); + list_add_head(&state->light_map[hash_idx], &object->entry); + object->glIndex = -1; + object->OriginalIndex = light_idx; + } + + object->OriginalParms = *params; + + *light_info = object; + return WINED3D_OK; +} + void wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eece314..fbd7f41 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3639,6 +3639,8 @@ void wined3d_light_state_enable_light(struct wined3d_light_state *state, const s struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN; struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_light_state *state, unsigned int idx) DECLSPEC_HIDDEN; +HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, + const struct wined3d_light *params, struct wined3d_light_info **light_info) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb,

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019