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

Sebastian Lackner : wined3d: Release resources on error in wined3d_cs_exec_blt_sub_resource.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 20adccf866dc2ff09182e8ab7ec545ecda41d332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20adccf866dc2ff09182e8ab7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 19 18:55:17 2017 +0200 wined3d: Release resources on error in wined3d_cs_exec_blt_sub_resource. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a579503..951520e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1934,14 +1934,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * { FIXME("Flags %#x not implemented for %s resources.\n", op->flags, debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } if (op->src_resource->format != op->dst_resource->format) { FIXME("Format conversion not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } update_w = op->dst_box.right - op->dst_box.left; @@ -1953,14 +1953,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * { FIXME("Stretching not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } if (op->src_box.left || op->src_box.top || op->src_box.front) { FIXME("Source box %s not supported for %s resources.\n", debug_box(&op->src_box), debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } dst_texture = texture_from_resource(op->dst_resource); @@ -1974,7 +1974,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * ERR("Failed to load source sub-resource into %s.\n", wined3d_debug_location(src_texture->resource.map_binding)); context_release(context); - return; + goto error; } level = op->dst_sub_resource_idx % dst_texture->level_count; @@ -1989,7 +1989,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * { ERR("Failed to load destination sub-resource.\n"); context_release(context); - return; + goto error; } wined3d_texture_get_memory(src_texture, op->src_sub_resource_idx, &addr, src_texture->resource.map_binding); @@ -2009,6 +2009,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); } +error: if (op->src_resource) wined3d_resource_release(op->src_resource); wined3d_resource_release(op->dst_resource);

1 0

Sebastian Lackner : wined3d: Fix double free in geometry_shader_init.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 9b00f0182bc0afc9a30420163e96f85612486b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b00f0182bc0afc9a30420163… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 19 18:55:32 2017 +0200 wined3d: Fix double free in geometry_shader_init. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3681a8d..7dc276f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3433,21 +3433,23 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, void *parent, const struct wined3d_parent_ops *parent_ops) { + struct wined3d_stream_output_element *elements = NULL; HRESULT hr; + if (so_desc && !(elements = wined3d_calloc(so_desc->element_count, sizeof(*elements)))) + return E_OUTOFMEMORY; + if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) + { + HeapFree(GetProcessHeap(), 0, elements); return hr; + } if (so_desc) { - struct wined3d_stream_output_desc *d = &shader->u.gs.so_desc; - *d = *so_desc; - if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements)))) - { - wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); - return E_OUTOFMEMORY; - } - memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements)); + shader->u.gs.so_desc = *so_desc; + shader->u.gs.so_desc.elements = elements; + memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements)); } return WINED3D_OK;

1 0

Józef Kucia : wined3d: Formalize requirements for layout qualifiers.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: d5b9271e826e102725d92d650d8ad25178fcec65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b9271e826e102725d92d650… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:10 2017 +0200 wined3d: Formalize requirements for layout qualifiers. 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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 57b9138..dffbf18 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -557,6 +557,14 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro print_glsl_info_log(gl_info, program, TRUE); } +static BOOL shader_glsl_use_layout_qualifier(const struct wined3d_gl_info *gl_info) +{ + /* Layout qualifiers were introduced in GLSL 1.40. The Nvidia Legacy GPU + * driver (series 340.xx) doesn't parse layout qualifiers in older GLSL + * versions. */ + return shader_glsl_get_version(gl_info) >= 140; +} + static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info) { return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]; @@ -2021,7 +2029,8 @@ static BOOL needs_legacy_glsl_syntax(const struct wined3d_gl_info *gl_info) static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_info *gl_info) { - return !needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]; + return gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION] + && shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info); } static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info)

1 0

Józef Kucia : wined3d: Avoid multiple layout qualifiers for uniform blocks.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 74773a160375bfc059525bb71495a4e63924ee46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74773a160375bfc059525bb71… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:11 2017 +0200 wined3d: Avoid multiple layout qualifiers for uniform blocks. Nvidia Legacy GPU driver (340.xx series) doesn't allow multiple layout qualifiers. 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dffbf18..856a5b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2318,9 +2318,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { if (reg_maps->cb_sizes[i]) { + shader_addline(buffer, "layout(std140"); if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_addline(buffer, "layout(binding = %u)\n", uniform_block_base + i); - shader_addline(buffer, "layout(std140) uniform block_%s_cb%u { vec4 %s_cb%u[%u]; };\n", + shader_addline(buffer, ", binding = %u", uniform_block_base + i); + shader_addline(buffer, ") uniform block_%s_cb%u { vec4 %s_cb%u[%u]; };\n", prefix, i, prefix, i, reg_maps->cb_sizes[i]); } }

1 0

Józef Kucia : wined3d: Use layout binding qualifiers with legacy contexts.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: d007ca28cb7aa2731104d39d1059b762678577d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d007ca28cb7aa2731104d39d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:12 2017 +0200 wined3d: Use layout binding qualifiers with legacy contexts. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 856a5b5..f875d06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -567,7 +567,7 @@ static BOOL shader_glsl_use_layout_qualifier(const struct wined3d_gl_info *gl_in static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info) { - return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]; + return gl_info->supported[ARB_SHADING_LANGUAGE_420PACK] && shader_glsl_use_layout_qualifier(gl_info); } static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info *gl_info,

1 0

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

20 Apr '17

Module: wine Branch: master Commit: 94c11d23d171e531cdbb8303522554ac2ecf7d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c11d23d171e531cdbb83035… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:13 2017 +0200 wined3d: Introduce wined3d_device_set_hull_shader(). 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 | 17 +++++++++++++++++ dlls/wined3d/state.c | 2 ++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e90be5..154197c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2654,6 +2654,23 @@ HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device return WINED3D_OK; } +void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + struct wined3d_shader *prev; + + TRACE("device %p, shader %p.\n", device, shader); + + prev = device->update_state->shader[WINED3D_SHADER_TYPE_HULL]; + if (shader == prev) + return; + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_HULL] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_HULL, shader); + if (prev) + wined3d_shader_decref(prev); +} + 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/state.c b/dlls/wined3d/state.c index 2c47ce6..5c22a04 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5207,6 +5207,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_compute_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, @@ -5988,6 +5989,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_STREAMSRC, STATE_INDEXBUFFER, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), + STATE_SHADER(WINED3D_SHADER_TYPE_HULL), STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ad02eeb..dd8b743 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -128,6 +128,7 @@ @ cdecl wined3d_device_set_gs_cb(ptr long ptr) @ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gs_sampler(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) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1bf5a6c..bbcea55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2303,6 +2303,7 @@ void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, s 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_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); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

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

20 Apr '17

Module: wine Branch: master Commit: 595a5de39048781a82ff423c34cc4d0545045906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595a5de39048781a82ff423c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:14 2017 +0200 d3d11: Implement d3d11_immediate_context_HSSetShader(). 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/shader.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 10709c4..b5b2678 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -293,6 +293,7 @@ struct d3d11_hull_shader HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d11_hull_shader **shader) DECLSPEC_HIDDEN; +struct d3d11_hull_shader *unsafe_impl_from_ID3D11HullShader(ID3D11HullShader *iface) DECLSPEC_HIDDEN; /* ID3D11DomainShader */ struct d3d11_domain_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e6702fc..6f71d4d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1135,8 +1135,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext *iface, ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_hull_shader *hs = unsafe_impl_from_ID3D11HullShader(shader); + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances) + FIXME("Dynamic linking is not implemented yet.\n"); + + wined3d_mutex_lock(); + wined3d_device_set_hull_shader(device->wined3d_device, hs ? hs->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 420a47d..7531586 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -788,6 +788,15 @@ HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_cod return S_OK; } +struct d3d11_hull_shader *unsafe_impl_from_ID3D11HullShader(ID3D11HullShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_hull_shader_vtbl); + + return impl_from_ID3D11HullShader(iface); +} + /* ID3D11DomainShader methods */ static inline struct d3d11_domain_shader *impl_from_ID3D11DomainShader(ID3D11DomainShader *iface)

1 0

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

20 Apr '17

Module: wine Branch: master Commit: 69d771618c23c88ed094712dcf0125e52b31f777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d771618c23c88ed094712dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:15 2017 +0200 wined3d: Introduce wined3d_device_set_domain_shader(). 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 | 17 +++++++++++++++++ dlls/wined3d/state.c | 2 ++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 154197c..a3924c0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2671,6 +2671,23 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader_decref(prev); } +void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + struct wined3d_shader *prev; + + TRACE("device %p, shader %p.\n", device, shader); + + prev = device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN]; + if (shader == prev) + return; + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_DOMAIN, shader); + if (prev) + wined3d_shader_decref(prev); +} + 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/state.c b/dlls/wined3d/state.c index 5c22a04..06e2fbb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5208,6 +5208,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), state_shader }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN), { STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_compute_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, @@ -5990,6 +5991,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_INDEXBUFFER, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), STATE_SHADER(WINED3D_SHADER_TYPE_HULL), + STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN), STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index dd8b743..3331066 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -123,6 +123,7 @@ @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) @ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_set_dialog_box_mode(ptr long) +@ cdecl wined3d_device_set_domain_shader(ptr 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 bbcea55..c2729fb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2296,6 +2296,7 @@ HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *devi void __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); 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_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_DSSetShader().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: cefc48e8823c126e02050ac88cd09e71d67acfb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefc48e8823c126e02050ac88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:16 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetShader(). 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/shader.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b5b2678..193a07f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -308,6 +308,7 @@ struct d3d11_domain_shader HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d11_domain_shader **shader) DECLSPEC_HIDDEN; +struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) DECLSPEC_HIDDEN; /* ID3D11GeometryShader, ID3D10GeometryShader */ struct d3d_geometry_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6f71d4d..d2eaec8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1173,8 +1173,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext *iface, ID3D11DomainShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_domain_shader *ds = unsafe_impl_from_ID3D11DomainShader(shader); + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances) + FIXME("Dynamic linking is not implemented yet.\n"); + + wined3d_mutex_lock(); + wined3d_device_set_domain_shader(device->wined3d_device, ds ? ds->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 7531586..6266a34 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -984,6 +984,15 @@ HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_c return S_OK; } +struct d3d11_domain_shader *unsafe_impl_from_ID3D11DomainShader(ID3D11DomainShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_domain_shader_vtbl); + + return impl_from_ID3D11DomainShader(iface); +} + /* ID3D11GeometryShader methods */ static inline struct d3d_geometry_shader *impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface)

1 0

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

20 Apr '17

Module: wine Branch: master Commit: 3c1726c2b5013e456b0b10f4f62db3f328dfd8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1726c2b5013e456b0b10f4f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:17 2017 +0200 wined3d: Introduce wined3d_device_get_hull_shader(). 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 | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a3924c0..961bda6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2671,6 +2671,13 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_get_hull_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->state.shader[WINED3D_SHADER_TYPE_HULL]; +} + 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 3331066..e5edcb4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -64,6 +64,7 @@ @ cdecl wined3d_device_get_gs_cb(ptr long) @ cdecl wined3d_device_get_gs_resource_view(ptr long) @ cdecl wined3d_device_get_gs_sampler(ptr long) +@ cdecl wined3d_device_get_hull_shader(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c2729fb..6733087 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2203,6 +2203,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_de struct wined3d_shader_resource_view * __cdecl wined3d_device_get_gs_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); +struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,

1 0