October 2021 - Wine-commits

Nikolay Sivov : d3d10/effect: Use effect variable pointers to store per-pass shader objects.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: a3942ae20e288edf6ee621a09acfaf6e70a81a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3942ae20e288edf6ee621a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:32 2021 +0300 d3d10/effect: Use effect variable pointers to store per-pass shader objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 12 ++++++-- dlls/d3d10/effect.c | 74 ++++++++++++++++++++++++---------------------- dlls/d3d10/tests/effect.c | 28 ++++++++++++++++++ 3 files changed, 75 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3942ae20e288edf6ee6…

1 0

Nikolay Sivov : d3d10/effect: Set shader masks in ComputeStateBlockMask() for passes.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: c85e46b1022a84b8017dc261c1a916a315f8c55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c85e46b1022a84b8017dc261… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:33 2021 +0300 d3d10/effect: Set shader masks in ComputeStateBlockMask() for passes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 13 +++++++++++-- dlls/d3d10/tests/effect.c | 4 +--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index dd4e04d6374..70f6c3b3166 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4113,9 +4113,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, D3D10_STATE_BLOCK_MASK *mask) { - FIXME("iface %p, mask %p stub!\n", iface, mask); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); - return E_NOTIMPL; + FIXME("iface %p, mask %p semi-stub!\n", iface, mask); + + if (pass->vs.shader != &null_shader_variable) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_VS, 0, 1); + if (pass->ps.shader != &null_shader_variable) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_PS, 0, 1); + if (pass->gs.shader != &null_shader_variable) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_GS, 0, 1); + + return S_OK; } static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 06c5aa68776..f3b81a2c58d 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3016,7 +3016,6 @@ if (0) hr = D3D10StateBlockMaskDisableAll(&mask); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(!ret, "Unexpected mask.\n"); @@ -3164,7 +3163,6 @@ todo_wine hr = D3D10StateBlockMaskDisableAll(&mask); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(ret, "Unexpected mask.\n"); @@ -3172,7 +3170,7 @@ todo_wine { ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); ok(ret, "Unexpected mask.\n"); -} + /* pass 2 */ p = t->lpVtbl->GetPassByIndex(t, 2);

1 0

Nikolay Sivov : d3d10: Fix up D3D10_DST_* names.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 87fb9fe721da6ceed20e190c69578a953ac7ff52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87fb9fe721da6ceed20e190c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:34 2021 +0300 d3d10: Fix up D3D10_DST_* names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/stateblock.c | 16 ++++++++-------- include/d3d10effect.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index ccc8a0e504e..fef78872a49 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -73,8 +73,8 @@ static const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t) { WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS); WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS); - WINE_D3D10_TO_STR(D3D10_DST_DEPTH_STENCIL_STATE); - WINE_D3D10_TO_STR(D3D10_DST_BLEND_STATE); + WINE_D3D10_TO_STR(D3D10_DST_OM_DEPTH_STENCIL_STATE); + WINE_D3D10_TO_STR(D3D10_DST_OM_BLEND_STATE); WINE_D3D10_TO_STR(D3D10_DST_VS); WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS); WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES); @@ -696,9 +696,9 @@ HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask, return stateblock_mask_clear_bits(&mask->SOBuffers, 1, start_idx, count); case D3D10_DST_OM_RENDER_TARGETS: return stateblock_mask_clear_bits(&mask->OMRenderTargets, 1, start_idx, count); - case D3D10_DST_DEPTH_STENCIL_STATE: + case D3D10_DST_OM_DEPTH_STENCIL_STATE: return stateblock_mask_clear_bits(&mask->OMDepthStencilState, 1, start_idx, count); - case D3D10_DST_BLEND_STATE: + case D3D10_DST_OM_BLEND_STATE: return stateblock_mask_clear_bits(&mask->OMBlendState, 1, start_idx, count); case D3D10_DST_VS: return stateblock_mask_clear_bits(&mask->VS, 1, start_idx, count); @@ -783,9 +783,9 @@ HRESULT WINAPI D3D10StateBlockMaskEnableCapture(D3D10_STATE_BLOCK_MASK *mask, return stateblock_mask_set_bits(&mask->SOBuffers, 1, start_idx, count); case D3D10_DST_OM_RENDER_TARGETS: return stateblock_mask_set_bits(&mask->OMRenderTargets, 1, start_idx, count); - case D3D10_DST_DEPTH_STENCIL_STATE: + case D3D10_DST_OM_DEPTH_STENCIL_STATE: return stateblock_mask_set_bits(&mask->OMDepthStencilState, 1, start_idx, count); - case D3D10_DST_BLEND_STATE: + case D3D10_DST_OM_BLEND_STATE: return stateblock_mask_set_bits(&mask->OMBlendState, 1, start_idx, count); case D3D10_DST_VS: return stateblock_mask_set_bits(&mask->VS, 1, start_idx, count); @@ -858,9 +858,9 @@ BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask, return stateblock_mask_get_bit(&mask->SOBuffers, 1, idx); case D3D10_DST_OM_RENDER_TARGETS: return stateblock_mask_get_bit(&mask->OMRenderTargets, 1, idx); - case D3D10_DST_DEPTH_STENCIL_STATE: + case D3D10_DST_OM_DEPTH_STENCIL_STATE: return stateblock_mask_get_bit(&mask->OMDepthStencilState, 1, idx); - case D3D10_DST_BLEND_STATE: + case D3D10_DST_OM_BLEND_STATE: return stateblock_mask_get_bit(&mask->OMBlendState, 1, idx); case D3D10_DST_VS: return stateblock_mask_get_bit(&mask->VS, 1, idx); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b4a33daca48..a4574c41fe4 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -34,8 +34,8 @@ typedef enum _D3D10_DEVICE_STATE_TYPES { D3D10_DST_SO_BUFFERS = 1, D3D10_DST_OM_RENDER_TARGETS, - D3D10_DST_DEPTH_STENCIL_STATE, - D3D10_DST_BLEND_STATE, + D3D10_DST_OM_DEPTH_STENCIL_STATE, + D3D10_DST_OM_BLEND_STATE, D3D10_DST_VS, D3D10_DST_VS_SAMPLERS, D3D10_DST_VS_SHADER_RESOURCES,

1 0

Nikolay Sivov : d3d10/effect: Explicitly store rasterizer state variable.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 0c5c8fd84d89108aa2aab74d52b149121c8d4678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c5c8fd84d89108aa2aab74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:35 2021 +0300 d3d10/effect: Explicitly store rasterizer state variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 22 ++++++++++++++++++---- dlls/d3d10/tests/effect.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f799d27b323..4e35a2f319d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -79,7 +79,6 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { - ID3D10RasterizerState *rs; ID3D10DepthStencilState *ds; ID3D10BlendState *bs; ID3D10VertexShader *vs; @@ -247,6 +246,7 @@ struct d3d10_effect_pass struct d3d10_effect_pass_shader_desc vs; struct d3d10_effect_pass_shader_desc ps; struct d3d10_effect_pass_shader_desc gs; + struct d3d10_effect_variable *rasterizer; UINT stencil_ref; UINT sample_mask; float blend_factor[4]; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 70f6c3b3166..66eb723fe9c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1918,8 +1918,19 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_RASTERIZER_STATE: { ID3D10EffectRasterizerVariable *rv = variable->lpVtbl->AsRasterizer(variable); - if (FAILED(hr = rv->lpVtbl->GetRasterizerState(rv, variable_idx, &o->object.rs))) - return hr; + if (!rv->lpVtbl->IsValid(rv)) + { + WARN("Invalid variable type.\n"); + return E_FAIL; + } + v = impl_from_ID3D10EffectVariable(variable); + if (v->type->element_count) + { + if (variable_idx >= v->type->element_count) return E_FAIL; + o->pass->rasterizer = &v->elements[variable_idx]; + } + else + o->pass->rasterizer = v; break; } @@ -2903,8 +2914,7 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) switch(o->type) { case D3D10_EOT_RASTERIZER_STATE: - ID3D10Device_RSSetState(device, o->object.rs); - return S_OK; + break; case D3D10_EOT_DEPTH_STENCIL_STATE: ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); @@ -2935,6 +2945,8 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) FIXME("Unhandled effect object type %#x.\n", o->type); return E_FAIL; } + + return S_OK; } static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, @@ -4100,6 +4112,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface apply_shader_resources(device, pass->gs.shader); if (pass->ps.shader != &null_shader_variable) apply_shader_resources(device, pass->ps.shader); + if (pass->rasterizer) + ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); for (i = 0; i < pass->object_count; ++i) { diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index f3b81a2c58d..1a06ff95365 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4195,6 +4195,7 @@ static void test_effect_state_groups(void) UINT sample_mask, stencil_ref; ID3D10EffectBlendVariable *b; D3D10_BLEND_DESC blend_desc; + D3D10_STATE_BLOCK_MASK mask; D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *v; ID3D10EffectPass *pass; @@ -4203,6 +4204,7 @@ static void test_effect_state_groups(void) ID3D10Device *device; ULONG refcount; HRESULT hr; + BOOL ret; if (!(device = create_device())) { @@ -4323,6 +4325,21 @@ static void test_effect_state_groups(void) ok(pass_desc.BlendFactor[1] == 0.6f, "Got unexpected BlendFactor[1] %.8e.\n", pass_desc.BlendFactor[1]); ok(pass_desc.BlendFactor[2] == 0.7f, "Got unexpected BlendFactor[2] %.8e.\n", pass_desc.BlendFactor[2]); ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); + + hr = D3D10StateBlockMaskDisableAll(&mask); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); +todo_wine + ok(ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); +todo_wine + ok(ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_BLEND_STATE, 0); +todo_wine + ok(ret, "Unexpected mask.\n"); + hr = pass->lpVtbl->Apply(pass, 0); ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr);

1 0

Nikolay Sivov : d3d10/effect: Explicitly store depth stencil state variable.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: e42720a6d8bcf4051b0460e58314eda76392ff59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e42720a6d8bcf4051b0460e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:36 2021 +0300 d3d10/effect: Explicitly store depth stencil state variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 4e35a2f319d..5a0308ee42a 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -79,7 +79,6 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { - ID3D10DepthStencilState *ds; ID3D10BlendState *bs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; @@ -247,6 +246,7 @@ struct d3d10_effect_pass struct d3d10_effect_pass_shader_desc ps; struct d3d10_effect_pass_shader_desc gs; struct d3d10_effect_variable *rasterizer; + struct d3d10_effect_variable *depth_stencil; UINT stencil_ref; UINT sample_mask; float blend_factor[4]; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 66eb723fe9c..4a293601902 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1937,8 +1937,19 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_DEPTH_STENCIL_STATE: { ID3D10EffectDepthStencilVariable *dv = variable->lpVtbl->AsDepthStencil(variable); - if (FAILED(hr = dv->lpVtbl->GetDepthStencilState(dv, variable_idx, &o->object.ds))) - return hr; + if (!dv->lpVtbl->IsValid(dv)) + { + WARN("Invalid variable type.\n"); + return E_FAIL; + } + v = impl_from_ID3D10EffectVariable(variable); + if (v->type->element_count) + { + if (variable_idx >= v->type->element_count) return E_FAIL; + o->pass->depth_stencil = &v->elements[variable_idx]; + } + else + o->pass->depth_stencil = v; break; } @@ -2914,11 +2925,8 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) switch(o->type) { case D3D10_EOT_RASTERIZER_STATE: - break; - case D3D10_EOT_DEPTH_STENCIL_STATE: - ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); - return S_OK; + break; case D3D10_EOT_BLEND_STATE: ID3D10Device_OMSetBlendState(device, o->object.bs, o->pass->blend_factor, o->pass->sample_mask); @@ -4114,6 +4122,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface apply_shader_resources(device, pass->ps.shader); if (pass->rasterizer) ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); + if (pass->depth_stencil) + ID3D10Device_OMSetDepthStencilState(device, pass->depth_stencil->u.state.object.depth_stencil, + pass->stencil_ref); for (i = 0; i < pass->object_count; ++i) {

1 0

Nikolay Sivov : d3d10/effect: Explicitly store blend state variable.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: 47350f363a1f3d1fed20293575d62264b2ec1d2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47350f363a1f3d1fed202935… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:37 2021 +0300 d3d10/effect: Explicitly store blend state variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 31 ++++++++++++++++++++----------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 5a0308ee42a..6979d2a114e 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -79,7 +79,6 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { - ID3D10BlendState *bs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; @@ -247,6 +246,7 @@ struct d3d10_effect_pass struct d3d10_effect_pass_shader_desc gs; struct d3d10_effect_variable *rasterizer; struct d3d10_effect_variable *depth_stencil; + struct d3d10_effect_variable *blend; UINT stencil_ref; UINT sample_mask; float blend_factor[4]; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4a293601902..afcd292356e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1956,8 +1956,19 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_BLEND_STATE: { ID3D10EffectBlendVariable *bv = variable->lpVtbl->AsBlend(variable); - if (FAILED(hr = bv->lpVtbl->GetBlendState(bv, variable_idx, &o->object.bs))) - return hr; + if (!bv->lpVtbl->IsValid(bv)) + { + WARN("Invalid variable type.\n"); + return E_FAIL; + } + v = impl_from_ID3D10EffectVariable(variable); + if (v->type->element_count) + { + if (variable_idx >= v->type->element_count) return E_FAIL; + o->pass->blend = &v->elements[variable_idx]; + } + else + o->pass->blend = v; break; } @@ -2926,11 +2937,11 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) { case D3D10_EOT_RASTERIZER_STATE: case D3D10_EOT_DEPTH_STENCIL_STATE: - break; - case D3D10_EOT_BLEND_STATE: - ID3D10Device_OMSetBlendState(device, o->object.bs, o->pass->blend_factor, o->pass->sample_mask); - return S_OK; + case D3D10_EOT_STENCIL_REF: + case D3D10_EOT_BLEND_FACTOR: + case D3D10_EOT_SAMPLE_MASK: + break; case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); @@ -2944,11 +2955,6 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_GSSetShader(device, o->object.gs); return S_OK; - case D3D10_EOT_STENCIL_REF: - case D3D10_EOT_BLEND_FACTOR: - case D3D10_EOT_SAMPLE_MASK: - return S_OK; - default: FIXME("Unhandled effect object type %#x.\n", o->type); return E_FAIL; @@ -4125,6 +4131,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (pass->depth_stencil) ID3D10Device_OMSetDepthStencilState(device, pass->depth_stencil->u.state.object.depth_stencil, pass->stencil_ref); + if (pass->blend) + ID3D10Device_OMSetBlendState(device, pass->blend->u.state.object.blend, + pass->blend_factor, pass->sample_mask); for (i = 0; i < pass->object_count; ++i) {

1 0

Nikolay Sivov : d3d10/effect: Set state block masks for state variables.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: e893e6e27bc3d97901f65519a14bce6e588f65bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e893e6e27bc3d97901f65519… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:38 2021 +0300 d3d10/effect: Set state block masks for state variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 6 ++++++ dlls/d3d10/tests/effect.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index afcd292356e..0ba906375d7 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4157,6 +4157,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10E D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_PS, 0, 1); if (pass->gs.shader != &null_shader_variable) D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_GS, 0, 1); + if (pass->rasterizer) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_RS_RASTERIZER_STATE, 0, 1); + if (pass->depth_stencil) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0, 1); + if (pass->blend) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_OM_BLEND_STATE, 0, 1); return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 1a06ff95365..781abb46745 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4331,13 +4331,10 @@ static void test_effect_state_groups(void) hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); -todo_wine ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); -todo_wine ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_BLEND_STATE, 0); -todo_wine ok(ret, "Unexpected mask.\n"); hr = pass->lpVtbl->Apply(pass, 0);

1 0

Gabriel Ivăncescu : mshtml: Cap the compat mode for filters collection to IE8 mode.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: f7ea38d708311df8d1f72b1b53d7c4c2f73504f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ea38d708311df8d1f72b1b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 7 16:52:29 2021 +0300 mshtml: Cap the compat mode for filters collection to IE8 mode. So dispex_to_string returns [object]. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index dada4de9ab7..29aa378b6bf 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7074,7 +7074,7 @@ static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFilters collection->ref = 1; init_dispatch(&collection->dispex, (IUnknown*)&collection->IHTMLFiltersCollection_iface, - &HTMLFiltersCollection_dispex, compat_mode); + &HTMLFiltersCollection_dispex, min(compat_mode, COMPAT_MODE_IE8)); *ret = &collection->IHTMLFiltersCollection_iface; return S_OK;

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLElement's toString.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: a0108b3095b19087a7e8da472aa4de376b7a96ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0108b3095b19087a7e8da47… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 7 16:52:30 2021 +0300 mshtml: Implement HTMLElement's toString. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 181 ++++++++++++++++++++++++++++++++------ dlls/mshtml/tests/documentmode.js | 154 ++++++++++++++++++++++++++++++++ 2 files changed, 306 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0108b3095b19087a7e8…

1 0

Alexandre Julliard : configure: Remove some no longer needed configure checks.
by Alexandre Julliard 07 Oct '21

07 Oct '21

Module: wine Branch: master Commit: ae9f64c4642fdb3d1ff3bc54220ae55b2e0a3e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9f64c4642fdb3d1ff3bc54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 7 14:35:03 2021 +0200 configure: Remove some no longer needed configure checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 98 +++-------------------------------------------------- configure.ac | 36 ++------------------ include/config.h.in | 24 ------------- libs/wine/config.c | 2 -- 4 files changed, 6 insertions(+), 154 deletions(-) diff --git a/configure b/configure index 8a7e8fece1e..7fdd2085ad1 100755 --- a/configure +++ b/configure @@ -7480,7 +7480,6 @@ for ac_header in \ elf.h \ float.h \ gettext-po.h \ - grp.h \ gsm.h \ gsm/gsm.h \ ieeefp.h \ @@ -17893,8 +17892,6 @@ esac ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" for ac_func in \ - __res_get_state \ - __res_getservers \ epoll_create \ fork \ fstatfs \ @@ -17992,13 +17989,12 @@ fi ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $DL_LIBS" -for ac_func in dladdr dlinfo +for ac_func in dlinfo do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + ac_fn_c_check_func "$LINENO" "dlinfo" "ac_cv_func_dlinfo" +if test "x$ac_cv_func_dlinfo" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DLINFO 1 _ACEOF fi @@ -18569,47 +18565,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex" >&5 -$as_echo_n "checking for if_nameindex... " >&6; } -if ${wine_cv_have_if_nameindex+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NET_IF_H -# include <net/if.h> -#endif -int -main () -{ -struct if_nameindex *p = if_nameindex(); return p->if_index; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - wine_cv_have_if_nameindex=yes -else - wine_cv_have_if_nameindex=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_if_nameindex" >&5 -$as_echo "$wine_cv_have_if_nameindex" >&6; } -if test "$wine_cv_have_if_nameindex" = "yes" -then - -$as_echo "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5 $as_echo_n "checking for sigaddset... " >&6; } if ${wine_cv_have_sigaddset+:} false; then : @@ -18751,22 +18706,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -fi -ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> -#endif -" -if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 -_ACEOF - - fi ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H @@ -18867,15 +18806,6 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLOCKS 1 -_ACEOF - - -fi ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then : @@ -19028,26 +18958,6 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "ns_msg" "_msg_ptr" "ac_cv_member_ns_msg__msg_ptr" "#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif -" -if test "x$ac_cv_member_ns_msg__msg_ptr" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_NS_MSG__MSG_PTR 1 -_ACEOF - - -fi - - ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index 39fb1eabc4b..d9935f63c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -451,7 +451,6 @@ AC_CHECK_HEADERS(\ elf.h \ float.h \ gettext-po.h \ - grp.h \ gsm.h \ gsm/gsm.h \ ieeefp.h \ @@ -2125,8 +2124,6 @@ dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $BUILTINFLAG" AC_CHECK_FUNCS(\ - __res_get_state \ - __res_getservers \ epoll_create \ fork \ fstatfs \ @@ -2157,7 +2154,7 @@ CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) -WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) +WINE_CHECK_LIB_FUNCS(dlinfo,[$DL_LIBS]) dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) @@ -2262,22 +2259,6 @@ AC_CHECK_MEMBERS([struct ff_effect.direction],,, #include <linux/input.h> #endif]) -AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NET_IF_H -# include <net/if.h> -#endif]], - [[struct if_nameindex *p = if_nameindex(); return p->if_index;]])],[wine_cv_have_if_nameindex=yes],[wine_cv_have_if_nameindex=no])) -if test "$wine_cv_have_if_nameindex" = "yes" -then - AC_DEFINE(HAVE_IF_NAMEINDEX, 1, [Define to 1 if you have the `if_nameindex' function.]) -fi - AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no])) if test "$wine_cv_have_sigaddset" = "yes" @@ -2332,7 +2313,7 @@ then fi dnl Check for socket structure members -AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,, +AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr_un.sun_len],,, [#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -2360,7 +2341,6 @@ AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt dnl Check for stat.st_blocks and ns-resolved times AC_CHECK_MEMBERS([ - struct stat.st_blocks, struct stat.st_mtim, struct stat.st_mtimespec, struct stat.st_ctim, @@ -2400,18 +2380,6 @@ AC_CHECK_MEMBERS([struct __res_state._u._ext.nscount6],,, #include <resolv.h> #endif]) -dnl Check for ns_msg ptr member -AC_CHECK_MEMBERS([ns_msg._msg_ptr],,, -[#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_NAMESER_H -# include <arpa/nameser.h> -#endif]) - dnl Check for struct icmpstat AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/include/config.h.in b/include/config.h.in index fc3749895a3..f262f8a0a12 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -59,9 +59,6 @@ file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H -/* Define to 1 if you have the `dladdr' function. */ -#undef HAVE_DLADDR - /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H @@ -150,9 +147,6 @@ /* Define if we have the libgphoto2_port development environment */ #undef HAVE_GPHOTO2_PORT -/* Define to 1 if you have the <grp.h> header file. */ -#undef HAVE_GRP_H - /* Define to 1 if you have the <gsm/gsm.h> header file. */ #undef HAVE_GSM_GSM_H @@ -171,9 +165,6 @@ /* Define to 1 if you have the <ifaddrs.h> header file. */ #undef HAVE_IFADDRS_H -/* Define to 1 if you have the `if_nameindex' function. */ -#undef HAVE_IF_NAMEINDEX - /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -447,9 +438,6 @@ /* Define to 1 if you have the <net/route.h> header file. */ #undef HAVE_NET_ROUTE_H -/* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */ -#undef HAVE_NS_MSG__MSG_PTR - /* Define to 1 if OpenAL is available */ #undef HAVE_OPENAL @@ -621,9 +609,6 @@ /* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */ #undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID -/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */ -#undef HAVE_STRUCT_SOCKADDR_SA_LEN - /* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN @@ -642,9 +627,6 @@ /* Define to 1 if `st_birthtimespec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC -/* Define to 1 if `st_blocks' is a member of `struct stat'. */ -#undef HAVE_STRUCT_STAT_ST_BLOCKS - /* Define to 1 if `st_ctim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_CTIM @@ -963,12 +945,6 @@ function. */ #undef HAVE___CLEAR_CACHE -/* Define to 1 if you have the `__res_getservers' function. */ -#undef HAVE___RES_GETSERVERS - -/* Define to 1 if you have the `__res_get_state' function. */ -#undef HAVE___RES_GET_STATE - /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>. */ #undef MAJOR_IN_MKDEV diff --git a/libs/wine/config.c b/libs/wine/config.c index 368491c3ae9..b8f1bd5f86d 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -109,7 +109,6 @@ static char *build_path( const char *dir, const char *name ) /* return the directory that contains the library at run-time */ static char *get_runtime_libdir(void) { -#ifdef HAVE_DLADDR Dl_info info; char *libdir; @@ -123,7 +122,6 @@ static char *get_runtime_libdir(void) libdir[len] = 0; return libdir; } -#endif /* HAVE_DLADDR */ return NULL; }

1 0