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

Andrew Eikum : xaudio2: Explicitly version the 2.7 coclasses.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 0056371153a8afe2698f6d23c0add37a74b15053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0056371153a8afe2698f6d23c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 13:52:02 2016 -0600 xaudio2: Explicitly version the 2.7 coclasses. In versions 2.8 and later, no coclasses are provided by the API, so we should version the old ones to make it clear they're out of date. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4ad4c61100c06cbd9eb6587c543ceac94b932621) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 10 +++++----- dlls/xaudio2_7/xapofx.c | 4 ++-- dlls/xaudio2_7/xaudio_classes.idl | 2 +- dlls/xaudio2_7/xaudio_dll.c | 40 +++++++++++++++++++-------------------- dlls/xaudio2_8/xaudio_dll.c | 6 +++--- include/xapofx.h | 8 ++++---- include/xaudio2.idl | 14 +++++++------- include/xaudio2fx.idl | 18 +++++++++--------- 8 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0056371153a8afe2698f6…

1 0

Louis Lenders : gdiplus: GdipTransformPath should return Ok if matrix = NULL.
by Alexandre Julliard June 16, 2016

June 16, 2016

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

Andrew Eikum : xaudio2: Report incoming underruns to the application.
by Alexandre Julliard June 16, 2016

June 16, 2016

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: Remove run-time version checks for XAudio2 object.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 5b9e842a1ef5eadda85f2a2e53852a026fdb867e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9e842a1ef5eadda85f2a2e5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 15 13:48:34 2016 -0600 xaudio2: Remove run-time version checks for XAudio2 object. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb9f616b2ba1b4bccda39f7e933612aba4cd562b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 186 ++++++++++++++++++++-------------------- dlls/xaudio2_7/xaudio_private.h | 2 - 2 files changed, 91 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b9e842a1ef5eadda85f2…

1 0

Andrew Eikum : xaudio2_8: Use shared source.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 344be3a1d0a12a599ca63d3956f61b416ca26006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344be3a1d0a12a599ca63d395… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 13:52:11 2016 -0600 xaudio2_8: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f15d5b37cbc4ac95b01393337eafe1e88e4d6ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/xaudio2_7/Makefile.in | 2 + dlls/xaudio2_7/x3daudio.c | 55 +++++++++++++ dlls/xaudio2_7/xapofx.c | 83 +++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 16 +--- dlls/xaudio2_7/xaudio_dll.c | 42 ++++++++-- dlls/xaudio2_8/Makefile.in | 10 ++- dlls/xaudio2_8/xaudio_dll.c | 163 -------------------------------------- include/xapofx.h | 4 - 10 files changed, 191 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=344be3a1d0a12a599ca63…

1 0

André Hentschel : xaudio2_7: Check return of IAudioClient_Start (Coverity).
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: stable Commit: 850ac564e4160251d6fef97da5eb0b75ead06be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850ac564e4160251d6fef97da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:34:57 2015 +0100 xaudio2_7: Check return of IAudioClient_Start (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35eebeef0fe0b3f03f44731f805c447b2342acfd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 73e6db1..50480ef 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1700,7 +1700,13 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - IAudioClient_Start(This->aclient); + hr = IAudioClient_Start(This->aclient); + if (FAILED(hr)) + { + WARN("Start(IAudioClient) failed: %08x\n", hr); + hr = COMPAT_E_DEVICE_INVALIDATED(This->version); + goto exit; + } if(This->version <= 20) *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio20MasteringVoice_iface;

1 0

Alexandre Julliard : wineps.drv: Reset the device path once it has been painted.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: e0f3f020c0572c05673fe3c8189512948472092c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f3f020c0572c05673fe3c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:36:06 2016 +0900 wineps.drv: Reset the device path once it has been painted. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/graphics.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 711ab43..7fa0727 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -516,7 +516,11 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) int i, size = GetPath( dev->hdc, NULL, NULL, 0 ); if (size == -1) return FALSE; - if (!size) return TRUE; + if (!size) + { + AbortPath( dev->hdc ); + return TRUE; + } points = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*points) ); types = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*types) ); if (!points || !types) goto done; @@ -549,6 +553,7 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) if (stroke) PSDRV_DrawLine(dev); else PSDRV_WriteNewPath(dev); PSDRV_ResetClip(dev); + AbortPath( dev->hdc ); done: HeapFree( GetProcessHeap(), 0, points );

1 0

Alexandre Julliard : gdi32/tests: Add a few more path tests.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: bd53a012b4f8bf2fdb6f6c97157e929ab52fdde5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd53a012b4f8bf2fdb6f6c971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:25:03 2016 +0900 gdi32/tests: Add a few more path tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 53 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 223a027..f7ed012 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -38,6 +38,7 @@ static void test_path_state(void) BYTE buffer[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bi = (BITMAPINFO *)buffer; HDC hdc; + HRGN rgn; HBITMAP orig, dib; void *bits; BOOL ret; @@ -139,6 +140,12 @@ static void test_path_state(void) "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); + rgn = PathToRegion( hdc ); + ok( !rgn, "PathToRegion succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); ret = EndPath( hdc ); ok( !ret, "SelectClipPath succeeded\n" ); ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), @@ -202,6 +209,15 @@ static void test_path_state(void) AbortPath( hdc ); BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + SetLastError( 0xdeadbeef ); + rgn = PathToRegion( hdc ); + ok( !rgn, "PathToRegion succeeded\n" ); + ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), + "wrong error %u\n", GetLastError() ); + + AbortPath( hdc ); + BeginPath( hdc ); ret = CloseFigure( hdc ); ok( ret, "CloseFigure failed\n" ); @@ -211,39 +227,66 @@ static void test_path_state(void) EndPath( hdc ); ret = WidenPath( hdc ); ok( ret, "WidenPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) != -1, "path deleted\n" ); AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = FlattenPath( hdc ); ok( ret, "FlattenPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) != -1, "path deleted\n" ); AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = StrokePath( hdc ); ok( ret, "StrokePath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = FillPath( hdc ); ok( ret, "FillPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); ret = StrokeAndFillPath( hdc ); ok( ret, "StrokeAndFillPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ EndPath( hdc ); ret = SelectClipPath( hdc, RGN_OR ); ok( ret, "SelectClipPath failed\n" ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); + + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + ret = SelectClipPath( hdc, RGN_OR ); + todo_wine ok( !ret, "SelectClipPath succeeded on empty path\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); + + BeginPath( hdc ); + Rectangle( hdc, 1, 1, 10, 10 ); /* region needs some contents */ + EndPath( hdc ); + rgn = PathToRegion( hdc ); + ok( rgn != 0, "PathToRegion failed\n" ); + DeleteObject( rgn ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); + + BeginPath( hdc ); + EndPath( hdc ); + SetLastError( 0xdeadbeef ); + rgn = PathToRegion( hdc ); + todo_wine ok( !rgn, "PathToRegion succeeded on empty path\n" ); + ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + DeleteObject( rgn ); + ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); - AbortPath( hdc ); BeginPath( hdc ); EndPath( hdc ); SetLastError( 0xdeadbeef ); @@ -257,7 +300,7 @@ static void test_path_state(void) EndPath( hdc ); SetLastError( 0xdeadbeef ); ret = EndPath( hdc ); - ok( !ret, "SelectClipPath succeeded\n" ); + ok( !ret, "EndPath succeeded\n" ); ok( GetLastError() == ERROR_CAN_NOT_COMPLETE || broken(GetLastError() == 0xdeadbeef), "wrong error %u\n", GetLastError() );

1 0

Józef Kucia : wined3d: Recognize SM5 store_structured opcode.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 17b599a442580c38e1a171469b64ef04d664ac81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b599a442580c38e1a171469… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:35 2016 +0200 wined3d: Recognize SM5 store_structured 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 | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ad38bfe..dc4b169 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5352,6 +5352,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SQRT */ NULL, /* WINED3DSIH_STORE_RAW */ NULL, + /* WINED3DSIH_STORE_STRUCTURED */ 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 ab53231..7dc8fb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8686,6 +8686,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_STORE_RAW */ NULL, + /* WINED3DSIH_STORE_STRUCTURED */ 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 57dbaef..9e8b8d3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -184,6 +184,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SQRT */ "sqrt", /* WINED3DSIH_STORE_RAW */ "store_raw", + /* WINED3DSIH_STORE_STRUCTURED */ "store_structured", /* 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 885da50..c66379d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -224,6 +224,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, + WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, }; @@ -773,6 +774,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, + {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 46899c2..f463ce4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -692,6 +692,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SLT, WINED3DSIH_SQRT, WINED3DSIH_STORE_RAW, + WINED3DSIH_STORE_STRUCTURED, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, WINED3DSIH_SWITCH,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_consume opcode.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 62af9f6f1fcda6ead2eed4595e5e892cdc355c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62af9f6f1fcda6ead2eed4595… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:33 2016 +0200 wined3d: Recognize SM5 imm_atomic_consume 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 | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2b4bf45..7bdf0ee 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5292,6 +5292,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMAD */ NULL, /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, /* WINED3DSIH_INEG */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c8f7608..e0c7c65 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8626,6 +8626,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAD */ shader_glsl_mad, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INEG */ shader_glsl_unary_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index faae82f..a93a2f1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -124,6 +124,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMAD */ "imad", /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", + /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_INEG */ "ineg", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7564850..888f341 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -223,6 +223,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, + WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, }; enum wined3d_sm4_register_type @@ -770,6 +771,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, + {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 93e9ab4..9eba0ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -632,6 +632,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMAD, WINED3DSIH_IMAX, WINED3DSIH_IMIN, + WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMUL, WINED3DSIH_INE, WINED3DSIH_INEG,

1 0