March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_scissor_rects().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 1ec669565010acf86ad21d38435894595a8456bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ec669565010acf86ad21d38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:22 2021 -0500 wined3d: Introduce wined3d_device_context_set_scissor_rects(). 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 | 45 ++++++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ba5215c076..3feabbe79f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1835,7 +1835,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device, void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rects) { - struct wined3d_state *state = device->cs->c.state; unsigned int i; TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); @@ -1845,20 +1844,7 @@ void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsig TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); } - if (state->scissor_rect_count == rect_count - && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) - { - TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); - return; - } - - if (rect_count) - memcpy(state->scissor_rects, rects, rect_count * sizeof(*rects)); - else - memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); - state->scissor_rect_count = rect_count; - - wined3d_device_context_emit_set_scissor_rects(&device->cs->c, rect_count, rects); + wined3d_device_context_set_scissor_rects(&device->cs->c, rect_count, rects); } void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, unsigned int *rect_count, RECT *rects) @@ -2173,6 +2159,35 @@ void CDECL wined3d_device_context_set_viewports(struct wined3d_device_context *c wined3d_device_context_emit_set_viewports(context, viewport_count, viewports); } +void CDECL wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, + const RECT *rects) +{ + struct wined3d_state *state = context->state; + unsigned int i; + + TRACE("context %p, rect_count %u, rects %p.\n", context, rect_count, rects); + + for (i = 0; i < rect_count; ++i) + { + TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); + } + + if (state->scissor_rect_count == rect_count + && !memcmp(state->scissor_rects, rects, rect_count * sizeof(*rects))) + { + TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); + return; + } + + if (rect_count) + memcpy(state->scissor_rects, rects, rect_count * sizeof(*rects)); + else + memset(state->scissor_rects, 0, sizeof(state->scissor_rects)); + state->scissor_rect_count = rect_count; + + wined3d_device_context_emit_set_scissor_rects(context, rect_count, rects); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8fc190b73ba..60d85a46290 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,6 +170,7 @@ @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_context_set_rasterizer_state(ptr ptr) +@ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f3de0098ef3..7b585b92cef 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2556,6 +2556,8 @@ void __cdecl wined3d_device_context_set_depth_stencil_state(struct wined3d_devic struct wined3d_depth_stencil_state *depth_stencil_state, unsigned int stencil_ref); void __cdecl wined3d_device_context_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); +void __cdecl wined3d_device_context_set_scissor_rects(struct wined3d_device_context *context, unsigned int rect_count, + const RECT *rects); void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_scissor_rects().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: bf1001e16cf3891f111af57f2b4ddb8df7913fba URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1001e16cf3891f111af57f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 16 00:42:23 2021 -0500 d3d11: Use wined3d_device_context_set_scissor_rects(). 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/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 190e60be4b4..005698b2b6c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1189,7 +1189,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetViewports(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11DeviceContext1 *iface, UINT rect_count, const D3D11_RECT *rects) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); @@ -1197,7 +1197,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); + wined3d_device_context_set_scissor_rects(context->wined3d_context, rect_count, rects); wined3d_mutex_unlock(); }

1 0

Francois Gouget : dwrite: Fix the case of FreeType in a comment.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 9d5e17654db43d4dff9c32488d8f0c93877e2092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5e17654db43d4dff9c3248… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 16 10:32:02 2021 +0100 dwrite: Fix the case of FreeType in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a74c9712b6a..6e5624c622a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6484,7 +6484,7 @@ BOOL opentype_has_kerning_pairs(struct dwrite_fontface *fontface) count = GET_BE_WORD(header->table_count); offset = sizeof(*header); - /* Freetype limits table count this way. */ + /* FreeType limits table count this way. */ count = min(count, 32); /* Check for presence of format 0 subtable with horizontal coverage. */

1 0

Hans Leidekker : webservices: Implement WS_CHANNEL_PROPERTY_NO_DELAY.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: a613bee2764cf0bd2f84146d1a862513f02e426e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a613bee2764cf0bd2f84146d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 16 17:07:35 2021 +0100 webservices: Implement WS_CHANNEL_PROPERTY_NO_DELAY. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index f2906c86733..fd7c8d6029d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -971,6 +971,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; + BOOL nodelay = FALSE; int addr_len; WS_URL_SCHEME_TYPE scheme; WCHAR *host; @@ -1002,6 +1003,8 @@ static HRESULT connect_channel_tcp( struct channel *channel ) return HRESULT_FROM_WIN32( WSAGetLastError() ); } + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); return S_OK; } @@ -2410,7 +2413,12 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE return E_INVALIDARG; } - hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket ); + if ((hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket )) == S_OK) + { + BOOL nodelay = FALSE; + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); + } LeaveCriticalSection( &channel->cs ); return hr;

1 0

Henri Verbeet : wined3d: Add a missing barrier to wined3d_shader_resource_view_vk_generate_mipmap().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 8c47318081de803a443bd688091c3295f690a519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c47318081de803a443bd688… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:25 2021 +0100 wined3d: Add a missing barrier to wined3d_shader_resource_view_vk_generate_mipmap(). Specifically, the one for using the new destination as blit target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 74a100405aa..fec7e950a64 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1369,14 +1369,20 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou } else { + region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; + region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + texture_vk->vk_image, &vk_src_range); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_WRITE_BIT, + texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, texture_vk->vk_image, &vk_dst_range); - - region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; - region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; } }

1 0

Henri Verbeet : wined3d: Take the layer index into account in wined3d_shader_resource_view_gl_generate_mipmap().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 65808926600673236b222127a106b206243bff88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65808926600673236b222127… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:26 2021 +0100 wined3d: Take the layer index into account in wined3d_shader_resource_view_gl_generate_mipmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index fec7e950a64..cd13da02078 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1197,7 +1197,7 @@ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resou void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - unsigned int i, j, layer_count, level_count, base_level, max_level; + unsigned int i, j, layer_count, level_count, base_level, base_layer; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_gl *texture_gl; struct gl_texture *gl_tex; @@ -1209,14 +1209,16 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; base_level = view_gl->v.desc.u.texture.level_idx; - max_level = base_level + level_count - 1; + base_layer = view_gl->v.desc.u.texture.layer_idx; texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); srgb = !!(texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) { - wined3d_texture_load_location(&texture_gl->t, i * level_count + base_level, &context_gl->c, location); + if (!wined3d_texture_load_location(&texture_gl->t, + (base_layer + i) * level_count + base_level, &context_gl->c, location)) + ERR("Failed to load source layer %u.\n", base_layer + i); } if (view_gl->gl_view.name) @@ -1227,7 +1229,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou { wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, base_level + level_count - 1); } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) @@ -1245,10 +1247,12 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou for (i = 0; i < layer_count; ++i) { - for (j = base_level + 1; j <= max_level; ++j) + for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_gl->t, i * level_count + j, location); - wined3d_texture_invalidate_location(&texture_gl->t, i * level_count + j, ~location); + wined3d_texture_validate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, location); + wined3d_texture_invalidate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, ~location); } }

1 0

Henri Verbeet : d3d11: Store the feature level in the d3d_device_context_state structure.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 7894edc48a1ad09e1945586a5d5be4ac5a3e3b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7894edc48a1ad09e1945586a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:27 2021 +0100 d3d11: Store the feature level in the d3d_device_context_state structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 36 ++++++++++++++++++++---------------- dlls/d3d11/shader.c | 8 ++++---- dlls/d3d11/texture.c | 2 +- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index b33be57d439..09d495c3f61 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -443,7 +443,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev buffer->refcount = 1; buffer->desc = *desc; - if (!validate_buffer_desc(&buffer->desc, device->feature_level)) + if (!validate_buffer_desc(&buffer->desc, device->state->feature_level)) return E_INVALIDARG; wined3d_desc.byte_width = buffer->desc.ByteWidth; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5a812e1b254..7f050f5af6f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -529,6 +529,7 @@ struct d3d_device_context_state LONG refcount, private_refcount; struct wined3d_private_store private_store; + D3D_FEATURE_LEVEL feature_level; GUID emulated_interface; struct d3d_device_context_state_entry *entries; @@ -562,7 +563,6 @@ struct d3d_device IUnknown *outer_unk; LONG refcount; - D3D_FEATURE_LEVEL feature_level; BOOL d3d11_only; struct d3d_device_context_state *state; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 005698b2b6c..d2a3931b724 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -62,6 +62,11 @@ static inline BOOL d3d_device_is_d3d10_active(struct d3d_device *device) || IsEqualGUID(&device->state->emulated_interface, &IID_ID3D10Device1); } +static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) +{ + return (D3D_FEATURE_LEVEL)level; +} + /* ID3DDeviceContextState methods */ static inline struct d3d_device_context_state *impl_from_ID3DDeviceContextState(ID3DDeviceContextState *iface) @@ -296,7 +301,7 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d return entry->wined3d_state; if (FAILED(wined3d_state_create(device->wined3d_device, - (enum wined3d_feature_level *)&device->feature_level, 1, &wined3d_state))) + (enum wined3d_feature_level *)&state->feature_level, 1, &wined3d_state))) return NULL; if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) @@ -308,14 +313,15 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d return wined3d_state; } -static void d3d_device_context_state_init(struct d3d_device_context_state *state, struct d3d_device *device, - REFIID emulated_interface) +static void d3d_device_context_state_init(struct d3d_device_context_state *state, + struct d3d_device *device, D3D_FEATURE_LEVEL feature_level, REFIID emulated_interface) { state->ID3DDeviceContextState_iface.lpVtbl = &d3d_device_context_state_vtbl; state->refcount = state->private_refcount = 0; wined3d_private_store_init(&state->private_store); + state->feature_level = feature_level; state->emulated_interface = *emulated_interface; wined3d_device_incref(state->wined3d_device = device->wined3d_device); state->device = &device->ID3D11Device2_iface; @@ -3651,7 +3657,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * *format_support = 0; wined3d_mutex_lock(); - feature_level = device->feature_level; + feature_level = device->state->feature_level; wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); wined3d_adapter = wined3d_get_adapter(wined3d, params.adapter_idx); @@ -3984,7 +3990,7 @@ static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11De TRACE("iface %p.\n", iface); - return device->feature_level; + return device->state->feature_level; } static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device2 *iface) @@ -4067,6 +4073,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + D3D_FEATURE_LEVEL feature_level; HRESULT hr = E_INVALIDARG; FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " @@ -4088,7 +4095,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev goto fail; } - d3d_device_context_state_init(state_impl, device, emulated_interface); + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level( + wined3d_device_get_state(device->wined3d_device))); + d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); *state = &state_impl->ID3DDeviceContextState_iface; } @@ -6218,7 +6227,7 @@ static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D1 TRACE("iface %p.\n", iface); - return d3d10_feature_level1_from_d3d_feature_level(device->feature_level); + return d3d10_feature_level1_from_d3d_feature_level(device->state->feature_level); } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl = @@ -6457,16 +6466,12 @@ static inline struct d3d_device *device_from_wined3d_device_parent(struct wined3 return CONTAINING_RECORD(device_parent, struct d3d_device, device_parent); } -static D3D_FEATURE_LEVEL d3d_feature_level_from_wined3d(enum wined3d_feature_level level) -{ - return (D3D_FEATURE_LEVEL)level; -} - static void CDECL device_parent_wined3d_device_created(struct wined3d_device_parent *device_parent, struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); struct wined3d_state *wined3d_state; + D3D_FEATURE_LEVEL feature_level; ID3DDeviceContextState *state; HRESULT hr; @@ -6477,11 +6482,10 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par device->immediate_context.wined3d_context = wined3d_device_get_immediate_context(wined3d_device); wined3d_state = wined3d_device_get_state(device->wined3d_device); - device->feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); - if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &device->feature_level, - 1, D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, - &state))) + if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &feature_level, 1, + D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) { ERR("Failed to create the initial device context state, hr %#x.\n", hr); return; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index d51d8e4e60b..0d19b74ff0b 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1120,24 +1120,24 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, WARN("Invalid rasterizer stream %u.\n", rasterizer_stream); return E_INVALIDARG; } - if (device->feature_level < D3D_FEATURE_LEVEL_11_0) + if (device->state->feature_level < D3D_FEATURE_LEVEL_11_0) { if (rasterizer_stream) { WARN("Invalid rasterizer stream %u for feature level %#x.\n", - rasterizer_stream, device->feature_level); + rasterizer_stream, device->state->feature_level); return E_INVALIDARG; } if (buffer_stride_count && buffer_stride_count != 1) { WARN("Invalid buffer stride count %u for feature level %#x.\n", - buffer_stride_count, device->feature_level); + buffer_stride_count, device->state->feature_level); return E_INVALIDARG; } } if (FAILED(hr = validate_stream_output_entries(so_entries, so_entry_count, - buffer_strides, buffer_stride_count, device->feature_level))) + buffer_strides, buffer_stride_count, device->state->feature_level))) return hr; desc.byte_code = byte_code; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 1682aa05d99..061bbb09795 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -987,7 +987,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE DWORD flags = 0; HRESULT hr; - if (!validate_texture2d_desc(desc, device->feature_level)) + if (!validate_texture2d_desc(desc, device->state->feature_level)) { WARN("Failed to validate texture desc.\n"); return E_INVALIDARG;

1 0

Henri Verbeet : d3d11: Use the supplied feature levels in d3d11_device_CreateDeviceContextState().
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 071d5597c46749c2934f8996905e807ec8faebc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=071d5597c46749c2934f8996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:28 2021 +0100 d3d11: Use the supplied feature levels in d3d11_device_CreateDeviceContextState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 76 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d2a3931b724..63d1e9dfb8c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4073,39 +4073,62 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; HRESULT hr = E_INVALIDARG; - FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", - iface, flags, feature_levels, feature_level_count, sdk_version, - debugstr_guid(emulated_interface), chosen_feature_level, state); + TRACE("iface %p, flags %#x, feature_levels %p, feature_level_count %u, " + "sdk_version %u, emulated_interface %s, chosen_feature_level %p, state %p.\n", + iface, flags, feature_levels, feature_level_count, + sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + wined3d_mutex_lock(); if (!feature_level_count) goto fail; + if (FAILED(hr = wined3d_state_create(device->wined3d_device, + (const enum wined3d_feature_level *)feature_levels, feature_level_count, &wined3d_state))) + goto fail; + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); + if (chosen_feature_level) - FIXME("Device context state feature level not implemented yet.\n"); + *chosen_feature_level = feature_level; - if (state) + if (!state) { - if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) - { - hr = E_OUTOFMEMORY; - goto fail; - } + wined3d_state_destroy(wined3d_state); + wined3d_mutex_unlock(); + return S_FALSE; + } - feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level( - wined3d_device_get_state(device->wined3d_device))); - d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); - *state = &state_impl->ID3DDeviceContextState_iface; + if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) + { + wined3d_state_destroy(wined3d_state); + hr = E_OUTOFMEMORY; + goto fail; + } + + d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); + if (!d3d_device_context_state_add_entry(state_impl, device, wined3d_state)) + { + wined3d_state_destroy(wined3d_state); + ID3DDeviceContextState_Release(&state_impl->ID3DDeviceContextState_iface); + hr = E_FAIL; + goto fail; } + *state = &state_impl->ID3DDeviceContextState_iface; device->d3d11_only = FALSE; - if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); - return state ? S_OK : S_FALSE; + wined3d_mutex_unlock(); + + return S_OK; fail: + wined3d_mutex_unlock(); if (chosen_feature_level) *chosen_feature_level = 0; if (state) @@ -6470,10 +6493,9 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); + struct d3d_device_context_state *state; struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; - ID3DDeviceContextState *state; - HRESULT hr; TRACE("device_parent %p, wined3d_device %p.\n", device_parent, wined3d_device); @@ -6484,19 +6506,21 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_state = wined3d_device_get_state(device->wined3d_device); feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); - if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &feature_level, 1, - D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) + if (!(state = heap_alloc_zero(sizeof(*state)))) { - ERR("Failed to create the initial device context state, hr %#x.\n", hr); + ERR("Failed to create the initial device context state.\n"); return; } - device->state = impl_from_ID3DDeviceContextState(state); - if (!d3d_device_context_state_add_entry(device->state, device, wined3d_state)) + d3d_device_context_state_init(state, device, feature_level, + device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1); + + device->state = state; + if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) ERR("Failed to add entry for wined3d state %p, device %p.\n", wined3d_state, device); - d3d_device_context_state_private_addref(device->state); - ID3DDeviceContextState_Release(state); + d3d_device_context_state_private_addref(state); + ID3DDeviceContextState_Release(&state->ID3DDeviceContextState_iface); } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent)

1 0

Henri Verbeet : d3d11: Replace the FIXME in d3d11_immediate_context_SwapDeviceContextState() with a TRACE.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: e07e0453d326302221d1705cb585e993b32b5a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07e0453d326302221d1705c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 17:13:29 2021 +0100 d3d11: Replace the FIXME in d3d11_immediate_context_SwapDeviceContextState() with a TRACE. This is implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 63d1e9dfb8c..941e61f4b5a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2844,7 +2844,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 struct d3d_device_context_state *state_impl, *prev_impl; struct wined3d_state *wined3d_state; - FIXME("iface %p, state %p, prev %p semi-stub!\n", iface, state, prev); + TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); if (!state) {

1 0

Jacek Caban : mshtml: Initialize DOMRange object with compat mode.
by Alexandre Julliard 16 Mar '21

16 Mar '21

Module: wine Branch: master Commit: 9e1d876d84d9e7a84cce468c91f4fb88bfcde03f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e1d876d84d9e7a84cce468c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 16 19:56:55 2021 +0100 mshtml: Initialize DOMRange object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/range.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ad326f858ee..6eb6fcc1f49 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5200,7 +5200,7 @@ static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMR if(NS_FAILED(nsIDOMHTMLDocument_CreateRange(This->doc_node->nsdoc, &nsrange))) return E_FAIL; - hres = HTMLDOMRange_Create(nsrange, p); + hres = create_dom_range(nsrange, dispex_compat_mode(&This->doc_node->node.event_target.dispex), p); nsIDOMRange_Release(nsrange); return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5fc049cf80f..e213cd698ba 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1022,7 +1022,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECL HRESULT create_style_sheet(nsIDOMStyleSheet*,compat_mode_t,IHTMLStyleSheet**) DECLSPEC_HIDDEN; HRESULT create_style_sheet_collection(nsIDOMStyleSheetList*,compat_mode_t, IHTMLStyleSheetsCollection**) DECLSPEC_HIDDEN; -HRESULT HTMLDOMRange_Create(nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; +HRESULT create_dom_range(nsIDOMRange*,compat_mode_t,IHTMLDOMRange**) DECLSPEC_HIDDEN; HRESULT create_markup_pointer(IMarkupPointer**) DECLSPEC_HIDDEN; void detach_document_node(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index d739c18d13e..cc9cd70cb74 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -2066,7 +2066,7 @@ static dispex_static_data_t HTMLDOMRange_dispex = { HTMLDOMRange_iface_tids }; -HRESULT HTMLDOMRange_Create(nsIDOMRange *nsrange, IHTMLDOMRange **p) +HRESULT create_dom_range(nsIDOMRange *nsrange, compat_mode_t compat_mode, IHTMLDOMRange **p) { HTMLDOMRange *ret; @@ -2074,7 +2074,7 @@ HRESULT HTMLDOMRange_Create(nsIDOMRange *nsrange, IHTMLDOMRange **p) if(!ret) return E_OUTOFMEMORY; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex, compat_mode); ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl; ret->ref = 1;

1 0