February 2017 - Wine-commits

Sebastian Lackner : wined3d: Clear device state in wined3d_device_reset.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: fca25446efae3ae70642e2709e17052886c88451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca25446efae3ae70642e2709… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 28 15:22:31 2017 +0100 wined3d: Clear device state in wined3d_device_reset. Spotted by Henri Verbeet. 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/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c3703a5..07f2f0a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4681,6 +4681,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->d3d_initialized) wined3d_device_delete_opengl_contexts(device); + memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state;

1 0

Józef Kucia : wined3d: Pass wined3d_caps_gl_ctx to driver quirk match() function.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 0d6b6ec33d14fceeaf0403897ac279846341747a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6b6ec33d14fceeaf0403897… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 27 13:41:59 2017 +0100 wined3d: Pass wined3d_caps_gl_ctx to driver quirk match() function. 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/directx.c | 92 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d6b6ec33d14fceeaf040…

1 0

Józef Kucia : wined3d: Add quirk for Nvidia viewport subpixel bits bug.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 6823abd521c0c12d20d9171fb5ae8b300009d082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6823abd521c0c12d20d9171fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 27 13:42:00 2017 +0100 wined3d: Add quirk for Nvidia viewport subpixel bits bug. 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/directx.c | 27 ++++++++++++++++++++++++ dlls/wined3d/utils.c | 47 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 76 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d19b681..dbcd12a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -914,6 +914,17 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct w return data[0] != 0x00ff0000 || data[3] != 0x0000ff00; } +static BOOL match_broken_viewport_subpixel_bits(const struct wined3d_gl_info *gl_info, + struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, + enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + if (!gl_info->supported[ARB_VIEWPORT_ARRAY]) + return FALSE; + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + return FALSE; + return !wined3d_caps_gl_ctx_test_viewport_subpixel_bits(ctx); +} + static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. @@ -1042,6 +1053,17 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_BROKEN_ARB_FOG; } +static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) +{ + TRACE("Disabling ARB_viewport_array.\n"); + gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE; + if (gl_info->supported[ARB_CLIP_CONTROL]) + { + TRACE("Disabling ARB_clip_control.\n"); + gl_info->supported[ARB_CLIP_CONTROL] = FALSE; + } +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, @@ -1133,6 +1155,11 @@ static const struct driver_quirk quirk_table[] = quirk_broken_arb_fog, "ARBfp fogstart == fogend workaround" }, + { + match_broken_viewport_subpixel_bits, + quirk_broken_viewport_subpixel_bits, + "Nvidia viewport subpixel bits bug" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b076783..c392388 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3509,6 +3509,53 @@ fail: return FALSE; } +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) +{ + static const struct wined3d_color red = {1.0f, 0.0f, 0.0f, 1.0f}; + const struct wined3d_gl_info *gl_info = ctx->gl_info; + static const float offset = -63.0f / 128.0f; + GLuint texture, fbo; + DWORD readback[4]; + unsigned int i; + + gl_info->gl_ops.gl.p_glGenTextures(1, &texture); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); + gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ARRAY_SIZE(readback), 1, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); + gl_info->fbo_ops.glGenFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); + gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, + GL_TEXTURE_2D, texture, 0); + checkGLcall("create resources"); + + gl_info->gl_ops.gl.p_glClearColor(1.0f, 1.0f, 1.0f, 1.0f); + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT); + GL_EXTCALL(glViewportIndexedf(0, offset, offset, 4.0f, 1.0f)); + draw_test_quad(ctx, NULL, &red); + checkGLcall("draw"); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("readback"); + + TRACE("Readback colors are 0x%08x, 0x%08x, 0x%08x, 0x%08x.\n", + readback[0], readback[1], readback[2], readback[3]); + + gl_info->gl_ops.gl.p_glDeleteTextures(1, &texture); + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); + checkGLcall("delete resources"); + + for (i = 0; i < ARRAY_SIZE(readback); ++i) + { + if (readback[i] != 0xffff0000) + return FALSE; + } + return TRUE; +} + float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) { const struct wined3d_gl_info *gl_info = ctx->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 611b3b6..613d1c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2354,6 +2354,8 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; + void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; enum projection_types

1 0

Henri Verbeet : wined3d: Use the command stream state in wined3d_cs_exec_draw().
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: a7560cf695acaf378b8ca37989220fce6ddd3a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7560cf695acaf378b8ca3798… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:11:58 2017 +0100 wined3d: Use the command stream state in wined3d_cs_exec_draw(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c686181..1769dc1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -581,7 +581,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { - struct wined3d_state *state = &cs->device->state; + struct wined3d_state *state = &cs->state; const struct wined3d_cs_draw *op = data; unsigned int i; @@ -592,11 +592,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); } - if (cs->state.gl_primitive_type != op->primitive_type) + if (state->gl_primitive_type != op->primitive_type) { - if (cs->state.gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) + if (state->gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) device_invalidate_state(cs->device, STATE_POINT_ENABLE); - cs->state.gl_primitive_type = op->primitive_type; + state->gl_primitive_type = op->primitive_type; } draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx,

1 0

Henri Verbeet : wined3d: Use the command stream state in wined3d_cs_exec_dispatch().
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: a7809706bb60c56ec6a3888cd8997a707bc5f293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7809706bb60c56ec6a3888cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:11:59 2017 +0100 wined3d: Use the command stream state in wined3d_cs_exec_dispatch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1769dc1..8afa731 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -549,8 +549,8 @@ static void release_unordered_access_resources(const struct wined3d_shader *shad static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) { - struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_dispatch *op = data; + struct wined3d_state *state = &cs->state; dispatch_compute(cs->device, state, op->group_count_x, op->group_count_y, op->group_count_z);

1 0

Henri Verbeet : wined3d: Use the command stream state in swapchain_gl_present().
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: b7f0d3312eeb63d6b360d499f20f71aeee245d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f0d3312eeb63d6b360d499f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:12:00 2017 +0100 wined3d: Use the command stream state in swapchain_gl_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1a8e7fa..8a62119 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -487,7 +487,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags) { struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; - const struct wined3d_fb_state *fb = &swapchain->device->fb; + const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture; struct wined3d_context *context;

1 0

Henri Verbeet : wined3d: Get rid of an unneeded context_release() in swapchain_init().
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: df0f07bfc5c6d352917099a0c037d4636f7dd1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0f07bfc5c6d352917099a0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:12:01 2017 +0100 wined3d: Get rid of an unneeded context_release() in swapchain_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8a62119..3a3fc6d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1055,7 +1055,6 @@ err: { if (swapchain->context[0]) { - context_release(swapchain->context[0]); context_destroy(device, swapchain->context[0]); swapchain->num_contexts = 0; }

1 0

Henri Verbeet : wined3d: Send swapchain context destruction through the command stream.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: cf4de1c498ae0b1a3b1a4ad233e307595797286f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4de1c498ae0b1a3b1a4ad23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 28 06:12:02 2017 +0100 wined3d: Send swapchain context destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3a3fc6d..1f31352 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -27,6 +27,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); +static void wined3d_swapchain_destroy_object(void *object) +{ + swapchain_destroy_contexts(object); +} + static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { HRESULT hr; @@ -60,11 +65,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) swapchain->back_buffers = NULL; } - for (i = 0; i < swapchain->num_contexts; ++i) - { - context_destroy(swapchain->device, swapchain->context[i]); - } - HeapFree(GetProcessHeap(), 0, swapchain->context); + wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating @@ -925,7 +926,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 hr = E_OUTOFMEMORY; goto err; } - swapchain->num_contexts = 1; /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. * You are able to add a depth + stencil surface at a later stage when you need it. @@ -953,6 +953,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 hr = WINED3DERR_NOTAVAILABLE; goto err; } + swapchain->num_contexts = 1; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (!desc->enable_auto_depth_stencil @@ -1051,15 +1052,7 @@ err: HeapFree(GetProcessHeap(), 0, swapchain->back_buffers); } - if (swapchain->context) - { - if (swapchain->context[0]) - { - context_destroy(device, swapchain->context[0]); - swapchain->num_contexts = 0; - } - HeapFree(GetProcessHeap(), 0, swapchain->context); - } + wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); if (swapchain->front_buffer) {

1 0

André Hentschel : tapi32: Fix phoneInitializeExW spec file entry.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: cb5c644c5a076d9980403179b3f9790f5cc8892a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5c644c5a076d9980403179b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 27 22:20:21 2017 +0100 tapi32: Fix phoneInitializeExW spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/tapi32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index c2aa868..62631ef 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -154,7 +154,7 @@ @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str ptr) @ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr) -@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr) +@ stdcall phoneInitializeExW(ptr long ptr wstr ptr ptr ptr) @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr) @ stdcall phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long)

1 0

Bruno Jesus : ws2_32: Discard MSG_PARTIAL as it is supported only in message protocols.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 130452bb3de29b15e4c2c28a77dec2a9faa17bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=130452bb3de29b15e4c2c28a7… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 03:19:07 2017 -0300 ws2_32: Discard MSG_PARTIAL as it is supported only in message protocols. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0e8f2a..97cb7db 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -624,6 +624,7 @@ static const int ws_flags_map[][2] = MAP_OPTION( MSG_PEEK ), MAP_OPTION( MSG_DONTROUTE ), MAP_OPTION( MSG_WAITALL ), + { WS_MSG_PARTIAL, 0 }, }; static const int ws_sock_map[][2] =

1 0