June 2016 - Wine-commits - list.winehq.org

Andrew Eikum : xaudio2: Report incoming underruns to the application.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 76016117dc693be2203b06fe60f04b702196b03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76016117dc693be2203b06fe6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 25 13:30:30 2016 -0600 xaudio2: Report incoming underruns to the application. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3934253513c277e0a0163a923af7c4d92f911881) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 23ea0c6..a2e3ef5 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -41,6 +41,8 @@ static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei static HINSTANCE instance; +#define IN_AL_PERIODS 4 + #if XAUDIO2_VER == 0 #define COMPAT_E_INVALID_CALL E_INVALIDARG #define COMPAT_E_DEVICE_INVALIDATED XAUDIO20_E_DEVICE_INVALIDATED @@ -2164,6 +2166,30 @@ static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al return buf->offs_bytes < buf->cur_end_bytes; } +#if XAUDIO2_VER > 0 +static UINT32 get_underrun_warning(XA2SourceImpl *src) +{ + UINT32 period_bytes = src->xa2->period_frames * src->submit_blocksize; + UINT32 total = 0, i; + + for(i = 0; i < src->nbufs && total < IN_AL_PERIODS * period_bytes; ++i){ + XA2Buffer *buf = &src->buffers[(src->first_buf + i) % XAUDIO2_MAX_QUEUED_BUFFERS]; + total += buf->cur_end_bytes - buf->offs_bytes; + if(buf->xa2buffer.LoopCount == XAUDIO2_LOOP_INFINITE) + return 0; + if(buf->xa2buffer.LoopCount > 0){ + total += (buf->loop_end_bytes - buf->xa2buffer.LoopBegin) * (buf->xa2buffer.LoopCount - buf->looped); + total += buf->play_end_bytes - buf->loop_end_bytes; + } + } + + if(total >= IN_AL_PERIODS * period_bytes) + return 0; + + return ((IN_AL_PERIODS * period_bytes - total) / period_bytes + 1) * period_bytes; +} +#endif + /* Looping: * * The looped section of a buffer is a subset of the play area which is looped @@ -2179,7 +2205,7 @@ static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al * * In the simple case, playback will start at PlayBegin. At LoopEnd, playback * will move to LoopBegin and repeat that loop LoopCount times. Then, playback - * will cease at LoopEnd. + * will cease at PlayEnd. * * If PlayLength is zero, then PlayEnd is the end of the buffer. * @@ -2239,9 +2265,9 @@ static void update_source_state(XA2SourceImpl *src) alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); - /* maintain 4 periods in AL */ + /* maintain IN_AL_PERIODS periods in AL */ while(src->cur_buf != (src->first_buf + src->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS && - src->in_al_bytes - bufpos < 4 * src->xa2->period_frames * src->submit_blocksize){ + src->in_al_bytes - bufpos < IN_AL_PERIODS * src->xa2->period_frames * src->submit_blocksize){ TRACE("%p: going to queue a period from buffer %u\n", src, src->cur_buf); /* starting from an empty buffer */ @@ -2319,8 +2345,11 @@ static void do_engine_tick(IXAudio2Impl *This) #if XAUDIO2_VER == 0 IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); #else - /* TODO: detect incoming underrun and inform callback */ - IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, 0); + UINT32 underrun; + underrun = get_underrun_warning(src); + if(underrun > 0) + TRACE("Calling OnVoiceProcessingPassStart with BytesRequired: %u\n", underrun); + IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, underrun); #endif }

1 0

Andrew Eikum : xaudio2: Protect access to source voice during creation ( Coverity).
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 6c50c182e6e03a63a93c2df7a92abea5d8ccb20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c50c182e6e03a63a93c2df7a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:25 2016 -0600 xaudio2: Protect access to source voice during creation (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c82e8b477fe476b2eb3ad4452225619ca2e7a58) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a2e3ef5..2f750bd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1364,8 +1364,10 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ + EnterCriticalSection(&src->lock); if(!src->in_use) break; + LeaveCriticalSection(&src->lock); } if(&src->entry == &This->source_voices){ @@ -1386,6 +1388,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, src->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SourceImpl.lock"); src->xa2 = This; + + EnterCriticalSection(&src->lock); } src->in_use = TRUE; @@ -1398,6 +1402,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, src->al_fmt = get_al_format(pSourceFormat); if(!src->al_fmt){ src->in_use = FALSE; + LeaveCriticalSection(&src->lock); WARN("OpenAL can't convert this format!\n"); return AUDCLNT_E_UNSUPPORTED_FORMAT; } @@ -1410,6 +1415,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; + LeaveCriticalSection(&src->lock); return hr; } @@ -1420,6 +1426,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); HeapFree(GetProcessHeap(), 0, src->fmt); src->in_use = FALSE; + LeaveCriticalSection(&src->lock); return E_OUTOFMEMORY; } @@ -1427,6 +1434,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, alSourcePlay(src->al_src); + LeaveCriticalSection(&src->lock); + #if XAUDIO2_VER == 0 *ppSourceVoice = (IXAudio2SourceVoice*)&src->IXAudio20SourceVoice_iface; #elif XAUDIO2_VER <= 3

1 0

Andrew Eikum : xaudio2: Protect access to submix voice during creation ( Coverity).
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: a81e1ad8477ea45f39186345f40253e9fddeba2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81e1ad8477ea45f39186345f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:40 2016 -0600 xaudio2: Protect access to submix voice during creation (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7bb885a3d3ac4fdc435fc79fc5632b6b9e70ffa7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 2f750bd..3bb1aad 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1467,8 +1467,10 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(sub, &This->submix_voices, XA2SubmixImpl, entry){ + EnterCriticalSection(&sub->lock); if(!sub->in_use) break; + LeaveCriticalSection(&sub->lock); } if(&sub->entry == &This->submix_voices){ @@ -1486,11 +1488,14 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, InitializeCriticalSection(&sub->lock); sub->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SubmixImpl.lock"); + + EnterCriticalSection(&sub->lock); } sub->in_use = TRUE; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&sub->lock); #if XAUDIO2_VER == 0 *ppSubmixVoice = (IXAudio2SubmixVoice*)&sub->IXAudio20SubmixVoice_iface;

1 0

Sebastian Lackner : xaudio2_7: Unset DebugInfo->Spare[0] before destroying critical sections.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 2ad35dfd7817accb87e246009c8d84a11643c8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad35dfd7817accb87e246009… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 06:12:12 2016 +0100 xaudio2_7: Unset DebugInfo->Spare[0] before destroying critical sections. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit caff64333f6dfee3b99cc067ed522da101f40a6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 3bb1aad..70ed8d6 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1249,12 +1249,14 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) LIST_FOR_EACH_ENTRY_SAFE(src, src2, &This->source_voices, XA2SourceImpl, entry){ HeapFree(GetProcessHeap(), 0, src->sends); IXAudio2SourceVoice_DestroyVoice(&src->IXAudio2SourceVoice_iface); + src->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&src->lock); HeapFree(GetProcessHeap(), 0, src); } LIST_FOR_EACH_ENTRY_SAFE(sub, sub2, &This->submix_voices, XA2SubmixImpl, entry){ IXAudio2SubmixVoice_DestroyVoice(&sub->IXAudio2SubmixVoice_iface); + sub->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&sub->lock); HeapFree(GetProcessHeap(), 0, sub); } @@ -1270,6 +1272,7 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) CloseHandle(This->mmevt); + This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This);

1 0

Louis Lenders : gdiplus: GdipTransformPath should return Ok if matrix = NULL.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 2025f0475fae469c2edde222b0c824a9f759f59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2025f0475fae469c2edde222b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Mar 22 21:07:05 2016 +0100 gdiplus: GdipTransformPath should return Ok if matrix = NULL. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 36fdc6abf19bc53dfb33532464f3613f95444239) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 49dbf6c..00ece95 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1216,11 +1216,9 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes if(path->pathdata.Count == 0) return Ok; - if(matrix){ - stat = GdipTransformPath(path, matrix); - if (stat != Ok) - return stat; - } + stat = GdipTransformPath(path, matrix); + if(stat != Ok) + return stat; pt = path->pathdata.Points[0]; if(!init_path_list(&list, pt.X, pt.Y)) @@ -1677,7 +1675,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) if(!path) return InvalidParameter; - if(path->pathdata.Count == 0) + if(path->pathdata.Count == 0 || !matrix) return Ok; return GdipTransformMatrixPoints(matrix, path->pathdata.Points,

1 0

Rob Walker : wined3d: Add Nvidia GPU SKUs 950,950M,960,960M.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 509ab1c561ef832f90892e45996ac817585dfd3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=509ab1c561ef832f90892e459… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Sat Mar 19 12:31:25 2016 +0000 wined3d: Add Nvidia GPU SKUs 950,950M,960,960M. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e4c75a88fde88a1f7d1bca38a18eb91c80dbbd77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eb414cc..a5b36e4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1276,6 +1276,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960M, "NVIDIA GeForce GTX 960M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, @@ -1719,6 +1723,10 @@ cards_nvidia_binary[] = /* Direct 3D 11 */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ + {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ + {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ + {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ + {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70857c9..fdf5457 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1621,6 +1621,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, + CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, + CARD_NVIDIA_GEFORCE_GTX960 = 0x1401, + CARD_NVIDIA_GEFORCE_GTX960M = 0x139B, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8,

1 0

Béla Gyebrószki : wined3d: Add Nvidia GeForce GT 730 (GK208).
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 72cdfff3e5b8dafbe71ad353f442bc8c67be568d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cdfff3e5b8dafbe71ad353f… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Fri Jun 10 20:15:11 2016 +0200 wined3d: Add Nvidia GeForce GT 730 (GK208). Signed-off-by: Béla Gyebrószki <gyebro69(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 48feeef..4fc7736 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1279,6 +1279,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1788,6 +1789,7 @@ cards_nvidia_binary[] = {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ + {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7207523..ffcfb81 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1821,6 +1821,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381,

1 0

Francois Gouget : wined3d: Make glsl_vertex_pipe_clip_plane() static.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 0652bf7eca6b7de9315b7be37c062bcee6eef388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0652bf7eca6b7de9315b7be37… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 13:53:27 2016 +0200 wined3d: Make glsl_vertex_pipe_clip_plane() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> 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/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 55affc1..719c8a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9062,7 +9062,7 @@ static void glsl_vertex_pipe_shademode(struct wined3d_context *context, context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; } -void glsl_vertex_pipe_clip_plane(struct wined3d_context *context, +static void glsl_vertex_pipe_clip_plane(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info;

1 0

Józef Kucia : wined3d: Recognize thread group shared memory register.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: c2651c5617b92a2c224934ecc7c431f9f411a5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2651c5617b92a2c224934ecc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:30 2016 +0200 wined3d: Recognize thread group shared memory register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 55de679..f88ccb5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1730,6 +1730,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vDomainLocation"); break; + case WINED3DSPR_GROUPSHAREDMEM: + shader_addline(buffer, "g"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 45a3d04..4603d9a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -242,6 +242,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, + WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, }; enum wined3d_sm4_output_primitive_type @@ -800,6 +801,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, + /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ffcfb81..7ad7bac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -386,6 +386,7 @@ enum wined3d_shader_register_type WINED3DSPR_INCONTROLPOINT, WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, + WINED3DSPR_GROUPSHAREDMEM, }; enum wined3d_data_type

1 0

Józef Kucia : wined3d: Recognize SM5 store_raw opcode.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 41b296eea757b8356eaedb6c14049f26af040fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b296eea757b8356eaedb6c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:31 2016 +0200 wined3d: Recognize SM5 store_raw opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5ac70ad..392e6ee 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5348,6 +5348,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SINCOS */ shader_hw_sincos, /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_SWITCH */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 719c8a2..02a8d41 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8682,6 +8682,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, + /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWITCH */ shader_glsl_switch, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f88ccb5..2073bcb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -180,6 +180,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SINCOS */ "sincos", /* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SQRT */ "sqrt", + /* WINED3DSIH_STORE_RAW */ "store_raw", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_SWITCH */ "switch", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4603d9a..fe85baa 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -220,6 +220,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, + WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -764,7 +765,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, - {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "", "Uif"}, + {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, + {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ad7bac..1bf95a6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -688,6 +688,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SINCOS, WINED3DSIH_SLT, WINED3DSIH_SQRT, + WINED3DSIH_STORE_RAW, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, WINED3DSIH_SWITCH,

1 0