February 2017 - Wine-Commits

Józef Kucia : wined3d: Pass structure byte stride to wined3d_buffer_create().
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: d867c6aa1ee5537a1412014248cad480351e48cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d867c6aa1ee5537a141201424… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:56 2017 +0100 wined3d: Pass structure byte stride to wined3d_buffer_create(). 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/buffer.c | 4 +--- dlls/wined3d/buffer.c | 8 +++----- include/wine/wined3d.h | 9 +++++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index af3ab39..8233742 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -444,9 +444,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.bind_flags = buffer->desc.BindFlags; wined3d_desc.cpu_access_flags = buffer->desc.CPUAccessFlags; wined3d_desc.misc_flags = buffer->desc.MiscFlags; - - if (buffer->desc.StructureByteStride) - FIXME("Ignoring structure byte stride %u.\n", buffer->desc.StructureByteStride); + wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; wined3d_mutex_lock(); wined3d_private_store_init(&buffer->private_store); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0c172d0..5ea7eff 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1467,15 +1467,13 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", device, desc, data, parent, parent_ops, buffer); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; FIXME("Ignoring access flags (pool).\n"); - hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, - WINED3D_POOL_MANAGED, desc->bind_flags, data, parent, parent_ops); - if (FAILED(hr)) + if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, + WINED3D_POOL_MANAGED, desc->bind_flags, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 03f3db9..58e3f0d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1916,11 +1916,12 @@ struct wined3d_blt_fx struct wined3d_buffer_desc { - UINT byte_width; + unsigned int byte_width; DWORD usage; - UINT bind_flags; - UINT cpu_access_flags; - UINT misc_flags; + unsigned int bind_flags; + unsigned int cpu_access_flags; + unsigned int misc_flags; + unsigned int structure_byte_stride; }; struct wined3d_rasterizer_state_desc

1 0

Józef Kucia : wined3d: Implement SM5 store_structured instruction.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 39a15ee47c36c4689b564e8faf8daea4ebe2b31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a15ee47c36c4689b564e8fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:55 2017 +0100 wined3d: Implement SM5 store_structured instruction. 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/glsl_shader.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9893d11..a8bdba0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5133,26 +5133,46 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) image_coord_param.param_str, image_data_param.param_str); } -static void shader_glsl_store_raw(const struct wined3d_shader_instruction *ins) +static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins) { const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; struct wined3d_string_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param offset, data; + struct glsl_src_param structure_idx, offset, data; + struct wined3d_string_buffer *address; + unsigned int i, uav_idx, src_idx = 0; DWORD write_mask; - unsigned int i; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &offset); + uav_idx = ins->dst[0].reg.idx[0].offset; + if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", uav_idx); + return; + } + + address = string_buffer_get(priv->string_buffers); + if (ins->handler_idx == WINED3DSIH_STORE_STRUCTURED) + { + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx); + shader_addline(address, "%s * %u + ", structure_idx.param_str, + reg_maps->uav_resource_info[uav_idx].stride); + } + shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset); + shader_addline(address, "%s / 4", offset.param_str); for (i = 0; i < 4; ++i) { if (!(write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i))) continue; - shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &data); + shader_glsl_add_src_param(ins, &ins->src[src_idx], write_mask, &data); - shader_addline(buffer, "imageStore(%s_image%u, %s / 4 + %u, uvec4(%s, 0, 0, 0));\n", - prefix, ins->dst[0].reg.idx[0].offset, offset.param_str, i, data.param_str); + shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n", + prefix, uav_idx, address->buffer, i, data.param_str); } + + string_buffer_release(priv->string_buffers, address); } static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) @@ -9479,8 +9499,8 @@ 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 */ shader_glsl_store_raw, - /* WINED3DSIH_STORE_STRUCTURED */ NULL, + /* WINED3DSIH_STORE_RAW */ shader_glsl_store_buffer, + /* WINED3DSIH_STORE_STRUCTURED */ shader_glsl_store_buffer, /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL,

1 0

Alistair Leslie-Hughes : mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 0dc677c05fb71ba459ad20711af6637ab92e8847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc677c05fb71ba459ad20711… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 23 00:17:24 2017 -0700 mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 14 ++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index a72f634..d3feeaf 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -22,6 +22,11 @@ #include "windef.h" #include "winbase.h" +#include "mfreadwrite.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +41,12 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + + +HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + FIXME("%p %p %p stub.\n", source, attributes, reader); + + return E_NOTIMPL; +} diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 1f9f30f..70b95a8 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -3,5 +3,5 @@ @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stub MFCreateSourceReaderFromByteStream -@ stub MFCreateSourceReaderFromMediaSource +@ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) @ stub MFCreateSourceReaderFromURL

1 0

Józef Kucia : wined3d: Implement structured buffer views.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 48e1989cb98ca004e3c0d0a86a088c947cfc900c URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e1989cb98ca004e3c0d0a86… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:57 2017 +0100 wined3d: Implement structured buffer views. 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/view.c | 62 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d12bc4c..b64b5e7 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -187,12 +187,14 @@ static void create_buffer_view(struct wined3d_gl_view *view, if (desc->format_id == WINED3DFMT_UNKNOWN) { - FIXME("Structured buffer views not supported.\n"); - return; + offset = desc->u.buffer.start_idx * buffer->desc.structure_byte_stride; + size = desc->u.buffer.count * buffer->desc.structure_byte_stride; + } + else + { + offset = desc->u.buffer.start_idx * view_format->byte_count; + size = desc->u.buffer.count * view_format->byte_count; } - - offset = desc->u.buffer.start_idx * view_format->byte_count; - size = desc->u.buffer.count * view_format->byte_count; create_buffer_texture(view, buffer, view_format, offset, size); } @@ -546,14 +548,31 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int buffer_size, element_size; - if (view_format->byte_count) + if (buffer->desc.structure_byte_stride) { - unsigned int buffer_size = buffer->resource.size / view_format->byte_count; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + if (desc->format_id != WINED3DFMT_UNKNOWN) + { + WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); return E_INVALIDARG; + } + + view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + element_size = buffer->desc.structure_byte_stride; } + else + { + element_size = view_format->byte_count; + } + + if (!element_size) + return E_INVALIDARG; + + buffer_size = buffer->resource.size / element_size; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return E_INVALIDARG; } else { @@ -756,14 +775,31 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int buffer_size, element_size; - if (view->format->byte_count) + if (buffer->desc.structure_byte_stride) { - unsigned int buffer_size = buffer->resource.size / view->format->byte_count; - if (desc->u.buffer.start_idx >= buffer_size - || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + if (desc->format_id != WINED3DFMT_UNKNOWN) + { + WARN("Invalid format %s for structured buffer view.\n", debug_d3dformat(desc->format_id)); return E_INVALIDARG; + } + + view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + element_size = buffer->desc.structure_byte_stride; + } + else + { + element_size = view->format->byte_count; } + + if (!element_size) + return E_INVALIDARG; + + buffer_size = buffer->resource.size / element_size; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return E_INVALIDARG; } else {

1 0

Alex Henrie : user32: Translate WM_(NC) XBUTTONUP to WM_APPCOMMAND in DefWindowProc.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 2799be180439a09588888b0ce5854faef8fe4a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2799be180439a09588888b0ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 22 23:17:07 2017 -0700 user32: Translate WM_(NC)XBUTTONUP to WM_APPCOMMAND in DefWindowProc. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 9 +++++++++ dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index e62f021..6fbaf1e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -291,6 +291,15 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa */ break; + case WM_XBUTTONUP: + case WM_NCXBUTTONUP: + if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2) + { + SendMessageW(hwnd, WM_APPCOMMAND, (WPARAM)hwnd, + MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam))); + } + break; + case WM_CONTEXTMENU: if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) SendMessageW( GetParent(hwnd), msg, wParam, lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 13bc038..19a1f31 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14378,6 +14378,18 @@ static const struct message NCRBUTTONDOWNSeq[] = { 0 } }; +static const struct message NCXBUTTONUPSeq1[] = +{ + { WM_APPCOMMAND, sent|lparam, /*hwnd*/0, MAKELPARAM(0, FAPPCOMMAND_MOUSE | APPCOMMAND_BROWSER_BACKWARD) }, + { 0 } +}; + +static const struct message NCXBUTTONUPSeq2[] = +{ + { WM_APPCOMMAND, sent|lparam, /*hwnd*/0, MAKELPARAM(0, FAPPCOMMAND_MOUSE | APPCOMMAND_BROWSER_FORWARD) }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -14437,6 +14449,22 @@ static void test_defwinproc(void) DefWindowProcA( hwnd, WM_NCRBUTTONDOWN, HTCAPTION, MAKELPARAM(x, y)); ok_sequence(NCRBUTTONDOWNSeq, "WM_NCRBUTTONDOWN on caption", FALSE); + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, 0, MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP without button", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, XBUTTON1), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(NCXBUTTONUPSeq1, "WM_NCXBUTTONUP with XBUTTON1", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, XBUTTON2), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(NCXBUTTONUPSeq2, "WM_NCXBUTTONUP with XBUTTON2", FALSE); + + res = DefWindowProcA(hwnd, WM_NCXBUTTONUP, MAKEWPARAM(0, 3), MAKELPARAM(x, y)); + ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); + ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished );

1 0

Alistair Leslie-Hughes : include: Add mfreadwrite.idl.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: f45f088d865c6fd341a6648742566098a36fb95d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45f088d865c6fd341a664874… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 23 00:17:23 2017 -0700 include: Add mfreadwrite.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/mfreadwrite.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 80fa362..4fbfd16 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -89,6 +89,7 @@ IDL_SRCS = \ mediaobj.idl \ metahost.idl \ mfobjects.idl \ + mfreadwrite.idl \ mimeinfo.idl \ mimeole.idl \ mlang.idl \ diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl new file mode 100644 index 0000000..3f53ff9 --- /dev/null +++ b/include/mfreadwrite.idl @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; +import "mfobjects.idl"; + +interface IMFMediaSource; + +[ + object, + uuid(70ae66f2-c809-4e4f-8915-bdcb406b7993), + local +] +interface IMFSourceReader : IUnknown +{ + HRESULT GetStreamSelection([in] DWORD index, [out] BOOL *selected); + HRESULT SetStreamSelection([in] DWORD index, [in] BOOL selected); + HRESULT GetNativeMediaType([in] DWORD index, [in] DWORD typeindex, [out] IMFMediaType **type); + HRESULT GetCurrentMediaType([in] DWORD index, [out] IMFMediaType **type); + HRESULT SetCurrentMediaType([in] DWORD index, [in, out] DWORD *reserved, [in] IMFMediaType *type); + HRESULT SetCurrentPosition([in] REFGUID format, [in] REFPROPVARIANT position); + HRESULT ReadSample([in] DWORD index, [in] DWORD flags, [out] DWORD *actualindex, [out] DWORD *sampleflags, + [out] LONGLONG *timestamp, [out] IMFSample **sample); + HRESULT Flush([in] DWORD index); + HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); + HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); +}; + +cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) +cpp_quote( " IMFSourceReader **reader);" )

1 0

Józef Kucia : d3d11/tests: Add test for compute shader input registers.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: fef10cbe9add210761e233992495ef56483368f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef10cbe9add210761e233992… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:58 2017 +0100 d3d11/tests: Add test for compute shader input registers. 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/tests/d3d11.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 47e7961..8f37304 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14627,6 +14627,157 @@ done: release_test_context(&test_context); } +static void test_compute_shader_registers(void) +{ + struct data + { + unsigned int group_id[3]; + unsigned int group_index; + unsigned int dispatch_id[3]; + unsigned int thread_id[3]; + }; + + struct d3d11_test_context test_context; + unsigned int i, x, y, group_x, group_y; + ID3D11UnorderedAccessView *uav; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Buffer *cb, *buffer; + struct uvec4 dimensions; + ID3D11ComputeShader *cs; + const struct data *data; + ID3D11Device *device; + HRESULT hr; + + static const DWORD cs_code[] = + { +#if 0 + struct data + { + uint3 group_id; + uint group_index; + uint3 dispatch_id; + uint3 group_thread_id; + }; + + RWStructuredBuffer<data> u; + + uint2 dim; + + [numthreads(3, 2, 1)] + void main(uint3 group_id : SV_GroupID, + uint group_index : SV_GroupIndex, + uint3 dispatch_id : SV_DispatchThreadID, + uint3 group_thread_id : SV_GroupThreadID) + { + uint i = dispatch_id.x + dispatch_id.y * 3 * dim.x; + u[i].group_id = group_id; + u[i].group_index = group_index; + u[i].dispatch_id = dispatch_id; + u[i].group_thread_id = group_thread_id; + } +#endif + 0x43425844, 0xf0bce218, 0xfc1e8267, 0xe6d57544, 0x342df592, 0x00000001, 0x000001a4, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000150, 0x00050050, 0x00000054, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400009e, 0x0011e000, 0x00000000, 0x00000028, + 0x0200005f, 0x00024000, 0x0200005f, 0x00021072, 0x0200005f, 0x00022072, 0x0200005f, 0x00020072, + 0x02000068, 0x00000002, 0x0400009b, 0x00000003, 0x00000002, 0x00000001, 0x04000036, 0x00100072, + 0x00000000, 0x00021246, 0x04000036, 0x00100082, 0x00000000, 0x0002400a, 0x08000026, 0x0000d000, + 0x00100012, 0x00000001, 0x0002001a, 0x0020800a, 0x00000000, 0x00000000, 0x08000023, 0x00100012, + 0x00000001, 0x0010000a, 0x00000001, 0x00004001, 0x00000003, 0x0002000a, 0x090000a8, 0x0011e0f2, + 0x00000000, 0x0010000a, 0x00000001, 0x00004001, 0x00000000, 0x00100e46, 0x00000000, 0x04000036, + 0x00100072, 0x00000000, 0x00020246, 0x04000036, 0x00100082, 0x00000000, 0x0002200a, 0x090000a8, + 0x0011e0f2, 0x00000000, 0x0010000a, 0x00000001, 0x00004001, 0x00000010, 0x00100e46, 0x00000000, + 0x080000a8, 0x0011e032, 0x00000000, 0x0010000a, 0x00000001, 0x00004001, 0x00000020, 0x00022596, + 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + buffer_desc.ByteWidth = 10240; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; + buffer_desc.StructureByteStride = 40; + assert(sizeof(struct data) == buffer_desc.StructureByteStride); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(dimensions), NULL); + + hr = ID3D11Device_CreateComputeShader(device, cs_code, sizeof(cs_code), NULL, &cs); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetConstantBuffers(context, 0, 1, &cb); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + + dimensions.x = 2; + dimensions.y = 3; + dimensions.z = 1; + dimensions.w = 0; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, + NULL, &dimensions, 0, 0); + ID3D11DeviceContext_Dispatch(context, dimensions.x, dimensions.y, dimensions.z); + + get_buffer_readback(buffer, &rb); + i = 0; + data = rb.map_desc.pData; + for (y = 0; y < dimensions.y; ++y) + { + for (group_y = 0; group_y < 2; ++group_y) + { + for (x = 0; x < dimensions.x; ++x) + { + for (group_x = 0; group_x < 3; ++group_x) + { + const unsigned int dispatch_id[2] = {x * 3 + group_x, y * 2 + group_y}; + const unsigned int group_index = group_y * 3 + group_x; + const struct data *d = &data[i]; + + ok(d->group_id[0] == x && d->group_id[1] == y && !d->group_id[2], + "Got group id (%u, %u, %u), expected (%u, %u, %u) at %u (%u, %u, %u, %u).\n", + d->group_id[0], d->group_id[1], d->group_id[2], x, y, 0, + i, x, y, group_x, group_y); + ok(d->group_index == group_index, + "Got group index %u, expected %u at %u (%u, %u, %u, %u).\n", + d->group_index, group_index, i, x, y, group_x, group_y); + ok(d->dispatch_id[0] == dispatch_id[0] && d->dispatch_id[1] == dispatch_id[1] + && !d->dispatch_id[2], + "Got dispatch id (%u, %u, %u), expected (%u, %u, %u) " + "at %u (%u, %u, %u, %u).\n", + d->dispatch_id[0], d->dispatch_id[1], d->dispatch_id[2], + dispatch_id[0], dispatch_id[1], 0, + i, x, y, group_x, group_y); + ok(d->thread_id[0] == group_x && d->thread_id[1] == group_y && !d->thread_id[2], + "Got group thread id (%u, %u, %u), expected (%u, %u, %u) " + "at %u (%u, %u, %u, %u).\n", + d->thread_id[0], d->thread_id[1], d->thread_id[2], group_x, group_y, 0, + i, x, y, group_x, group_y); + ++i; + } + } + } + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(cb); + ID3D11Buffer_Release(buffer); + ID3D11ComputeShader_Release(cs); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -14703,4 +14854,5 @@ START_TEST(d3d11) test_buffer_srv(); run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_unaligned_raw_buffer_access); + test_compute_shader_registers(); }

1 0

Józef Kucia : wined3d: Handle structured UAV declarations.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: a78afa1c716b03083f7ede461ffdc041a8134c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78afa1c716b03083f7ede461… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:54 2017 +0100 wined3d: Handle structured UAV declarations. 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/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 15 +++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f026e78..9893d11 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9352,7 +9352,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_UAV_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3b5d6ee..3085248 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1058,6 +1058,21 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->uav_resource_info[reg_idx].data_type = WINED3D_DATA_UINT; reg_maps->uav_resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.structured_resource.reg.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV resource index %u.\n", reg_idx); + break; + } + if (ins.flags) + FIXME("Ignoring structured UAV flags %#x.\n", ins.flags); + reg_maps->uav_resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; + reg_maps->uav_resource_info[reg_idx].data_type = WINED3D_DATA_UINT; + reg_maps->uav_resource_info[reg_idx].flags = 0; + reg_maps->uav_resource_info[reg_idx].stride = ins.declaration.structured_resource.byte_stride / 4; + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index baffe2d..877b27d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -753,6 +753,8 @@ static void shader_sm5_read_dcl_uav_structured(struct wined3d_shader_instruction shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.structured_resource.reg); ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; ins->declaration.structured_resource.byte_stride = *tokens; + if (ins->declaration.structured_resource.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); } static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 087e4d2..7950011 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -827,6 +827,7 @@ struct wined3d_shader_resource_info enum wined3d_shader_resource_type type; enum wined3d_data_type data_type; unsigned int flags; + unsigned int stride; }; #define WINED3D_SAMPLER_DEFAULT ~0x0u

1 0

André Hentschel : krnl386.exe16: Fix AllocSLCallback spec file entry.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: de97d2c8e7fe26e6437378164fb308b0a9844e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de97d2c8e7fe26e6437378164… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:20 2017 +0100 krnl386.exe16: Fix AllocSLCallback spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index a06ba8c..8d40f0f 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -632,7 +632,7 @@ @ stdcall -arch=win32 _KERNEL32_99(long) @ stdcall -arch=win32 _KERNEL32_100(long long long) -@ stdcall -arch=win32 AllocSLCallback(ptr ptr) +@ stdcall -arch=win32 AllocSLCallback(long long) @ stdcall -arch=win32 -norelay FT_Exit0() @ stdcall -arch=win32 -norelay FT_Exit12() @ stdcall -arch=win32 -norelay FT_Exit16()

1 0

Stefan Dösinger : d3d9/tests: AMD r500 needs dummy texture output from vertex shaders for point sprites to work.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: f3a0465c5c9d47e834b2ed7eec44b94171fed8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a0465c5c9d47e834b2ed7ee… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Feb 22 22:32:02 2017 +0000 d3d9/tests: AMD r500 needs dummy texture output from vertex shaders for point sprites to work. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 72005ff..c8cab8c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10445,6 +10445,9 @@ static void test_pointsize(void) vertex_pointsize = {64.0f, 64.0f, 0.1f, 48.0f}, vertex_pointsize_scaled = {64.0f, 64.0f, 0.1f, 24.0f}, vertex_pointsize_zero = {64.0f, 64.0f, 0.1f, 0.0f}; + /* Writing a texture coordinate from the shader is technically unnecessary, but is required + * to make Windows AMD r500 drivers work. Without it, texture coordinates in the pixel + * shaders are 0. */ static const DWORD vshader_code[] = { 0xfffe0101, /* vs_1_1 */ @@ -10453,6 +10456,8 @@ static void test_pointsize(void) 0x00000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x00000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x00000004, 0xc00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad oPos, v0.w, c3, r0 */ + 0x00000001, 0xe00f0000, 0x90e40000, /* mov oT0, v0 */ + 0x00000001, 0xe00f0001, 0x90e40000, /* mov oT1, v0 */ 0x0000ffff }; static const DWORD vshader_psize_code[] = @@ -10464,7 +10469,9 @@ static void test_pointsize(void) 0x00000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x00000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x00000004, 0xc00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad oPos, v0.w, c3, r0 */ - 0x00000001, 0xc00f0002, 0x90000001, /* mov oPts, v1.x */ + 0x00000001, 0xc00f0002, 0x90000001, /* mov oPts, v1.x */ + 0x00000001, 0xe00f0000, 0x90e40000, /* mov oT0, v0 */ + 0x00000001, 0xe00f0001, 0x90e40000, /* mov oT1, v0 */ 0x0000ffff }; static const DWORD pshader_code[] = @@ -10508,10 +10515,14 @@ static void test_pointsize(void) 0xfffe0300, /* vs_3_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ + 0x0200001f, 0x80000005, 0xe00f0001, /* dcl_texcoord0 o1 */ + 0x0200001f, 0x80010005, 0xe00f0002, /* dcl_texcoord1 o2 */ 0x03000005, 0x800f0000, 0x90000000, 0xa0e40000, /* mul r0, v0.x, c0 */ 0x04000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x04000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x04000004, 0xe00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad o0, v0.w, c3, r0 */ + 0x02000001, 0xe00f0001, 0x90000000, /* mov o1, v0.x */ + 0x02000001, 0xe00f0002, 0x90000000, /* mov o2, v0.x */ 0x0000ffff }; static const DWORD vshader3_psize_code[] = @@ -10521,11 +10532,15 @@ static void test_pointsize(void) 0x0200001f, 0x80000004, 0x90010001, /* dcl_psize v1.x */ 0x0200001f, 0x80000000, 0xe00f0000, /* dcl_position o0 */ 0x0200001f, 0x80000004, 0xe00f0001, /* dcl_psize o1 */ + 0x0200001f, 0x80000005, 0xe00f0002, /* dcl_texcoord0 o2 */ + 0x0200001f, 0x80010005, 0xe00f0003, /* dcl_texcoord1 o3 */ 0x03000005, 0x800f0000, 0x90000000, 0xa0e40000, /* mul r0, v0.x, c0 */ 0x04000004, 0x800f0000, 0x90550000, 0xa0e40001, 0x80e40000, /* mad r0, v0.y, c1, r0 */ 0x04000004, 0x800f0000, 0x90aa0000, 0xa0e40002, 0x80e40000, /* mad r0, v0.z, c2, r0 */ 0x04000004, 0xe00f0000, 0x90ff0000, 0xa0e40003, 0x80e40000, /* mad o0, v0.w, c3, r0 */ 0x02000001, 0xe00f0001, 0x90000001, /* mov o1, v1.x */ + 0x02000001, 0xe00f0002, 0x90000000, /* mov o2, v0.x */ + 0x02000001, 0xe00f0003, 0x90000000, /* mov o3, v0.x */ 0x0000ffff }; static const DWORD pshader3_code[] =

1 0