February 2017 - Wine-commits

Henri Verbeet : wined3d: Send shader resource view GL initialisation through the command stream.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: a772bbdfdaec60131a2068ee6ecac205fabe8242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a772bbdfdaec60131a2068ee6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:54 2017 +0100 wined3d: Send shader resource view GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 121 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 + 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7919e2e..50e6e0a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -177,7 +177,7 @@ static void create_buffer_texture(struct wined3d_gl_view *view, context_release(context); } -static HRESULT create_buffer_view(struct wined3d_gl_view *view, +static void create_buffer_view(struct wined3d_gl_view *view, const struct wined3d_view_desc *desc, struct wined3d_buffer *buffer, const struct wined3d_format *view_format) { @@ -186,22 +186,13 @@ static HRESULT create_buffer_view(struct wined3d_gl_view *view, if (desc->format_id == WINED3DFMT_UNKNOWN) { FIXME("Structured buffer views not supported.\n"); - return WINED3D_OK; + return; } - 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) @@ -476,13 +467,61 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } +static void wined3d_shader_resource_view_cs_init(void *object) +{ + struct wined3d_shader_resource_view *view = object; + struct wined3d_resource *resource = view->resource; + const struct wined3d_format *view_format; + const struct wined3d_gl_info *gl_info; + const struct wined3d_view_desc *desc; + GLenum view_target; + + view_format = view->format; + gl_info = &resource->device->adapter->gl_info; + desc = &view->desc; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + create_buffer_view(&view->gl_view, desc, buffer, view_format); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + + view_target = get_texture_view_target(gl_info, desc, texture); + + if (resource->format->id == view_format->id && texture->target == view_target + && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count + && !is_stencil_view_format(view_format)) + { + TRACE("Creating identity shader resource view.\n"); + } + else if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) + { + FIXME("Swapchain shader resource views not supported.\n"); + } + else if (resource->format->typeless_id == view_format->typeless_id + && resource->format->gl_view_class == view_format->gl_view_class) + { + create_texture_view(&view->gl_view, view_target, desc, texture, view_format); + } + else + { + FIXME("Shader resource view not supported, resource format %s, view format %s.\n", + debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id)); + } + } +} + static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; - GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) @@ -502,17 +541,17 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ return E_INVALIDARG; } - view->refcount = 1; - view->parent = parent; - view->parent_ops = parent_ops; - if (resource->type == WINED3D_RTYPE_BUFFER) { 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; + if (view_format->byte_count) + { + 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) + return E_INVALIDARG; + } } else { @@ -525,32 +564,16 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_idx >= texture->layer_count || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - - view_target = get_texture_view_target(gl_info, desc, texture); - - if (resource->format->id == view_format->id && texture->target == view_target - && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count - && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count - && !is_stencil_view_format(view_format)) - { - TRACE("Creating identity shader resource view.\n"); - } - else if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) - { - FIXME("Swapchain shader resource views not supported.\n"); - } - else if (resource->format->typeless_id == view_format->typeless_id - && resource->format->gl_view_class == view_format->gl_view_class) - { - create_texture_view(&view->gl_view, view_target, desc, texture, view_format); - } - else - { - FIXME("Shader resource view not supported, resource format %s, view format %s.\n", - debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id)); - } } + + view->refcount = 1; wined3d_resource_incref(view->resource = resource); + view->parent = parent; + view->parent_ops = parent_ops; + view->format = view_format; + view->desc = *desc; + + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); return WINED3D_OK; } @@ -696,10 +719,16 @@ 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); - HRESULT hr; - if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view->format))) - return hr; + if (view->format->byte_count) + { + 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) + return E_INVALIDARG; + } + + create_buffer_view(&view->gl_view, desc, buffer, view->format); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6b42e5..512d33d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3352,6 +3352,9 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; + const struct wined3d_format *format; + struct wined3d_view_desc desc; + struct wined3d_gl_view gl_view; };

1 0

Henri Verbeet : wined3d: Send unordered access view GL initialisation through the command stream.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 392213efb26207692c46e1fbc197a045f7948fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392213efb26207692c46e1fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:55 2017 +0100 wined3d: Send unordered access view GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 53 +++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 39be229..cb1935a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3463,7 +3463,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, else if (texture) { texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; - level = view->level_idx; + level = view->desc.u.texture.level_idx; } else { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 50e6e0a..2c411ff 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -682,12 +682,45 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ texture = texture_from_resource(resource); - sub_resource_idx = view->layer_idx * texture->level_count + view->level_idx; - layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->layer_count : 1; + sub_resource_idx = view->desc.u.texture.layer_idx * texture->level_count + view->desc.u.texture.level_idx; + layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->desc.u.texture.layer_count : 1; for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_unordered_access_view_cs_init(void *object) +{ + struct wined3d_unordered_access_view *view = object; + struct wined3d_resource *resource = view->resource; + struct wined3d_view_desc *desc = &view->desc; + const struct wined3d_gl_info *gl_info; + + gl_info = &resource->device->adapter->gl_info; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + create_buffer_view(&view->gl_view, desc, buffer, view->format); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) + { + create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), + desc, texture, view->format); + } + } +} + static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -699,6 +732,8 @@ 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); + view->desc = *desc; + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) { if (view->format->id != WINED3DFMT_R32_TYPELESS) @@ -727,8 +762,6 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) return E_INVALIDARG; } - - create_buffer_view(&view->gl_view, desc, buffer, view->format); } else { @@ -746,19 +779,11 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces || !desc->u.texture.layer_count || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - - if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) - { - create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), - desc, texture, view->format); - } - - view->layer_idx = desc->u.texture.layer_idx; - view->layer_count = desc->u.texture.layer_count; - view->level_idx = desc->u.texture.level_idx; } wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 512d33d..e40e8dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3370,10 +3370,9 @@ struct wined3d_unordered_access_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; + struct wined3d_view_desc desc; + struct wined3d_gl_view gl_view; - unsigned int layer_idx; - unsigned int layer_count; - unsigned int level_idx; }; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view,

1 0

Henri Verbeet : wined3d: Send GL context destruction through the command stream.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 15bdcb407de4d205e2ad46e4270296930bda9634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bdcb407de4d205e2ad46e42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:56 2017 +0100 wined3d: Send GL context destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57bec83..3777331 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -945,9 +945,10 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } -static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) +static void wined3d_device_delete_opengl_contexts_cs(void *object) { struct wined3d_resource *resource, *cursor; + struct wined3d_device *device = object; struct wined3d_context *context; struct wined3d_shader *shader; @@ -978,6 +979,11 @@ static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) } } +static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) +{ + wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); +} + static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_context *context;

1 0

Francois Gouget : dwrite/tests: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: f9ef81b3c029696d6d621d870de1d3ce54769629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ef81b3c029696d6d621d870… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:18:46 2017 +0100 dwrite/tests: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c373d14..52c64ab 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -91,9 +91,9 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Carlo Bramini : winmm: Fix wrong return type for midiInOpen and midiOutOpen.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 23439a0ae8a12cab5e9f56a061e7f094e7903818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23439a0ae8a12cab5e9f56a06… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Feb 12 13:58:55 2017 +0100 winmm: Fix wrong return type for midiInOpen and midiOutOpen. 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/winmm.c | 8 ++++---- include/mmsystem.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f3cd5d..1412d5e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -413,12 +413,12 @@ static LPWINE_MIDI MIDI_OutAlloc(HMIDIOUT* lphMidiOut, DWORD_PTR* lpdwCallback, /************************************************************************** * midiOutOpen [WINMM.@] */ -UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HMIDIOUT hMidiOut; LPWINE_MIDI lpwm; - UINT dwRet; + MMRESULT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); @@ -699,12 +699,12 @@ UINT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSi /************************************************************************** * midiInOpen [WINMM.@] */ -UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, +MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HANDLE hMidiIn; LPWINE_MIDI lpwm; - DWORD dwRet; + MMRESULT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); diff --git a/include/mmsystem.h b/include/mmsystem.h index f53f11d..721e5e6 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -778,7 +778,7 @@ UINT WINAPI midiOutSetVolume(HMIDIOUT,DWORD); UINT WINAPI midiOutGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiOutGetErrorTextW(UINT,LPWSTR,UINT); #define midiOutGetErrorText WINELIB_NAME_AW(midiOutGetErrorText) -UINT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); UINT WINAPI midiOutClose(HMIDIOUT); UINT WINAPI midiOutPrepareHeader(HMIDIOUT,MIDIHDR*,UINT); UINT WINAPI midiOutUnprepareHeader(HMIDIOUT,MIDIHDR*,UINT); @@ -797,7 +797,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); UINT WINAPI midiInGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiInGetErrorTextW(UINT,LPWSTR,UINT); #define midiInGetErrorText WINELIB_NAME_AW(midiInGetErrorText) -UINT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); UINT WINAPI midiInClose(HMIDIIN); UINT WINAPI midiInPrepareHeader(HMIDIIN,MIDIHDR*,UINT); UINT WINAPI midiInUnprepareHeader(HMIDIIN,MIDIHDR*,UINT);

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_imax opcode.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 1a0042df77e46b89d8092b377e1c32e5bdee75d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0042df77e46b89d8092b377… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:19 2017 +0100 wined3d: Recognize SM5 imm_atomic_imax 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 7ed83f4..3e32cab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5143,6 +5143,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9900b08..ff24a92 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9344,6 +9344,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, + /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a31ff5..0a07253 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -163,6 +163,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", + /* WINED3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index dff463f..44a9da9 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -283,6 +283,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, + WINED3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, @@ -1009,6 +1010,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_IMAX, "iU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e40e8dc..9d63983 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -694,6 +694,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_IADD, + WINED3DSIH_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Francois Gouget : testbot: Add a tool to generate Winetest report test cases.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: tools Branch: master Commit: f1dd8155567175082fbc48060a2da318c16bc020 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f1dd8155567175082fbc4806… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 16 12:34:47 2017 +0100 testbot: Add a tool to generate Winetest report test cases. This generates WineTest-style report containing test cases for tools that parse and verify them such as the TestBot and test.winehq.org scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/Makefile | 28 + testbot/src/reporttest/report.template | 955 +++++++++++++++++++++++++++++++++ testbot/src/reporttest/reporttest.c | 255 +++++++++ testbot/src/reporttest/reporttest.rc | 1 + 4 files changed, 1239 insertions(+) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f1dd8155567175082fbc…

1 0

Francois Gouget : winetest: Add support for reports containing pids.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: tools Branch: master Commit: 17eb1e231e34be789d3e457f58f582ed097b38bd URL: http://source.winehq.org/git/tools.git/?a=commit;h=17eb1e231e34be789d3e457f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 16 12:35:44 2017 +0100 winetest: Add support for reports containing pids. Let dissect recognize the test result lines despite the extra pid field but do not yet put it to use. Also make the 'tests executed' regexp a bit stricter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d9404fe..a4f3f99 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -306,7 +306,7 @@ while (<IN>) { $dll = undef; mydie "too many tests skipped by user request\n" if ++$user_skips > $maxuserskips; } - } elsif (/^(.*$unit.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { + } elsif (/^((?:[0-9a-f]+:)?$unit: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; $total += $2; $todo += $3; @@ -318,7 +318,7 @@ while (<IN>) { if ($failed) { $class .= " failed"; } elsif ($todo) { $class .= " todo"; } $testbox->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_); - } elsif (/$dll:$unit done $(-?\d+)$(?:\r?$| in)/) { + } elsif (/$dll:$unit(?::[0-9a-f]+)? done $(-?\d+)$(?:\r?$| in)/) { chomp; # current test ended if ($lines==0 || $1 < 0) { $result = "failed $1 - -";

1 0

Józef Kucia : wined3d: Fix condition to determine if FIXME message should be printed.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 847ad7437a7e134535b5d3ea291fd2ecabe4fd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=847ad7437a7e134535b5d3ea2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:30 2017 +0100 wined3d: Fix condition to determine if FIXME message should be printed. Spotted by Matteo Bruni. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 85a93d0..06db44a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -166,7 +166,7 @@ static void create_buffer_texture(struct wined3d_gl_view *view, } else { - if (!offset || size != buffer->resource.size) + 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)); }

1 0

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

15 Feb '17

Module: wine Branch: master Commit: 076d6346a335ec1e19b96f6cfda31e3f0a9c4fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076d6346a335ec1e19b96f6cf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:31 2017 +0100 d3d10core/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/d3d10core/tests/device.c | 98 +++++++++++++++++++++++++++++++++---------- 1 file changed, 77 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4e19727..14634ad 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10990,7 +10990,8 @@ static void test_buffer_srv(void) { struct buffer { - UINT byte_count; + unsigned int byte_count; + unsigned int data_offset; const void *data; }; @@ -11000,13 +11001,13 @@ static void test_buffer_srv(void) const struct buffer *current_buffer; ID3D10ShaderResourceView *srv; D3D10_BUFFER_DESC buffer_desc; + DWORD color, expected_color; struct resource_readback rb; ID3D10Buffer *cb, *buffer; ID3D10PixelShader *ps; ID3D10Device *device; unsigned int i, x, y; struct vec4 cb_size; - DWORD color; HRESULT hr; static const DWORD ps_float4_code[] = @@ -11052,8 +11053,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, @@ -11061,6 +11084,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}; @@ -11075,9 +11105,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)) @@ -11104,12 +11139,12 @@ static void test_buffer_srv(void) { if (buffer) ID3D10Buffer_Release(buffer); - if (srv) - ID3D10ShaderResourceView_Release(srv); current_buffer = test->buffer; if (current_buffer) { + BYTE *data = NULL; + buffer_desc.ByteWidth = current_buffer->byte_count; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; @@ -11117,25 +11152,44 @@ static void test_buffer_srv(void) buffer_desc.MiscFlags = 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 = ID3D10Device_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 = D3D10_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.ElementOffset = test->srv_first_element; - U(srv_desc).Buffer.ElementWidth = test->srv_element_count; - hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)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; } + } - ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + if (srv) + ID3D10ShaderResourceView_Release(srv); + if (current_buffer) + { + srv_desc.Format = test->srv_format; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = test->srv_first_element; + U(srv_desc).Buffer.ElementWidth = test->srv_element_count; + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + srv = NULL; } + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); cb_size.x = test->size.x; cb_size.y = test->size.y; @@ -11150,8 +11204,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