wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Henri Verbeet : wined3d: Try to avoid stalling on dynamic buffer maps.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: afb2aa2512d4c5ffa7256ce5137bc2c142a5d065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb2aa2512d4c5ffa7256ce51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:40 2017 +0100 wined3d: Try to avoid stalling on dynamic buffer maps. Particularly for applications that use dynamic buffers without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 33571d0..abf3f7f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1039,7 +1039,8 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (!(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_READONLY)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) {

1 0

Henri Verbeet : wined3d: Evict system memory for dynamic buffers on the first WINED3D_MAP_DISCARD map.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: efdb898befe42ebb04d5df0cc5f1b566368e9d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdb898befe42ebb04d5df0cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:39 2017 +0100 wined3d: Evict system memory for dynamic buffers on the first WINED3D_MAP_DISCARD map. Mostly to avoid making things worse for applications that map dynamic buffers without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d957667..33571d0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -994,8 +994,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * } wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - if (buffer->resource.heap_memory) + if (buffer->resource.heap_memory && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) wined3d_buffer_evict_sysmem(buffer); + } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer) @@ -1055,6 +1056,9 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (!(flags & WINED3D_MAP_READONLY)) buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + if ((flags & WINED3D_MAP_DISCARD) && buffer->resource.heap_memory) + wined3d_buffer_evict_sysmem(buffer); + if (count == 1) { const struct wined3d_gl_info *gl_info;

1 0

Henri Verbeet : wined3d: Do not upload data in buffer_create_buffer_object ().
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: a5f7aff3bbfb54c07b5eb2cf3a72d0248a9cd50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f7aff3bbfb54c07b5eb2cf3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:38 2017 +0100 wined3d: Do not upload data in buffer_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f0029b0..d957667 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -247,12 +247,7 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi /* No setup is needed here for GL_ARB_map_buffer_range. */ } - /* Reserve memory for the buffer. The amount of data won't change - * so we are safe with calling glBufferData once and - * calling glBufferSubData on updates. Upload the actual data in case - * we're not double buffering, so we can release the heap mem afterwards. - */ - GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, buffer->resource.heap_memory, gl_usage)); + GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -261,11 +256,7 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi } buffer->buffer_object_usage = gl_usage; - - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) - buffer_invalidate_bo_range(buffer, 0, 0); - else - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + buffer_invalidate_bo_range(buffer, 0, 0); return TRUE; @@ -915,9 +906,6 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * return; } - if (buffer->resource.heap_memory) - wined3d_buffer_evict_sysmem(buffer); - /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */ if (state) @@ -995,17 +983,8 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!buffer->conversion_map) { - /* That means that there is nothing to fixup. Just upload from - * buffer->resource.heap_memory directly into the BO. Do not - * free the system memory copy because drawPrimitive may need it if - * the stride is 0, for instancing emulation, vertex blending - * emulation or shader emulation. */ TRACE("No conversion needed.\n"); - /* Nothing to do because heap memory exists if the buffer is double buffer or has no BO at all. */ - if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM)) - return; - wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, buffer->modified_areas, buffer->maps); } @@ -1014,6 +993,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * buffer_conversion_upload(buffer, context); } wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + + if (buffer->resource.heap_memory) + wined3d_buffer_evict_sysmem(buffer); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)

1 0

Henri Verbeet : wined3d: Do not evict the system memory copy in buffer_create_buffer_object().
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 451e137c1b491da467cfaa34b55d0d301a3002f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451e137c1b491da467cfaa34b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:37 2017 +0100 wined3d: Do not evict the system memory copy in buffer_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b31394b..f0029b0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -267,8 +267,6 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi else wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_evict_sysmem(buffer); - return TRUE; fail: @@ -911,7 +909,14 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * return; } - wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER)) + { + ERR("Failed to prepare buffer location.\n"); + return; + } + + if (buffer->resource.heap_memory) + wined3d_buffer_evict_sysmem(buffer); /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */

1 0

Jarkko Korpi : wined3d: Add Rx 460 binary driver.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: b380450ad473a605f041dc2810293b851fbf10ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b380450ad473a605f041dc281… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Mon Jan 30 11:32:38 2017 +0200 wined3d: Add Rx 460 binary driver. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com>= Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 83d68b5..f3af990 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1981,6 +1981,7 @@ cards_nvidia_binary[] = cards_amd_binary[] = { {"RX 480", CARD_AMD_RADEON_RX_480}, + {"RX 460", CARD_AMD_RADEON_RX_460}, {"R9 Fury Series", CARD_AMD_RADEON_R9_FURY}, /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900},

1 0

André Hentschel : wininet: Fix some spec file entries.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 07e3181db3cf7ef4740d271ae0d5060d79c4a04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e3181db3cf7ef4740d271ae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:07 2017 +0100 wininet: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/wininet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 3c4bf5a..ef27009 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -80,10 +80,10 @@ @ stdcall FtpSetCurrentDirectoryW(ptr wstr) @ stdcall GetUrlCacheConfigInfoA(ptr ptr long) @ stdcall GetUrlCacheConfigInfoW(ptr ptr long) -@ stdcall GetUrlCacheEntryInfoA(str ptr long) +@ stdcall GetUrlCacheEntryInfoA(str ptr ptr) @ stdcall GetUrlCacheEntryInfoExA(str ptr ptr str ptr ptr long) @ stdcall GetUrlCacheEntryInfoExW(wstr ptr ptr wstr ptr ptr long) -@ stdcall GetUrlCacheEntryInfoW(wstr ptr long) +@ stdcall GetUrlCacheEntryInfoW(wstr ptr ptr) @ stdcall GetUrlCacheGroupAttributeA(int64 long long ptr ptr ptr) @ stdcall GetUrlCacheGroupAttributeW(int64 long long ptr ptr ptr) @ stub GetUrlCacheHeaderData

1 0

André Hentschel : d3d8: Fix ValidatePixelShader spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 8ed4919b698d738f25123c4491eb0f2b88283eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed4919b698d738f25123c449… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:10 2017 +0100 d3d8: Fix ValidatePixelShader spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/d3d8.spec b/dlls/d3d8/d3d8.spec index 4bad850..4f125a9 100644 --- a/dlls/d3d8/d3d8.spec +++ b/dlls/d3d8/d3d8.spec @@ -1,5 +1,5 @@ @ stdcall D3D8GetSWInfo() @ stdcall DebugSetMute() @ stdcall Direct3DCreate8(long) -@ stdcall ValidatePixelShader(ptr long long ptr) +@ stdcall ValidatePixelShader(ptr ptr long ptr) @ stdcall ValidateVertexShader(ptr ptr ptr long ptr)

1 0

André Hentschel : mapi32: Fix some spec file entries.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 6e8553ca28b970f3e2b810b8574400c0a4e8afb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8553ca28b970f3e2b810b85… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:58:59 2017 +0100 mapi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/mapi32.spec | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 560784c..0b5acbb 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -87,8 +87,8 @@ 144 stub HrDecomposeEID@28 145 stub HrComposeMsgID@24 146 stub HrDecomposeMsgID@24 -147 stdcall OpenStreamOnFile@24(ptr ptr ptr ptr ptr ptr) OpenStreamOnFile -148 stdcall OpenStreamOnFile(ptr ptr ptr ptr ptr ptr) +147 stdcall OpenStreamOnFile@24(ptr ptr long ptr ptr ptr) OpenStreamOnFile +148 stdcall OpenStreamOnFile(ptr ptr long ptr ptr ptr) 149 stub OpenTnefStream@28 150 stub OpenTnefStream 151 stub OpenTnefStreamEx@32 @@ -145,17 +145,17 @@ 205 stub FDecodeID@12 206 stub CchOfEncoding@4 207 stdcall CbOfEncoded@4(ptr) CbOfEncoded -208 stdcall MAPISendDocuments(ptr str str str long) -209 stdcall MAPILogon(ptr str str long long ptr) -210 stdcall MAPILogoff(ptr ptr long long) -211 stdcall MAPISendMail(ptr ptr ptr long long) -212 stdcall MAPISaveMail(ptr ptr ptr long long str) -213 stdcall MAPIReadMail(ptr ptr str long long ptr) -214 stdcall MAPIFindNext(ptr ptr str str long long ptr) -215 stdcall MAPIDeleteMail(ptr ptr str long long) -217 stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) -218 stdcall MAPIDetails(ptr ptr ptr long long) -219 stdcall MAPIResolveName(ptr ptr str long long ptr) +208 stdcall MAPISendDocuments(long str str str long) +209 stdcall MAPILogon(long str str long long ptr) +210 stdcall MAPILogoff(ptr long long long) +211 stdcall MAPISendMail(ptr long ptr long long) +212 stdcall MAPISaveMail(ptr long ptr long long str) +213 stdcall MAPIReadMail(ptr long str long long ptr) +214 stdcall MAPIFindNext(ptr long str str long long ptr) +215 stdcall MAPIDeleteMail(ptr long str long long) +217 stdcall MAPIAddress(ptr long str long str long ptr long long ptr ptr) +218 stdcall MAPIDetails(ptr long ptr long long) +219 stdcall MAPIResolveName(ptr long str long long ptr) 220 stub BMAPISendMail 221 stub BMAPISaveMail 222 stub BMAPIReadMail @@ -188,4 +188,4 @@ 253 stub FixMAPI@0 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath@20(str str ptr long long) FGetComponentPath -256 stdcall MAPISendMailW(ptr ptr ptr long long) +256 stdcall MAPISendMailW(ptr long ptr long long)

1 0

André Hentschel : secur32: Fix LsaConnectUntrusted spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 42817e244c206aed9a2eec5b9dc3a1af6719a4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42817e244c206aed9a2eec5b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:15 2017 +0100 secur32: Fix LsaConnectUntrusted spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 0d6895a..ee872c5 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -33,7 +33,7 @@ @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) @ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) -@ stdcall LsaConnectUntrusted(long) +@ stdcall LsaConnectUntrusted(ptr) @ stdcall LsaDeregisterLogonProcess(long) @ stdcall LsaEnumerateLogonSessions(ptr ptr) @ stdcall LsaFreeReturnBuffer(ptr)

1 0

André Hentschel : avifil32: Fix AVIStreamReadFormat spec file entry.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 349a80e076549b480b4cdb20b42737e00f3ad941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349a80e076549b480b4cdb20b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:13 2017 +0100 avifil32: Fix AVIStreamReadFormat spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/avifil32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec index 9eae749..897f464 100644 --- a/dlls/avifil32/avifil32.spec +++ b/dlls/avifil32/avifil32.spec @@ -49,7 +49,7 @@ @ stdcall AVIStreamOpenFromFileW(ptr wstr long long long ptr) @ stdcall AVIStreamRead(ptr long long ptr long ptr ptr) @ stdcall AVIStreamReadData(ptr long ptr ptr) -@ stdcall AVIStreamReadFormat(ptr long ptr long) +@ stdcall AVIStreamReadFormat(ptr long ptr ptr) @ stdcall AVIStreamRelease(ptr) @ stdcall AVIStreamSampleToTime(ptr long) @ stdcall AVIStreamSetFormat(ptr long ptr long)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017