- Wine-Devel - list.winehq.org

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in wined3d_fixup_alpha().
by Henri Verbeet Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6663e788e9c..08b57cf1a36 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2358,7 +2358,7 @@ static void wined3d_fixup_alpha(const struct wined3d_format *format, const uint8 unsigned int x, y; byte_count = format->byte_count; - alpha_mask = ((1u << format->alpha_size) - 1) << format->alpha_offset; + alpha_mask = wined3d_mask_from_size(format->alpha_size) << format->alpha_offset; switch (byte_count) { -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use WGL_SWAP_COPY_ARB for swapchains with COPY swap effects, if available.
by Henri Verbeet Sept. 10, 2021

Sept. 10, 2021

Avoiding the (slow) GDI present path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 7 +++++-- dlls/wined3d/context_gl.c | 30 ++++++++++++++++++------------ dlls/wined3d/swapchain.c | 5 ++++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 902b9620f30..e5cca225b6f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4120,8 +4120,8 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, { UINT attrib_count = 0; GLint cfg_count; - int attribs[11]; - int values[11]; + int attribs[12]; + int values[12]; int attribute; attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; @@ -4139,6 +4139,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, attribs[attrib_count++] = WGL_PIXEL_TYPE_ARB; attribs[attrib_count++] = WGL_DOUBLE_BUFFER_ARB; attribs[attrib_count++] = WGL_AUX_BUFFERS_ARB; + attribs[attrib_count++] = WGL_SWAP_METHOD_ARB; for (i = 0, adapter_gl->pixel_format_count = 0; i < cfg_count; ++i) { @@ -4160,6 +4161,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, cfg->iPixelType = values[8]; cfg->doubleBuffer = values[9]; cfg->auxBuffers = values[10]; + cfg->swap_method = values[11]; cfg->numSamples = 0; /* Check multisample support. */ @@ -4225,6 +4227,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, cfg->iPixelType = (pfd.iPixelType == PFD_TYPE_RGBA) ? WGL_TYPE_RGBA_ARB : WGL_TYPE_COLORINDEX_ARB; cfg->doubleBuffer = (pfd.dwFlags & PFD_DOUBLEBUFFER) ? 1 : 0; cfg->auxBuffers = pfd.cAuxBuffers; + cfg->swap_method = WGL_SWAP_UNDEFINED_ARB; cfg->numSamples = 0; TRACE("iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, " diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f6d046c410a..0e4b900efe0 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1663,7 +1663,7 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) /* This function takes care of wined3d pixel format selection. */ static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format, - BOOL auxBuffers) + bool aux_buffers, bool swap_effect_copy) { unsigned int cfg_count = wined3d_adapter_gl(device->adapter)->pixel_format_count; unsigned int current_value; @@ -1671,9 +1671,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC int iPixelFormat = 0; unsigned int i; - TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x.\n", + TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, swap_effect_copy %#x.\n", device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), - auxBuffers); + aux_buffers, swap_effect_copy); current_value = 0; for (i = 0; i < cfg_count; ++i) @@ -1705,21 +1705,23 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC continue; value = 1; + if (swap_effect_copy && cfg->swap_method == WGL_SWAP_COPY_ARB) + value += 1; /* We try to locate a format which matches our requirements exactly. In case of * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ if (cfg->depthSize == ds_format->depth_size) - value += 1; - if (cfg->stencilSize == ds_format->stencil_size) value += 2; - if (cfg->alphaSize == color_format->alpha_size) + if (cfg->stencilSize == ds_format->stencil_size) value += 4; - /* We like to have aux buffers in backbuffer mode */ - if (auxBuffers && cfg->auxBuffers) + if (cfg->alphaSize == color_format->alpha_size) value += 8; + /* We like to have aux buffers in backbuffer mode */ + if (aux_buffers && cfg->auxBuffers) + value += 16; if (cfg->redSize == color_format->red_size && cfg->greenSize == color_format->green_size && cfg->blueSize == color_format->blue_size) - value += 16; + value += 32; if (value > current_value) { @@ -1898,6 +1900,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl) { + enum wined3d_swap_effect swap_effect = swapchain_gl->s.state.desc.swap_effect; const struct wined3d_format *colour_format, *ds_format; struct wined3d_context *context = &context_gl->c; const struct wined3d_gl_info *gl_info; @@ -1905,6 +1908,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context struct wined3d_adapter *adapter; unsigned int target_bind_flags; struct wined3d_device *device; + bool swap_effect_copy; HGLRC ctx, share_ctx; unsigned int i; @@ -1915,6 +1919,8 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context target = &context->current_rt.texture->resource; target_bind_flags = target->bind_flags; + swap_effect_copy = swap_effect == WINED3D_SWAP_EFFECT_COPY || swap_effect == WINED3D_SWAP_EFFECT_COPY_VSYNC; + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { static const enum wined3d_format_id ds_formats[] = @@ -1951,7 +1957,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context { ds_format = wined3d_get_format(adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL); if ((context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, ds_format, TRUE))) + context_gl->dc, colour_format, ds_format, true, swap_effect_copy))) { swapchain_gl->s.ds_format = ds_format; break; @@ -1964,7 +1970,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context else { context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, swapchain_gl->s.ds_format, TRUE); + context_gl->dc, colour_format, swapchain_gl->s.ds_format, true, swap_effect_copy); } } else @@ -1980,7 +1986,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); ds_format = wined3d_get_format(adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL); context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, ds_format, FALSE); + context_gl->dc, colour_format, ds_format, false, swap_effect_copy); } if (!context_gl->pixel_format) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 47158d15aa2..3ae698649cf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -594,6 +594,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, { struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; + const struct wined3d_pixel_format *pixel_format; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; @@ -609,7 +610,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); - if (context_gl->dc == swapchain_gl->backup_dc || swapchain_present_is_partial_copy(swapchain, dst_rect)) + pixel_format = &wined3d_adapter_gl(swapchain->device->adapter)->pixel_formats[context_gl->pixel_format]; + if (context_gl->dc == swapchain_gl->backup_dc || (pixel_format->swap_method != WGL_SWAP_COPY_ARB + && swapchain_present_is_partial_copy(swapchain, dst_rect))) { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33170761f80..9a7c3a70fe4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2846,6 +2846,7 @@ struct wined3d_pixel_format BOOL doubleBuffer; int auxBuffers; int numSamples; + int swap_method; }; enum wined3d_pci_vendor -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use GDI blits for partial presents with COPY swap effects.
by Henri Verbeet Sept. 10, 2021

Sept. 10, 2021

The GL/Vulkan backbuffer contents are undefined after a buffer swap. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 802116495e5..47158d15aa2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -568,6 +568,27 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER); } +static bool swapchain_present_is_partial_copy(struct wined3d_swapchain *swapchain, const RECT *dst_rect) +{ + enum wined3d_swap_effect swap_effect = swapchain->state.desc.swap_effect; + RECT client_rect; + unsigned int t; + + if (swap_effect != WINED3D_SWAP_EFFECT_COPY && swap_effect != WINED3D_SWAP_EFFECT_COPY_VSYNC) + return false; + + GetClientRect(swapchain->win_handle, &client_rect); + + t = client_rect.right - client_rect.left; + if ((dst_rect->left && dst_rect->right) || abs(dst_rect->right - dst_rect->left) != t) + return true; + t = client_rect.bottom - client_rect.top; + if ((dst_rect->top && dst_rect->bottom) || abs(dst_rect->bottom - dst_rect->top) != t) + return true; + + return false; +} + static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { @@ -588,7 +609,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); - if (context_gl->dc == swapchain_gl->backup_dc) + if (context_gl->dc == swapchain_gl->backup_dc || swapchain_present_is_partial_copy(swapchain, dst_rect)) { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); } @@ -1208,10 +1229,14 @@ static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT context_vk = wined3d_context_vk(context_acquire(swapchain->device, back_buffer, 0)); - wined3d_texture_load_location(back_buffer, 0, &context_vk->c, back_buffer->resource.draw_binding); - - if (swapchain_vk->vk_swapchain) + if (!swapchain_vk->vk_swapchain || swapchain_present_is_partial_copy(swapchain, dst_rect)) + { + swapchain_blit_gdi(swapchain, &context_vk->c, src_rect, dst_rect); + } + else { + wined3d_texture_load_location(back_buffer, 0, &context_vk->c, back_buffer->resource.draw_binding); + if ((vr = wined3d_swapchain_vk_blit(swapchain_vk, context_vk, src_rect, dst_rect, swap_interval))) { if (vr == VK_ERROR_OUT_OF_DATE_KHR || vr == VK_SUBOPTIMAL_KHR) @@ -1228,10 +1253,6 @@ static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT } } } - else - { - swapchain_blit_gdi(swapchain, &context_vk->c, src_rect, dst_rect); - } wined3d_swapchain_vk_rotate(swapchain, context_vk); -- 2.20.1

1 0

[PATCH 2/5] wined3d: Get rid of the "render_to_fbo" field from the wined3d_swapchain structure.
by Henri Verbeet Sept. 10, 2021

Sept. 10, 2021

It's effectively always true when using ORM_FBO, now that the "AlwaysOffscreen" setting is gone. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- dlls/wined3d/swapchain.c | 69 +++++++--------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6215da8ce0f..3d24d375bc8 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -435,7 +435,7 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) /* If the swapchain is rendered to an FBO, the backbuffer is * offscreen, otherwise onscreen */ - return swapchain->render_to_fbo; + return wined3d_settings.offscreen_rendering_mode == ORM_FBO; } void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 693557448fe..802116495e5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -532,7 +532,7 @@ static void wined3d_swapchain_gl_rotate(struct wined3d_swapchain *swapchain, str unsigned int i; static const DWORD supported_locations = WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_RB_MULTISAMPLE; - if (swapchain->state.desc.backbuffer_count < 2 || !swapchain->render_to_fbo) + if (swapchain->state.desc.backbuffer_count < 2 || wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; texture_prev = wined3d_texture_gl(swapchain->back_buffers[0]); @@ -572,12 +572,10 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval, DWORD flags) { struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); - const struct wined3d_swapchain_desc *desc = &swapchain->state.desc; struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; - BOOL render_to_fbo; context = context_acquire(swapchain->device, swapchain->front_buffer, 0); context_gl = wined3d_context_gl(context); @@ -588,51 +586,30 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, return; } - gl_info = context_gl->gl_info; - - swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); - TRACE("Presenting DC %p.\n", context_gl->dc); if (context_gl->dc == swapchain_gl->backup_dc) + { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); - - if (!(render_to_fbo = swapchain->render_to_fbo) - && (src_rect->left || src_rect->top - || src_rect->right != desc->backbuffer_width - || src_rect->bottom != desc->backbuffer_height - || dst_rect->left || dst_rect->top - || dst_rect->right != desc->backbuffer_width - || dst_rect->bottom != desc->backbuffer_height)) - render_to_fbo = TRUE; - - /* Rendering to a window of different size, presenting partial rectangles, - * or rendering to a different window needs help from FBO_blit or a textured - * draw. Render the swapchain to a FBO in the future. - * - * Note that FBO_blit from the backbuffer to the frontbuffer cannot solve - * all these issues - this fails if the window is smaller than the backbuffer. - */ - if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - wined3d_texture_load_location(back_buffer, 0, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(back_buffer, 0, WINED3D_LOCATION_DRAWABLE); - swapchain->render_to_fbo = TRUE; - swapchain_update_draw_bindings(swapchain); } else { + gl_info = context_gl->gl_info; + + swapchain_gl_set_swap_interval(swapchain, context_gl, swap_interval); + wined3d_texture_load_location(back_buffer, 0, context, back_buffer->resource.draw_binding); - } - if (swapchain->render_to_fbo) - swapchain_blit(swapchain, context, src_rect, dst_rect); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + swapchain_blit(swapchain, context, src_rect, dst_rect); - if (swapchain_gl->context_count > 1) - gl_info->gl_ops.gl.p_glFinish(); + if (swapchain_gl->context_count > 1) + gl_info->gl_ops.gl.p_glFinish(); + + /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context_gl->dc); + } - /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context_gl->dc); wined3d_context_gl_submit_command_fence(context_gl); wined3d_swapchain_gl_rotate(swapchain, context); @@ -1350,22 +1327,6 @@ static const struct wined3d_swapchain_ops swapchain_no3d_ops = swapchain_gdi_frontbuffer_updated, }; -static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) -{ - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return; - - if (!swapchain->state.desc.backbuffer_count) - { - TRACE("Single buffered rendering.\n"); - swapchain->render_to_fbo = FALSE; - return; - } - - TRACE("Rendering to FBO.\n"); - swapchain->render_to_fbo = TRUE; -} - static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_swapchain *swapchain, enum wined3d_format_id format_id, enum wined3d_multisample_type *type, DWORD *quality) { @@ -1528,7 +1489,6 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc swapchain->state.desc = *desc; wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->state.desc.backbuffer_format, &swapchain->state.desc.multisample_type, &swapchain->state.desc.multisample_quality); - swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); @@ -2073,7 +2033,6 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha } } - swapchain_update_render_to_fbo(swapchain); swapchain_update_draw_bindings(swapchain); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86c053df0db..33170761f80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5277,7 +5277,7 @@ struct wined3d_swapchain struct wined3d_texture **back_buffers; struct wined3d_texture *front_buffer; struct wined3d_gamma_ramp orig_gamma; - BOOL render_to_fbo, reapply_mode; + bool reapply_mode; const struct wined3d_format *ds_format; struct wined3d_palette *palette; RECT front_buffer_update; -- 2.20.1

1 0

[PATCH 1/5] wined3d: Do not attempt to restore GL contexts corresponding to wined3d contexts in wined3d_context_gl_cleanup().
by Henri Verbeet Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index da7c70a8863..f6d046c410a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1347,6 +1347,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) struct wined3d_so_statistics_query *so_statistics_query; struct wined3d_timestamp_query *timestamp_query; struct wined3d_occlusion_query *occlusion_query; + struct wined3d_context_gl *current; struct fbo_entry *entry, *entry2; struct wined3d_fence *fence; HGLRC restore_ctx; @@ -1356,10 +1357,22 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) restore_ctx = wglGetCurrentContext(); restore_dc = wglGetCurrentDC(); - if (restore_ctx == context_gl->gl_ctx) - restore_ctx = NULL; - else if (context_gl->valid) + if (context_gl->valid && context_gl->gl_ctx != restore_ctx) + { + /* Attempting to restore a GL context corresponding to a wined3d + * context is not particularly useful. Worse, when we're called from + * wined3d_context_gl_destroy(), we subsequently clear the "current + * D3D context" TLS value, which would cause + * wined3d_context_gl_enter() to consider the GL context a non-D3D + * context. */ + if ((current = wined3d_context_gl_get_current()) && current->gl_ctx == restore_ctx) + restore_ctx = NULL; wined3d_context_gl_set_gl_context(context_gl); + } + else + { + restore_ctx = NULL; + } if (context_gl->valid) { -- 2.20.1

1 0

[PATCH v2] wined3d: Allow constant buffers to be forced to be write-mappable.
by Jan Sikorski Sept. 10, 2021

Sept. 10, 2021

Using a registry setting. Games sometimes use DEFAULT usage and no CPU access combined with UpdateSubresource() for often-changing constants, causing us to interrupt the render pass and transfer through a staging buffer on each update. In such cases forcing the buffers to be mappable greatly increases performance. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- v2 naming --- dlls/wined3d/buffer.c | 9 +++++++-- dlls/wined3d/wined3d_main.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index da61f36af45..3ea3bf4b180 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1139,6 +1139,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_R8_UNORM, desc->bind_flags); struct wined3d_resource *resource = &buffer->resource; + unsigned int access; HRESULT hr; TRACE("buffer %p, device %p, desc byte_width %u, usage %s, bind_flags %s, " @@ -1164,8 +1165,12 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_INVALIDARG; } + access = desc->access; + if (desc->bind_flags & WINED3D_BIND_CONSTANT_BUFFER && wined3d_settings.cb_access_map_w) + access |= WINED3D_RESOURCE_ACCESS_MAP_W; + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, - WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, desc->access, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, access, desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); @@ -1179,7 +1184,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(desc->access)) + || wined3d_resource_access_is_managed(access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6e93b8dc683..a360eadecc9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -394,6 +394,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } + if (!get_config_key_dword(hkey, appkey, "cb_access_map_w", &tmpvalue) && tmpvalue) + { + TRACE("Forcing all constant buffers to be write-mappable.\n"); + wined3d_settings.cb_access_map_w = TRUE; + } } if (appkey) RegCloseKey( appkey ); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86c053df0db..4b9fc8d9ae8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -482,6 +482,7 @@ struct wined3d_settings unsigned int max_sm_cs; enum wined3d_renderer renderer; enum wined3d_shader_backend shader_backend; + BOOL cb_access_map_w; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH v8 1/2] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++--- include/wine/afd.h | 2 +- server/protocol.def | 1 + server/sock.c | 53 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -793,6 +792,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..c6da8576f39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/sock.c b/server/sock.c index 3c5f2612b51..036611e2dd7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,12 +128,14 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + int exclusive; unsigned int count; struct poll_socket_output *output; struct { struct sock *sock; int flags; + int main; } sockets[1]; }; @@ -2839,7 +2841,51 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, +static struct poll_req *get_main_poll(struct sock *sock) +{ + struct poll_req *req; + + LIST_FOR_EACH_ENTRY(req, &poll_list, struct poll_req, entry) + { + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + if (req->sockets[i].sock == sock + && req->sockets[i].main) + return req; + } + } + + return NULL; +} + +static void poll_handle_exclusive(struct poll_req *req) +{ + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + struct poll_req *main_req = get_main_poll(req->sockets[i].sock); + + if (main_req && main_req->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll. */ + main_req->sockets[i].main = FALSE; + + main_req->iosb->status = STATUS_SUCCESS; + main_req->iosb->out_data = main_req->output; + main_req->iosb->out_size = main_req->count * sizeof(*main_req->output); + async_terminate(main_req->async, STATUS_ALERTED); + + main_req = NULL; + } + + req->sockets[i].main = !main_req; + } +} + +static void poll_socket( struct sock *poll_sock, struct async *async, int exclusive, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; @@ -2880,11 +2926,14 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3285,7 +3334,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - poll_socket( sock, async, req->timeout, count, input ); + poll_socket( sock, async, req->exclusive, req->timeout, count, input ); reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); -- 2.33.0

2 2

[PATCH] wininet: Add handling for remaining special errors to InternetErrorDlg.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/dialogs.c | 48 +++++++++++++++++++++++++++++++++-- dlls/wininet/tests/internet.c | 40 ++++------------------------- 2 files changed, 51 insertions(+), 37 deletions(-)

1 0

[PATCH 1/2] dbghelp: set correct parameter name
by Eric Pouech Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 23752cfed9f..29d8a5350a5 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -487,13 +487,13 @@ struct enum_types_AtoW PSYM_ENUMERATESYMBOLS_CALLBACKW callback; }; -static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG addr, PVOID _et) +static BOOL CALLBACK enum_types_AtoW(PSYMBOL_INFO si, ULONG size, PVOID _et) { struct enum_types_AtoW* et = _et; SYMBOL_INFOW* siW = (SYMBOL_INFOW*)et->buffer; copy_symbolW(siW, si); - return et->callback(siW, addr, et->user); + return et->callback(siW, size, et->user); } /******************************************************************

1 1

[PATCH 6/6] gdi32: Remove no longer needed metafile special case from NtGdiExtTextOutW.
by Jacek Caban Sept. 10, 2021

Sept. 10, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 8 -------- 1 file changed, 8 deletions(-)

2 1