April 2017 - Wine-commits - list.winehq.org

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSSetSamplers().
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: aff0026e688433ed2fbffd2c60efae856f79c75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0026e688433ed2fbffd2c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:53 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetSamplers(). 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/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b6031b4..095908d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1242,8 +1242,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_ds_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Add parent ops for sampler objects.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 5b0fe9cee5b88563d9e30849a6c1c362519191bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0fe9cee5b88563d9e30849a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:54 2017 +0200 wined3d: Add parent ops for sampler objects. 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/d3d11/state.c | 3 ++- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/sampler.c | 10 +++++++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 0a16e58..c8e443f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1211,7 +1211,8 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); wined3d_desc.srgb_decode = TRUE; - if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, state, &state->wined3d_sampler))) + if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, + state, &d3d_null_wined3d_parent_ops, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c901e9f..9499f6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -786,7 +786,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 * sampler object is used to emulate the direct resource access when there is no sampler state * to use. */ - if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->default_sampler))) + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->default_sampler))) { ERR("Failed to create default sampler, hr %#x.\n", hr); device->default_sampler = NULL; @@ -799,7 +799,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 desc.mag_filter = WINED3D_TEXF_LINEAR; desc.min_filter = WINED3D_TEXF_LINEAR; desc.mip_filter = WINED3D_TEXF_LINEAR; - if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->null_sampler))) + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->null_sampler))) { ERR("Failed to create null sampler, hr %#x.\n", hr); device->null_sampler = NULL; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 294d766..86d23a0 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -57,7 +57,10 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) + { + sampler->parent_ops->wined3d_object_destroyed(sampler->parent); wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_destroy_object, sampler); + } return refcount; } @@ -112,11 +115,12 @@ static void wined3d_sampler_cs_init(void *object) } static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d_device *device, - const struct wined3d_sampler_desc *desc, void *parent) + const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { sampler->refcount = 1; sampler->device = device; sampler->parent = parent; + sampler->parent_ops = parent_ops; sampler->desc = *desc; if (device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) @@ -124,7 +128,7 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d } HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, struct wined3d_sampler **sampler) + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) { struct wined3d_sampler *object; @@ -143,7 +147,7 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_sampler_init(object, device, desc, parent); + wined3d_sampler_init(object, device, desc, parent, parent_ops); TRACE("Created sampler %p.\n", object); *sampler = object; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 531dd98..12ef3bb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3616,7 +3616,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } else { - if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) + if (FAILED(wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &sampler))) { ERR("Failed to create sampler.\n"); return; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9b8de3e..0f27de3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,7 +223,7 @@ @ cdecl wined3d_rendertarget_view_incref(ptr) @ cdecl wined3d_rendertarget_view_set_parent(ptr ptr) -@ cdecl wined3d_sampler_create(ptr ptr ptr ptr) +@ cdecl wined3d_sampler_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_sampler_decref(ptr) @ cdecl wined3d_sampler_get_parent(ptr) @ cdecl wined3d_sampler_incref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 357ceed..751f092 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3110,10 +3110,11 @@ struct wined3d_sampler { struct wine_rb_entry entry; LONG refcount; + GLuint name; struct wined3d_device *device; void *parent; + const struct wined3d_parent_ops *parent_ops; struct wined3d_sampler_desc desc; - GLuint name; }; void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0d85cb4..2d69e98 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2531,7 +2531,7 @@ ULONG __cdecl wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view void __cdecl wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent); HRESULT __cdecl wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, struct wined3d_sampler **sampler); + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler); ULONG __cdecl wined3d_sampler_decref(struct wined3d_sampler *sampler); void * __cdecl wined3d_sampler_get_parent(const struct wined3d_sampler *sampler); ULONG __cdecl wined3d_sampler_incref(struct wined3d_sampler *sampler);

1 0

Jactry Zeng : zh-cn: Update the Downloads page.
by Jeremy Newman 26 Apr '17

26 Apr '17

Module: website Branch: master Commit: ae9d6d0f30f9f20da3ea801f360f7e412437e4cc URL: http://source.winehq.org/git/website.git/?a=commit;h=ae9d6d0f30f9f20da3ea80… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 25 10:50:04 2017 +0800 zh-cn: Update the Downloads page. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/zh-cn/download.template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 32d5b5e..a372d44 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -71,15 +71,15 @@ <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> <div class="col-md-10"> <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - 供给 Ubuntu 12.04，14.04，15.04，15.10，16.04 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Ubuntu 14.04、16.04、16.10 和 17.04 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - 供给 Debian Wheezy，Jessie，Stretch 及 Sid 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Debian Wheezy、Jessie、Stretch 和 Sid 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - 供给 Fedora 22 及 23 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Fedora 24 和 25 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - 供给 Mageia 4 及 5 的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 Mageia 5 的 WineHQ 安装包</p> <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - 供给 macOS 10.8 或更新版本的开发版和 staging 版 WineHQ 安装包</p> + - 适用于 macOS 10.8 或更新版本的 WineHQ 安装包</p> </div> </div>

1 0

Hugh McMaster : regedit: Re-implement processSetValue().
by Alexandre Julliard 25 Apr '17

25 Apr '17

1 0

Daniel Lehman : server: Fix copy & paste for number of subkeys.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 47df3778aa85c20a05d12f8d2869e268c8e979f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47df3778aa85c20a05d12f8d2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 25 09:46:18 2017 -0700 server: Fix copy & paste for number of subkeys. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 0731b22..734a111 100644 --- a/server/registry.c +++ b/server/registry.c @@ -568,7 +568,7 @@ static int grow_subkeys( struct key *key ) } else { - nb_subkeys = MIN_VALUES; + nb_subkeys = MIN_SUBKEYS; if (!(new_subkeys = mem_alloc( nb_subkeys * sizeof(*new_subkeys) ))) return 0; } key->subkeys = new_subkeys;

1 0

Michael Stefaniuc : dmscript/tests: Just use proper IUnknown implementations for aggregation.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 89ef7b59f548a76960b2278d819a8f915c81e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ef7b59f548a76960b2278d8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 20:47:40 2017 +0200 dmscript/tests: Just use proper IUnknown implementations for aggregation. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/tests/dmscript.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 82e874c..13540ff 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -88,11 +88,7 @@ static void test_COM(void) ULONG refcount; HRESULT hr; - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicScript, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dms); - todo_wine ok(hr == E_POINTER, "DirectMusicScript create failed: %08x, expected E_POINTER\n", hr); - /* An invalid non-NULL pUnkOuter crashes newer Windows versions */ + /* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */ hr = CoCreateInstance(&CLSID_DirectMusicScript, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, @@ -137,15 +133,16 @@ static void test_COM_scripttrack(void) IDirectMusicTrack *dmt; IPersistStream *ps; IUnknown *unk; + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; ULONG refcount; HRESULT hr; - /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, (IUnknown*)&dmt, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dmt); + /* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, &unk_obj.IUnknown_iface, + CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, "DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dmt, "dmt = %p\n", dmt); + ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_hs_resource_view().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 96d569042db4c58c7d8458c4c404017a2cb94930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d569042db4c58c7d8458c4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:45 2017 +0200 wined3d: Introduce wined3d_device_set_hs_resource_view(). 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/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index edd11a3..b51f660 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2685,6 +2685,14 @@ void CDECL wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_HULL, idx, buffer); } +void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view) +{ + TRACE("device %p, idx %u, view %p.\n", device, idx, view); + + wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_HULL, idx, view); +} + void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 32b2f6c..ff43e17 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -135,6 +135,7 @@ @ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_hs_cb(ptr long ptr) +@ cdecl wined3d_device_set_hs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_hull_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_set_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5f84c77..a4362b6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2328,6 +2328,8 @@ void __cdecl wined3d_device_set_gs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_hs_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSSetShaderResources().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: a077912e6b3da241ce76183ab3c9bad19e87c426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a077912e6b3da241ce76183ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:46 2017 +0200 d3d11: Implement d3d11_immediate_context_HSSetShaderResources(). 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/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1c38733..acefd77 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1128,8 +1128,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_hs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_ds_resource_view().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 2654710f449cde98650734fc25dd852a2c62dc87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2654710f449cde98650734fc2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:47 2017 +0200 wined3d: Introduce wined3d_device_set_ds_resource_view(). 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/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b51f660..f5825be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2724,6 +2724,14 @@ void CDECL wined3d_device_set_ds_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_DOMAIN, idx, buffer); } +void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view) +{ + TRACE("device %p, idx %u, view %p.\n", device, idx, view); + + wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_DOMAIN, idx, view); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ff43e17..11e7777 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_domain_shader(ptr ptr) @ cdecl wined3d_device_set_ds_cb(ptr long ptr) +@ cdecl wined3d_device_set_ds_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a4362b6..55a4ed9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2320,6 +2320,8 @@ void __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_ds_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_ds_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSSetShaderResources().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 094186982b8d93f493f2344dac383499a1f49262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094186982b8d93f493f2344da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:48 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetShaderResources(). 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/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index acefd77..6552d78 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1192,8 +1192,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_ds_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext *iface,

1 0