December 2017 - Wine-Commits

Nikolay Sivov : user32/tests: Remove runtime check for EndMenu().
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: 84a35f532fcad8d40525a7562f414f19fdc1ba0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a35f532fcad8d40525a7562… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 6 15:23:38 2017 +0300 user32/tests: Remove runtime check for EndMenu(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 12 +++--------- dlls/user32/tests/menu.c | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9372c48..79c0010 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,14 +38,12 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pEndMenu) (void); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static void init_function_pointers(void) { HMODULE hdll = GetModuleHandleA("user32"); - pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); } @@ -2294,7 +2292,7 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR if (hWnd != (HWND)lParam) { got_wm_capturechanged = TRUE; - pEndMenu(); + EndMenu(); } break; } @@ -2337,7 +2335,7 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); } - pEndMenu(); + EndMenu(); break; } } @@ -2985,11 +2983,7 @@ START_TEST(edit) test_child_edit_wmkeydown(); test_fontsize(); test_dialogmode(); - if (pEndMenu) - test_contextmenu(); - else - win_skip("EndMenu is not available\n"); - + test_contextmenu(); test_EM_GETHANDLE(); test_paste(); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 03454fe..f99cd94 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -41,7 +41,6 @@ static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); -static BOOL (WINAPI *pEndMenu) (void); static void init_function_pointers(void) { @@ -56,7 +55,6 @@ static void init_function_pointers(void) GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) - GET_PROC(EndMenu) #undef GET_PROC } @@ -3518,7 +3516,7 @@ static LRESULT WINAPI menu_cancelmode_wnd_proc(HWND hwnd, UINT msg, PostMessageA( hwnd, WM_MOUSEMOVE, 0, 0); return SendMessageA( g_hwndtosend, WM_CANCELMODE, 0, 0); } - pEndMenu(); + EndMenu(); return TRUE; } } @@ -3531,10 +3529,7 @@ static void test_menu_cancelmode(void) HWND hwnd, hwndchild; HMENU menu, menubar; MSG msg; - if( !pEndMenu) { /* win95 */ - win_skip( "EndMenu is not available\n"); - return; - } + hwnd = CreateWindowExA( 0, (LPCSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, NULL, NULL, NULL, NULL);

1 0

Józef Kucia : d3d11: Implement depth bias.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: b2b03085dc5b43c558e4464dc28294404b1eb889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b03085dc5b43c558e4464dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:35 2017 +0100 d3d11: Implement depth bias. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5281792..7ae9073 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -907,6 +907,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); struct d3d_rasterizer_state *rasterizer_state_impl; const D3D11_RASTERIZER_DESC *desc; + union + { + DWORD d; + float f; + } scale_bias, const_bias; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -916,6 +921,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); @@ -928,9 +935,10 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon desc = &rasterizer_state_impl->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); - /* OpenGL style depth bias. */ - if (desc->DepthBias || desc->SlopeScaledDepthBias) - FIXME("Ignoring depth bias.\n"); + scale_bias.f = desc->SlopeScaledDepthBias; + const_bias.f = desc->DepthBias; + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); /* GL_DEPTH_CLAMP */ if (!desc->DepthClipEnable) FIXME("Ignoring DepthClipEnable %#x.\n", desc->DepthClipEnable);

1 0

Józef Kucia : d3d11: Fix initial depth stencil state.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: dd60c65f4b1a270a236ea470100f3ae885f33486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd60c65f4b1a270a236ea4701… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:39 2017 +0100 d3d11: Fix initial depth stencil state. The initial WINED3D_RS_ZFUNC state is different in wined3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7ae9073..820463c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -745,6 +745,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_mutex_unlock(); } +static void set_default_depth_stencil_state(struct wined3d_device *wined3d_device) +{ + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_ZENABLE, TRUE); + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_ZWRITEENABLE, D3D11_DEPTH_WRITE_MASK_ALL); + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_ZFUNC, WINED3D_CMP_LESS); + wined3d_device_set_render_state(wined3d_device, WINED3D_RS_STENCILENABLE, FALSE); +} + static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3D11DeviceContext *iface, ID3D11DepthStencilState *depth_stencil_state, UINT stencil_ref) { @@ -759,10 +767,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 device->stencil_ref = stencil_ref; if (!(device->depth_stencil_state = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZWRITEENABLE, D3D11_DEPTH_WRITE_MASK_ALL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZFUNC, D3D11_COMPARISON_LESS); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILENABLE, FALSE); + set_default_depth_stencil_state(device->wined3d_device); wined3d_mutex_unlock(); return; } @@ -5727,6 +5732,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_device_incref(wined3d_device); device->wined3d_device = wined3d_device; + + set_default_depth_stencil_state(wined3d_device); } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent)

1 0

Matteo Bruni : wined3d: Use GL_DEPTH_COMPONENT16 for 16 bit depth texture formats.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: 592a03afe791c604b1416ef96cfca1c43f96334e URL: http://source.winehq.org/git/wine.git/?a=commit;h=592a03afe791c604b1416ef96… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Dec 6 11:00:33 2017 +0100 wined3d: Use GL_DEPTH_COMPONENT16 for 16 bit depth texture formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1a75dd7..76b1d89 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1567,7 +1567,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, + {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, @@ -1579,7 +1579,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, + {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, @@ -1631,7 +1631,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, + {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW,

1 0

Lauri Kenttä : readme: Use UTF-8 consistently in all translations.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: a0ad190b9b0eb3eb0261d08520dffbd36b840fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ad190b9b0eb3eb0261d0852… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Dec 5 22:40:46 2017 +0200 readme: Use UTF-8 consistently in all translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.hu | 274 ++++++++++++++++++++++----------------------- documentation/README.ko | 242 +++++++++++++++++++-------------------- documentation/README.pt | 210 +++++++++++++++++----------------- documentation/README.pt_br | 166 +++++++++++++-------------- 4 files changed, 446 insertions(+), 446 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0ad190b9b0eb3eb0261d…

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_BC4_SNORM format.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: 9c8e781df1e2b4a0df8b3a36c64b8aeac21d3cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8e781df1e2b4a0df8b3a36c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:31 2017 +0100 wined3d: Add support for WINED3DFMT_BC4_SNORM format. 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/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f739685..cd0a8e1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -268,6 +268,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, + {WINED3DFMT_BC4_SNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC5_SNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC6H_UF16, WINED3DFMT_BC6H_TYPELESS, ""}, @@ -361,6 +362,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, + {WINED3DFMT_BC4_SNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, @@ -1179,6 +1181,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC4_SNORM, GL_COMPRESSED_SIGNED_RED_RGTC1, GL_COMPRESSED_SIGNED_RED_RGTC1, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -3434,6 +3441,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC4_SNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_SNORM);

1 0

Matteo Bruni : wined3d: Detect depth bias scale value per format.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: 5fb50c9a1c2716b4b5450ac018c69875b04fc4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb50c9a1c2716b4b5450ac01… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Dec 6 11:00:32 2017 +0100 wined3d: Detect depth bias scale value per format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 +- dlls/wined3d/directx.c | 4 --- dlls/wined3d/state.c | 5 +-- dlls/wined3d/utils.c | 76 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 50 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index dbe9f42..78443d1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1032,8 +1032,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && (prev->format_flags & WINED3DFMT_FLAG_FLOAT) - != (op->view->format_flags & WINED3DFMT_FLAG_FLOAT)) + else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale) { device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 31fe1db..cc8a78c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6636,10 +6636,6 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return FALSE; } - gl_info->fixed_polyoffset_scale = wined3d_adapter_find_polyoffset_scale(&caps_gl_ctx, GL_DEPTH_COMPONENT); - if (gl_info->supported[ARB_DEPTH_BUFFER_FLOAT]) - gl_info->float_polyoffset_scale = wined3d_adapter_find_polyoffset_scale(&caps_gl_ctx, GL_DEPTH32F_STENCIL8); - adapter->vram_bytes = adapter->driver_info.vram_bytes; adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f3ec7df..0b7c747 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1716,10 +1716,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 { if (depth) { - if (depth->format_flags & WINED3DFMT_FLAG_FLOAT) - scale = gl_info->float_polyoffset_scale; - else - scale = gl_info->fixed_polyoffset_scale; + scale = depth->format->depth_bias_scale; TRACE("Depth format %s, using depthbias scale of %.8e.\n", debug_d3dformat(depth->format->id), scale); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cd0a8e1..1a75dd7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3565,33 +3565,6 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) return TRUE; } -/* Context activation is done by the caller. */ -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) -{ - struct wined3d_gl_info *gl_info = &adapter->gl_info; - - if (!init_format_base_info(gl_info)) return FALSE; - if (!init_format_block_info(gl_info)) goto fail; - - if (!ctx) /* WINED3D_NO3D */ - return TRUE; - - if (!init_format_texture_info(adapter, gl_info)) goto fail; - if (!init_format_vertex_info(gl_info)) goto fail; - - apply_format_fixups(adapter, gl_info); - init_format_fbo_compat_info(ctx); - init_format_filter_info(gl_info, adapter->driver_info.vendor); - if (!init_typeless_formats(gl_info)) goto fail; - - return TRUE; - -fail: - HeapFree(GetProcessHeap(), 0, gl_info->formats); - gl_info->formats = NULL; - 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}; @@ -3639,7 +3612,7 @@ BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx return TRUE; } -float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) +static float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) { const struct wined3d_gl_info *gl_info = ctx->gl_info; static const struct wined3d_color blue = {0.0f, 0.0f, 1.0f, 1.0f}; @@ -3717,7 +3690,7 @@ float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLe low = cur; else { - TRACE("Found scale factor 2^%u for format %x\n", cur, format); + TRACE("Found scale factor 2^%u for format %x.\n", cur, format); break; } } @@ -3733,6 +3706,51 @@ float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLe return (float)(1u << cur); } +static void init_format_depth_bias_scale(struct wined3d_caps_gl_ctx *ctx) +{ + const struct wined3d_gl_info *gl_info = ctx->gl_info; + unsigned int i; + + for (i = 0; i < gl_info->format_count; ++i) + { + struct wined3d_format *format = &gl_info->formats[i]; + + if (format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_DEPTH) + { + TRACE("Testing depth bias scale for format %s.\n", debug_d3dformat(format->id)); + format->depth_bias_scale = wined3d_adapter_find_polyoffset_scale(ctx, format->glInternal); + } + } +} + +/* Context activation is done by the caller. */ +BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) +{ + struct wined3d_gl_info *gl_info = &adapter->gl_info; + + if (!init_format_base_info(gl_info)) return FALSE; + if (!init_format_block_info(gl_info)) goto fail; + + if (!ctx) /* WINED3D_NO3D */ + return TRUE; + + if (!init_format_texture_info(adapter, gl_info)) goto fail; + if (!init_format_vertex_info(gl_info)) goto fail; + + apply_format_fixups(adapter, gl_info); + init_format_fbo_compat_info(ctx); + init_format_filter_info(gl_info, adapter->driver_info.vendor); + if (!init_typeless_formats(gl_info)) goto fail; + init_format_depth_bias_scale(ctx); + + return TRUE; + +fail: + HeapFree(GetProcessHeap(), 0, gl_info->formats); + gl_info->formats = NULL; + return FALSE; +} + const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format_id, unsigned int resource_usage) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de84b5d..a79a68f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2559,7 +2559,6 @@ struct wined3d_gl_info DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1]; - float fixed_polyoffset_scale, float_polyoffset_scale; HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; @@ -2615,7 +2614,6 @@ struct wined3d_caps_gl_ctx GLuint test_program_id; }; -float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) DECLSPEC_HIDDEN; 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; @@ -4236,6 +4234,7 @@ struct wined3d_format UINT conv_byte_count; DWORD multisample_types; unsigned int flags[WINED3D_GL_RES_TYPE_COUNT]; + float depth_bias_scale; struct wined3d_rational height_scale; struct color_fixup_desc color_fixup; void (*convert)(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch,

1 0

Li Keqing : wined3d: Add Intel HD Graphics 5000 to the GPU list.
by Alexandre Julliard Dec. 6, 2017

Dec. 6, 2017

Module: wine Branch: master Commit: 2d5f962f986f49cb5c3ac5d3c1cc0a8d634eb648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5f962f986f49cb5c3ac5d3c… Author: Li Keqing <auroracloud4096(a)gmail.com> Date: Wed Dec 6 01:40:26 2017 +0800 wined3d: Add Intel HD Graphics 5000 to the GPU list. Signed-off-by: Li Keqing <auroracloud4096(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5058740..31fe1db 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1488,6 +1488,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5000, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, @@ -2156,6 +2157,7 @@ cards_intel[] = /* Haswell */ {"Iris Pro 5200", CARD_INTEL_IP5200_1}, {"Iris 5100", CARD_INTEL_I5100_1}, + {"HD Graphics 5000", CARD_INTEL_HD5000}, /* MacOS */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2321b41..de84b5d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2435,6 +2435,7 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_HD5000 = 0x0a26, CARD_INTEL_I5100_1 = 0x0a22, CARD_INTEL_I5100_2 = 0x0a2a, CARD_INTEL_I5100_3 = 0x0a2b,

1 0

Henri Verbeet : ddraw/tests: Redundant mode sets are broken on Windows 10.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: eebf1181f91bbef003dd519f2c2f4ee33f0acc0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebf1181f91bbef003dd519f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 22:54:52 2017 +0330 ddraw/tests: Redundant mode sets are broken on Windows 10. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 8 +++++--- dlls/ddraw/tests/ddraw2.c | 8 +++++--- dlls/ddraw/tests/ddraw4.c | 8 +++++--- dlls/ddraw/tests/ddraw7.c | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 5ab1c80..c306c4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2281,9 +2281,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC surface_desc = {0}; IDirectDraw *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2302,7 +2302,8 @@ static void test_redundant_mode_set(void) U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2314,7 +2315,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ca349be..8a7801e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2414,9 +2414,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC surface_desc = {0}; IDirectDraw2 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2435,7 +2435,8 @@ static void test_redundant_mode_set(void) U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2447,7 +2448,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bad06ea..048331d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2552,9 +2552,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; IDirectDraw4 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2573,7 +2573,8 @@ static void test_redundant_mode_set(void) U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2585,7 +2586,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5e176c7..d1ff85d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2279,9 +2279,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; IDirectDraw7 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2299,7 +2299,8 @@ static void test_redundant_mode_set(void) U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2311,7 +2312,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);

1 0

Jacek Caban : jscript: Support VT_UI8 in variant_to_jsval.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: d2213e205b026dcefcb953391bb2d998b141ec7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2213e205b026dcefcb953391… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 5 18:24:41 2017 +0100 jscript: Support VT_UI8 in variant_to_jsval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 48628bd..4556ec4 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -306,6 +306,13 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_UI4: *r = jsval_number(V_UI4(var)); return S_OK; + case VT_UI8: + /* + * Native doesn't support VT_UI8 here, but it's needed for IE9+ APIs + * (native IE9 doesn't use jscript.dll for JavaScript). + */ + *r = jsval_number(V_UI8(var)); + return S_OK; case VT_R4: *r = jsval_number(V_R4(var)); return S_OK;

1 0