February 2017 - Wine-commits

Jacek Caban : server: Choose newer async object when searching from client pointer.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 13204d87cfc35b436e50925701b55e55f1ab165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13204d87cfc35b436e5092570… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 16:05:39 2017 +0100 server: Choose newer async object when searching from client pointer. This fixes a race. Client may release and reuse async pointer while processing APC_ASYNC_IO. It is, however, guaranteed that get_async_result will be called on the newest one known to the server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index ec46103..ef548d1 100644 --- a/server/async.c +++ b/server/async.c @@ -255,7 +255,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co else async->iosb = NULL; list_add_tail( &queue->queue, &async->queue_entry ); - list_add_tail( &thread->process->asyncs, &async->process_entry ); + list_add_head( &thread->process->asyncs, &async->process_entry ); grab_object( async ); if (queue->fd) set_fd_signaled( queue->fd, 0 );

1 0

Jacek Caban : ntdll: Don't set io-> Information in server_read_file and server_write_file.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 21d14104948e28d118925d53a9bee9ef80cea7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d14104948e28d118925d53a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 16:06:19 2017 +0100 ntdll: Don't set io->Information in server_read_file and server_write_file. Currently we set Information, but not Status. According to tests, depending on error type, none or both should be set. Both will be set when APC is used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a6c1098..f3ff163 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -579,7 +579,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if (status != STATUS_PENDING) io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ; @@ -627,7 +626,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if (status != STATUS_PENDING) io->Information = reply->size; } SERVER_END_REQ;

1 0

Thierry Vermeylen : wnaspi32: Do not crash on SC_GETSET_TIMEOUTS.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 77af98e3dfdc1556d7c897451fd7973a8cb2e304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77af98e3dfdc1556d7c897451… Author: Thierry Vermeylen <t_chan4958(a)hotmail.com> Date: Sat Feb 11 09:06:03 2017 +0000 wnaspi32: Do not crash on SC_GETSET_TIMEOUTS. Signed-off-by: Thierry Vermeylen <t_chan4958(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wnaspi32/winaspi32.c | 6 ++++++ include/wnaspi32.h | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 0ce72aa..e915fbd 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -573,6 +573,12 @@ DWORD __cdecl SendASPI32Command(LPSRB lpSRB) FIXME("SC_GET_DISK_INFO always return 'int13 unassociated disk'.\n"); lpSRB->diskinfo.SRB_DriveFlags = 0; /* disk is not int13 served */ return SS_COMP; + case SC_GETSET_TIMEOUTS: { + PSRB_GetSetTimeouts psrb_gst = (PSRB_GetSetTimeouts)lpSRB; + FIXME("SC_GETSET_TIMEOUTS doesn't actually change the timeout value nor does it return the current value.\n"); + psrb_gst->SRB_Status = SS_COMP; /* synchronous call, should be the same as the return value of SendASPI32Command */ + return SS_COMP; + } default: FIXME("Unknown command %d\n", lpSRB->common.SRB_Cmd); } diff --git a/include/wnaspi32.h b/include/wnaspi32.h index 9051f00..5b0f808 100644 --- a/include/wnaspi32.h +++ b/include/wnaspi32.h @@ -200,6 +200,17 @@ typedef struct tagSRB32_GetDiskInfo { BYTE SRB_Rsvd1[10]; /* 0E Reserved */ } SRB_GetDiskInfo, *PSRB_GetDiskInfo; +typedef struct tagSRB32_GetSetTimeouts { + BYTE SRB_Cmd; /* 00 ASPI cmd code = SC_GETSET_TIMEOUTS */ + BYTE SRB_Status; /* 01 ASPI command status byte */ + BYTE SRB_HaId; /* 02 ASPI host adapter number */ + BYTE SRB_Flags; /* 03 Reserved */ + DWORD SRB_Hdr_Rsvd; /* 04 Reserved */ + BYTE SRB_Target; /* 08 Target's SCSI ID */ + BYTE SRB_Lun; /* 09 Target's LUN number */ + DWORD SRB_Timeout; /* 10 Target's Timeout value */ +} SRB_GetSetTimeouts, *PSRB_GetSetTimeouts; + /* SRB header */ typedef struct tagSRB32_Header { BYTE SRB_Cmd; /* 00 ASPI cmd code = SC_RESET_DEV */

1 0

Carlo Bramini : winmm: RegQueryValueExW wants the size in bytes, not the size in characters.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 1cc27eba14375564228d2d9db8fdd1073997928e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc27eba14375564228d2d9db… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Feb 12 14:00:47 2017 +0100 winmm: RegQueryValueExW wants the size in bytes, not the size in characters. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/playsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 5d9aed0..6525db5 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -140,7 +140,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) if (err != 0) goto none; } - count = sizeof(str)/sizeof(str[0]); + count = sizeof(str); err = RegQueryValueExW(hSnd, NULL, 0, &type, (LPBYTE)str, &count); RegCloseKey(hSnd); if (err != 0 || !*str) goto none;

1 0

Józef Kucia : d3d11/tests: Mark some tests as broken on Nvidia drivers.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: e262c4031bb32d2aee82ca35b7dbb3fea1715b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e262c4031bb32d2aee82ca35b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:06 2017 +0100 d3d11/tests: Mark some tests as broken on Nvidia drivers. 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 | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index abb0c23..2ad5d11 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1022,6 +1022,17 @@ static BOOL is_amd_device(ID3D11Device *device) return adapter_desc.VendorId == 0x1002; } +static BOOL is_nvidia_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + + if (!strcmp(winetest_platform, "wine")) + return FALSE; + + get_device_adapter_desc(device, &adapter_desc); + return adapter_desc.VendorId == 0x10de; +} + static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window, const struct swapchain_desc *swapchain_desc) { DXGI_SWAP_CHAIN_DESC dxgi_desc; @@ -8496,7 +8507,9 @@ static void test_clear_render_target_view(void) D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; D3D11_TEXTURE2D_DESC texture_desc; ID3D11DeviceContext *context; + struct resource_readback rb; ID3D11Device *device; + unsigned int i, j; HRESULT hr; if (!init_test_context(&test_context, NULL)) @@ -8565,15 +8578,20 @@ static void test_clear_render_target_view(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); check_texture_color(texture, expected_color, 1); - if (!is_warp_device(device)) - { - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); - todo_wine check_texture_color(texture, expected_srgb_color, 1); - } - else + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + get_texture_readback(texture, 0, &rb); + for (i = 0; i < 4; ++i) { - win_skip("Skipping broken test on WARP.\n"); + for (j = 0; j < 4; ++j) + { + BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); + DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); + todo_wine ok(compare_color(color, expected_srgb_color, 1) + || broken(compare_color(color, expected_color, 1) && broken_device), + "Got unexpected color 0x%08x.\n", color); + } } + release_resource_readback(&rb); ID3D11RenderTargetView_Release(srgb_rtv); ID3D11RenderTargetView_Release(rtv); @@ -11052,6 +11070,7 @@ static void test_index_buffer_offset(void) { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, }; + static const struct vec4 broken_result = {0.0f, 0.0f, 0.0f, 1.0f}; if (!init_test_context(&test_context, &feature_level)) return; @@ -11102,7 +11121,8 @@ static void test_index_buffer_offset(void) for (i = 0; i < sizeof(expected_data) / sizeof(*expected_data); ++i) { data = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(data, &expected_data[i], 0), + ok(compare_vec4(data, &expected_data[i], 0) + || broken(is_nvidia_device(device) && !(i % 2) && compare_vec4(data, &broken_result, 0)), "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, i); }

1 0

Józef Kucia : wined3d: Honor buffer ranges for shader resource views.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 987096e0e1c9732768a765a122b3dc05f8514bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987096e0e1c9732768a765a12… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:07 2017 +0100 wined3d: Honor buffer ranges for shader resource 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/directx.c | 11 +++++++++++ dlls/wined3d/view.c | 45 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9285fee..0f44e09 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -158,6 +158,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, {"GL_ARB_texture_buffer_object", ARB_TEXTURE_BUFFER_OBJECT }, + {"GL_ARB_texture_buffer_range", ARB_TEXTURE_BUFFER_RANGE }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, @@ -2795,6 +2796,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glWaitSync) /* GL_ARB_texture_buffer_object */ USE_GL_FUNC(glTexBufferARB) + /* GL_ARB_texture_buffer_range */ + USE_GL_FUNC(glTexBufferRange) /* GL_ARB_texture_compression */ USE_GL_FUNC(glCompressedTexImage2DARB) USE_GL_FUNC(glCompressedTexImage3DARB) @@ -3351,6 +3354,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; gl_info->limits.vertex_attribs = 16; + gl_info->limits.texture_buffer_offset_alignment = 1; gl_info->limits.glsl_vs_float_constants = 0; gl_info->limits.glsl_ps_float_constants = 0; gl_info->limits.arb_vs_float_constants = 0; @@ -3576,6 +3580,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_UNIFORM_BUFFER_BINDINGS, &gl_max); TRACE("Max uniform buffer bindings: %d.\n", gl_max); } + if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT, &gl_max); + gl_info->limits.texture_buffer_offset_alignment = gl_max; + TRACE("Minimum required texture buffer offset alignment %d.\n", gl_max); + } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) gl_info->gl_ops.gl.p_glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); @@ -3693,6 +3703,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, + {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c3e6d49..c1a92be 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -130,7 +130,8 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target } static void create_buffer_texture(struct wined3d_gl_view *view, - struct wined3d_buffer *buffer, const struct wined3d_format *view_format) + struct wined3d_buffer *buffer, const struct wined3d_format *view_format, + unsigned int offset, unsigned int size) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -144,13 +145,31 @@ static void create_buffer_texture(struct wined3d_gl_view *view, return; } + if ((offset & (gl_info->limits.texture_buffer_offset_alignment - 1))) + { + FIXME("Buffer offset %u is not %u byte aligned.\n", + offset, gl_info->limits.texture_buffer_offset_alignment); + context_release(context); + return; + } + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); view->target = GL_TEXTURE_BUFFER; gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); context_bind_texture(context, GL_TEXTURE_BUFFER, view->name); - GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object)); + if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) + { + GL_EXTCALL(glTexBufferRange(GL_TEXTURE_BUFFER, view_format->glInternal, + buffer->buffer_object, offset, size)); + } + else + { + if (!offset || size != buffer->resource.size) + FIXME("OpenGL implementation does not support ARB_texture_buffer_range.\n"); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object)); + } checkGLcall("Create buffer texture"); context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); @@ -464,14 +483,20 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ } else { - /* FIXME: Support for buffer offsets can be implemented using ARB_texture_buffer_range. */ - if (desc->u.buffer.start_idx - || desc->u.buffer.count * view_format->byte_count != buffer->resource.size) - { - FIXME("Ignoring buffer range %u-%u.\n", desc->u.buffer.start_idx, desc->u.buffer.count); - } - - create_buffer_texture(&view->gl_view, buffer, view_format); + unsigned int offset, size; + + if (desc->u.buffer.start_idx > ~0u / view_format->byte_count + || desc->u.buffer.count > ~0u / view_format->byte_count) + return E_INVALIDARG; + + offset = desc->u.buffer.start_idx * view_format->byte_count; + size = desc->u.buffer.count * view_format->byte_count; + + if (offset >= buffer->resource.size + || size > buffer->resource.size - offset) + return E_INVALIDARG; + + create_buffer_texture(&view->gl_view, buffer, view_format, offset, size); } } else diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 72d617e..e500df6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -91,6 +91,7 @@ enum wined3d_gl_extension ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_BUFFER_OBJECT, + ARB_TEXTURE_BUFFER_RANGE, ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_BPTC, ARB_TEXTURE_COMPRESSION_RGTC, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6252a2..61954ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2208,6 +2208,8 @@ struct wined3d_gl_limits UINT samples; UINT vertex_attribs; + unsigned int texture_buffer_offset_alignment; + UINT glsl_varyings; UINT glsl_vs_float_constants; UINT glsl_ps_float_constants;

1 0

Józef Kucia : d3d11/tests: Add tests for buffer ranges.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: c9630d7433a88f011437043c9c399c1f7751be29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9630d7433a88f011437043c9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:08 2017 +0100 d3d11/tests: Add tests for buffer ranges. 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 | 98 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 77 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2ad5d11..ff983b2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -13773,7 +13773,8 @@ static void test_buffer_srv(void) { struct buffer { - UINT byte_count; + unsigned int byte_count; + unsigned int data_offset; const void *data; }; @@ -13784,13 +13785,13 @@ static void test_buffer_srv(void) ID3D11ShaderResourceView *srv; D3D11_BUFFER_DESC buffer_desc; ID3D11DeviceContext *context; + DWORD color, expected_color; struct resource_readback rb; ID3D11Buffer *cb, *buffer; ID3D11PixelShader *ps; ID3D11Device *device; unsigned int i, x, y; struct vec4 cb_size; - DWORD color; HRESULT hr; static const DWORD ps_float4_code[] = @@ -13836,8 +13837,30 @@ static void test_buffer_srv(void) 0xffffffff, 0xff0000ff, 0xff000000, 0xff00ff00, }; - static const struct buffer rgba16_buffer = {sizeof(rgba16), &rgba16}; - static const struct buffer rgba4_buffer = {sizeof(rgba4), &rgba4}; + static const BYTE r4[] = + { + 0xde, 0xad, + 0xba, 0xbe, + }; + static const struct buffer rgba16_buffer = {sizeof(rgba16), 0, &rgba16}; + static const struct buffer rgba16_offset_buffer = {256 + sizeof(rgba16), 256, &rgba16}; + static const struct buffer rgba4_buffer = {sizeof(rgba4), 0, &rgba4}; + static const struct buffer r4_buffer = {sizeof(r4), 0, &r4}; + static const struct buffer r4_offset_buffer = {256 + sizeof(r4), 256, &r4}; + static const DWORD rgba16_colors2x2[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ffff, 0xff00ffff, + 0xff0000ff, 0xff0000ff, 0xff00ffff, 0xff00ffff, + 0xff00ff00, 0xff00ff00, 0xffffff00, 0xffffff00, + 0xff00ff00, 0xff00ff00, 0xffffff00, 0xffffff00, + }; + static const DWORD rgba16_colors1x1[] = + { + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + }; static const DWORD rgba4_colors[] = { 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, @@ -13845,6 +13868,13 @@ static void test_buffer_srv(void) 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, }; + static const DWORD r4_colors[] = + { + 0xff0000de, 0xff0000de, 0xff0000ad, 0xff0000ad, + 0xff0000de, 0xff0000de, 0xff0000ad, 0xff0000ad, + 0xff0000ba, 0xff0000ba, 0xff0000be, 0xff0000be, + 0xff0000ba, 0xff0000ba, 0xff0000be, 0xff0000be, + }; static const DWORD zero_colors[16] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; @@ -13859,9 +13889,14 @@ static void test_buffer_srv(void) } tests[] = { - {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, {4.0f, 4.0f}, rgba16}, - {&rgba4_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba4_colors}, - {NULL, 0, 0, 0, {2.0f, 2.0f}, zero_colors}, + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, {4.0f, 4.0f}, rgba16}, + {&rgba16_offset_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 64, 16, {4.0f, 4.0f}, rgba16}, + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba16_colors2x2}, + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 1, {1.0f, 1.0f}, rgba16_colors1x1}, + {&rgba4_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba4_colors}, + {&r4_buffer, DXGI_FORMAT_R8_UNORM, 0, 4, {2.0f, 2.0f}, r4_colors}, + {&r4_offset_buffer, DXGI_FORMAT_R8_UNORM, 256, 4, {2.0f, 2.0f}, r4_colors}, + {NULL, 0, 0, 0, {2.0f, 2.0f}, zero_colors}, }; if (!init_test_context(&test_context, NULL)) @@ -13889,12 +13924,12 @@ static void test_buffer_srv(void) { if (buffer) ID3D11Buffer_Release(buffer); - if (srv) - ID3D11ShaderResourceView_Release(srv); current_buffer = test->buffer; if (current_buffer) { + BYTE *data = NULL; + buffer_desc.ByteWidth = current_buffer->byte_count; buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; @@ -13903,25 +13938,44 @@ static void test_buffer_srv(void) buffer_desc.StructureByteStride = 0; resource_data.SysMemPitch = 0; resource_data.SysMemSlicePitch = 0; - resource_data.pSysMem = current_buffer->data; + if (current_buffer->data_offset) + { + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, current_buffer->byte_count); + ok(!!data, "Failed to allocate memory.\n"); + memcpy(data + current_buffer->data_offset, current_buffer->data, + current_buffer->byte_count - current_buffer->data_offset); + resource_data.pSysMem = data; + } + else + { + resource_data.pSysMem = current_buffer->data; + } hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#x.\n", i, hr); - - srv_desc.Format = test->srv_format; - srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.FirstElement = test->srv_first_element; - U(srv_desc).Buffer.NumElements = test->srv_element_count; - hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); - ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + HeapFree(GetProcessHeap(), 0, data); } else { buffer = NULL; - srv = NULL; } + } - ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + if (srv) + ID3D11ShaderResourceView_Release(srv); + if (current_buffer) + { + srv_desc.Format = test->srv_format; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.FirstElement = test->srv_first_element; + U(srv_desc).Buffer.NumElements = test->srv_element_count; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + srv = NULL; } + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); cb_size.x = test->size.x; cb_size.y = test->size.y; @@ -13936,8 +13990,10 @@ static void test_buffer_srv(void) for (x = 0; x < 4; ++x) { color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); - ok(compare_color(color, test->expected_colors[y * 4 + x], 1), - "Test %u: Got unexpected color 0x%08x at (%u, %u).\n", i, color, x, y); + expected_color = test->expected_colors[y * 4 + x]; + ok(compare_color(color, expected_color, 1), + "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", + i, color, expected_color, x, y); } } release_resource_readback(&rb);

1 0

Józef Kucia : wined3d: Handle declarations for raw UAVs.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 10f0e7058525dc70966ab0e3a2d772b67410dea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f0e7058525dc70966ab0e3a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:09 2017 +0100 wined3d: Handle declarations for raw UAVs. 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 | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c16463b..9e752e3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9219,7 +9219,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, - /* WINED3DSIH_DCL_UAV_RAW */ NULL, + /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index dcf77e9..dbf0430 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1045,6 +1045,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st ins.handler_idx, shader_version.type); } } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_RAW) + { + unsigned int reg_idx = ins.declaration.dst.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV resource index %u.\n", reg_idx); + break; + } + 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 = WINED3D_VIEW_BUFFER_RAW; + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61954ab..23a8559 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -824,6 +824,7 @@ struct wined3d_shader_resource_info { enum wined3d_shader_resource_type type; enum wined3d_data_type data_type; + unsigned int flags; }; #define WINED3D_SAMPLER_DEFAULT ~0x0u

1 0

Józef Kucia : wined3d: Add support for buffer UAVs.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 167d4acfd21eca280f99a491ad20706908ef9a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167d4acfd21eca280f99a491a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:10 2017 +0100 wined3d: Add support for buffer UAVs. 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/context.c | 26 +++++++++++++------ dlls/wined3d/view.c | 69 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 59a1367..1d9e7ad 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3416,7 +3416,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture; + struct wined3d_texture *texture = NULL; + struct wined3d_buffer *buffer; GLuint texture_name; unsigned int i; GLint level; @@ -3440,26 +3441,35 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, if (view->resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer unordered access views not implemented.\n"); - continue; + buffer = buffer_from_resource(view->resource); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + } + else + { + texture = texture_from_resource(view->resource); + wined3d_texture_load(texture, context, FALSE); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); } context->uses_uavs = 1; - texture = texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - if (view->gl_view.name) { texture_name = view->gl_view.name; level = 0; } - else + else if (texture) { texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; level = view->level_idx; } + else + { + FIXME("Unsupported buffer unordered access view.\n"); + GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); + continue; + } GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, view->format->glInternal)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c1a92be..48db879 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -177,6 +177,39 @@ static void create_buffer_texture(struct wined3d_gl_view *view, context_release(context); } +static HRESULT create_buffer_view(struct wined3d_gl_view *view, + const struct wined3d_view_desc *desc, struct wined3d_buffer *buffer, + const struct wined3d_format *view_format) +{ + unsigned int offset, size; + + if (desc->format_id == WINED3DFMT_UNKNOWN) + { + FIXME("Structured buffer views not supported.\n"); + return WINED3D_OK; + } + + if (desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + FIXME("Raw buffer views not supported.\n"); + return WINED3D_OK; + } + + if (desc->u.buffer.start_idx > ~0u / view_format->byte_count + || desc->u.buffer.count > ~0u / view_format->byte_count) + return E_INVALIDARG; + + offset = desc->u.buffer.start_idx * view_format->byte_count; + size = desc->u.buffer.count * view_format->byte_count; + + if (offset >= buffer->resource.size + || size > buffer->resource.size - offset) + return E_INVALIDARG; + + create_buffer_texture(view, buffer, view_format, offset, size); + return WINED3D_OK; +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -472,32 +505,10 @@ 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); + HRESULT hr; - if (desc->format_id == WINED3DFMT_UNKNOWN) - { - FIXME("Structured buffer views not supported.\n"); - } - else if (desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - FIXME("Raw buffer views not supported.\n"); - } - else - { - unsigned int offset, size; - - if (desc->u.buffer.start_idx > ~0u / view_format->byte_count - || desc->u.buffer.count > ~0u / view_format->byte_count) - return E_INVALIDARG; - - offset = desc->u.buffer.start_idx * view_format->byte_count; - size = desc->u.buffer.count * view_format->byte_count; - - if (offset >= buffer->resource.size - || size > buffer->resource.size - offset) - return E_INVALIDARG; - - create_buffer_texture(&view->gl_view, buffer, view_format, offset, size); - } + if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view_format))) + return hr; } else { @@ -638,7 +649,7 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + wined3d_buffer_invalidate_location(buffer_from_resource(resource), location); return; } @@ -671,7 +682,11 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer unordered access views not supported.\n"); + struct wined3d_buffer *buffer = buffer_from_resource(resource); + HRESULT hr; + + if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view->format))) + return hr; } else {

1 0

Józef Kucia : wined3d: Implement raw buffer views.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 2066d2463462c4a7f3463aa5fda1416fab4f35b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2066d2463462c4a7f3463aa5f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:11 2017 +0100 wined3d: Implement raw 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 | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 48db879..97929cb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -189,12 +189,6 @@ static HRESULT create_buffer_view(struct wined3d_gl_view *view, return WINED3D_OK; } - if (desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - FIXME("Raw buffer views not supported.\n"); - return WINED3D_OK; - } - if (desc->u.buffer.start_idx > ~0u / view_format->byte_count || desc->u.buffer.count > ~0u / view_format->byte_count) return E_INVALIDARG; @@ -491,8 +485,18 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - if (wined3d_format_is_typeless(view_format) - && !(view_format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + if (view_format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view_format->id)); + return E_INVALIDARG; + } + + view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } + + if (wined3d_format_is_typeless(view_format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG; @@ -672,9 +676,18 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->parent_ops = parent_ops; view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + if (view->format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view->format->id)); + return E_INVALIDARG; + } + + view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } - if (wined3d_format_is_typeless(view->format) - && !(view->format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) + if (wined3d_format_is_typeless(view->format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); return E_INVALIDARG;

1 0