wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Józef Kucia : d3d11/tests: Accept additional value as expected result in test_tgsm().
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 784953a5bee0631899e76c1b512a51a868af3ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784953a5bee0631899e76c1b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:38 2017 +0100 d3d11/tests: Accept additional value as expected result in test_tgsm(). This result is not very likely but still possible. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2d9d07a..e0184a8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15309,7 +15309,7 @@ static void test_tgsm(void) data = get_readback_color(&rb, i, 0); ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); data = get_readback_color(&rb2, i, 0); - ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); + ok(data == expected || !data, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); release_resource_readback(&rb2);

1 0

Józef Kucia : d3d11: Print FIXME() about ignoring initial UAV count values only when necessary.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: b768560e498468c343e32d11b6a54414ba8c151f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b768560e498468c343e32d11b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:37 2017 +0100 d3d11: Print FIXME() about ignoring initial UAV count values only when necessary. 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/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6269c68..958dcfe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -654,9 +654,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord if (unordered_access_view_count != D3D11_KEEP_UNORDERED_ACCESS_VIEWS) { - if (initial_counts) - FIXME("Ignoring initial counts.\n"); - wined3d_mutex_lock(); for (i = 0; i < unordered_access_view_start_slot; ++i) { @@ -667,6 +664,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_views[i]); + if (initial_counts && view && view->desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER + && (view->desc.u.Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER)) + && initial_counts[i] != ~(UINT)0) + FIXME("Ignoring initial count %u for slot %u.\n", + initial_counts[i], unordered_access_view_start_slot + i); + wined3d_device_set_unordered_access_view(device->wined3d_device, unordered_access_view_start_slot + i, view ? view->wined3d_view : NULL); @@ -1226,14 +1229,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews( TRACE("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p.\n", iface, start_slot, view_count, views, initial_counts); - if (initial_counts) - FIXME("Ignoring initial counts.\n"); - wined3d_mutex_lock(); for (i = 0; i < view_count; ++i) { struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(views[i]); + if (initial_counts && view && view->desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER + && (view->desc.u.Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER)) + && initial_counts[i] != ~(UINT)0) + FIXME("Ignoring initial count %u for slot %u.\n", initial_counts[i], start_slot + i); + wined3d_device_set_cs_uav(device->wined3d_device, start_slot + i, view ? view->wined3d_view : NULL); }

1 0

Józef Kucia : wined3d: Implement SM5 bufinfo instruction.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 097e8355c6081c745bf12c26fd419a48a9a4d3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097e8355c6081c745bf12c26f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:36 2017 +0100 wined3d: Implement SM5 bufinfo 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/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/glsl_shader.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 8 ++++++ 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9f317de..2d9d07a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14079,7 +14079,7 @@ static void test_sm5_bufinfo_instruction(void) } draw_quad(&test_context); - todo_wine check_texture_uvec4(texture, &test->expected_result); + check_texture_uvec4(texture, &test->expected_result); if (srv) ID3D11ShaderResourceView_Release(srv); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e54a68..d021f01 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5389,6 +5389,70 @@ static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) FIXME("Unhandled sync flags %#x.\n", sync_flags); } +static const struct wined3d_shader_resource_info *shader_glsl_get_resource_info( + const struct wined3d_shader_instruction *ins, const struct wined3d_shader_register *reg) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + unsigned int idx = reg->idx[0].offset; + + if (reg->type == WINED3DSPR_RESOURCE) + { + if (idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", idx); + return NULL; + } + return &reg_maps->resource_info[idx]; + } + + if (reg->type == WINED3DSPR_UAV) + { + if (idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", idx); + return NULL; + } + return &reg_maps->uav_resource_info[idx]; + } + + FIXME("Unhandled register type %#x.\n", reg->type); + return NULL; +} + +static void shader_glsl_bufinfo(const struct wined3d_shader_instruction *ins) +{ + const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader_resource_info *resource_info; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + unsigned int resource_idx; + char dst_swizzle[6]; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); + + if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[0].reg))) + return; + resource_idx = ins->src[0].reg.idx[0].offset; + + shader_addline(buffer, "ivec2("); + if (ins->src[0].reg.type == WINED3DSPR_RESOURCE) + { + unsigned int bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + resource_idx, WINED3D_SAMPLER_DEFAULT); + shader_addline(buffer, "textureSize(%s_sampler%u)", prefix, bind_idx); + } + else + { + shader_addline(buffer, "imageSize(%s_image%u)", prefix, resource_idx); + } + if (resource_info->stride) + shader_addline(buffer, " / %u", resource_info->stride); + else if (resource_info->flags & WINED3D_VIEW_BUFFER_RAW) + shader_addline(buffer, " * 4"); + shader_addline(buffer, ", %u)%s);\n", resource_info->stride, dst_swizzle); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -9555,7 +9619,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, - /* WINED3DSIH_BUFINFO */ NULL, + /* WINED3DSIH_BUFINFO */ shader_glsl_bufinfo, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, /* WINED3DSIH_CASE */ shader_glsl_case, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b07131d..f867766 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1382,6 +1382,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) || (WINED3DSIH_IMM_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_IMM_ATOMIC_XOR) + || (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_UAV) || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_UAV) || (ins.handler_idx == WINED3DSIH_LD_STRUCTURED && ins.src[2].reg.type == WINED3DSPR_UAV)) @@ -1393,6 +1394,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_idx = ins.src[2].reg.idx[0].offset; else if (WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) reg_idx = ins.dst[0].reg.idx[0].offset; + else if (ins.handler_idx == WINED3DSIH_BUFINFO) + reg_idx = ins.src[0].reg.idx[0].offset; else reg_idx = ins.dst[1].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) @@ -1446,6 +1449,11 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, ins.src[2].reg.idx[0].offset, reg_maps->sampler_map.count); } + else if (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + { + shader_record_sample(reg_maps, ins.src[0].reg.idx[0].offset, + WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); + } else if (ins.handler_idx == WINED3DSIH_LD || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_RESOURCE) || (ins.handler_idx == WINED3DSIH_RESINFO && ins.src[1].reg.type == WINED3DSPR_RESOURCE))

1 0

Józef Kucia : d3d11/tests: Use 256-byte aligned offsets for bufinfo test.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 8c269e468ace29d009ec9c08b6de43e2e84aa0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c269e468ace29d009ec9c08b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:35 2017 +0100 d3d11/tests: Use 256-byte aligned offsets for bufinfo test. 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 | 64 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d9f6b6..9f317de 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -13824,6 +13824,34 @@ static void test_sm5_bufinfo_instruction(void) 0x00000000, 0x00004002, 0x00000000, 0x00000014, 0x00000000, 0x00000001, 0x0100003e, }; static const struct shader ps_uav_structured = {ps_uav_structured_code, sizeof(ps_uav_structured_code)}; + static const DWORD ps_uav_structured32_code[] = + { +#if 0 + struct s + { + uint4 u; + bool4 b; + }; + + RWStructuredBuffer<s> b; + + uint4 main(void) : SV_Target + { + uint count, stride; + b.GetDimensions(count, stride); + return uint4(count, stride, 0, 1); + } +#endif + 0x43425844, 0xdd87a805, 0x28090470, 0xe4fa7c4d, 0x57963f52, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000084, 0x00000050, 0x00000021, + 0x0100086a, 0x0400009e, 0x0011e000, 0x00000001, 0x00000020, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x87000079, 0x80010302, 0x00199983, 0x00100012, 0x00000000, 0x0011ee46, + 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, + 0x00000000, 0x00004002, 0x00000000, 0x00000020, 0x00000000, 0x00000001, 0x0100003e, + }; + static const struct shader ps_uav_structured32 = {ps_uav_structured32_code, sizeof(ps_uav_structured32_code)}; static const DWORD ps_srv_structured_code[] = { #if 0 @@ -13946,24 +13974,24 @@ static void test_sm5_bufinfo_instruction(void) { #define RAW D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS #define STRUCTURED D3D11_RESOURCE_MISC_BUFFER_STRUCTURED - {&ps_uav_raw, TRUE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, - {&ps_uav_raw, TRUE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 8, 17, { 68, 68, 68, 68}}, - {&ps_srv_raw, FALSE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, - {&ps_srv_raw, FALSE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 8, 17, { 68, 68, 68, 68}}, - {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 20, 0, 1}}, - {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 20, 0, 1}}, - {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 1, 2, { 2, 20, 0, 1}}, - {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 4, 0, 1}}, - {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 4, 0, 1}}, - {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 1, 2, { 2, 4, 0, 1}}, - {&ps_uav_typed, TRUE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_uav_typed, TRUE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 49, 1, { 1, 1, 1, 1}}, - {&ps_uav_typed, TRUE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_uav_typed, TRUE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 49, 1, { 1, 1, 1, 1}}, - {&ps_srv_typed, FALSE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_srv_typed, FALSE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 49, 1, { 1, 1, 1, 1}}, - {&ps_srv_typed, FALSE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, - {&ps_srv_typed, FALSE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 49, 1, { 1, 1, 1, 1}}, + {&ps_uav_raw, TRUE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, + {&ps_uav_raw, TRUE, 512, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 64, 64, {256, 256, 256, 256}}, + {&ps_srv_raw, FALSE, 100, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 0, 25, {100, 100, 100, 100}}, + {&ps_srv_raw, FALSE, 500, RAW, 0, DXGI_FORMAT_R32_TYPELESS, 64, 4, { 16, 16, 16, 16}}, + {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 20, 0, 1}}, + {&ps_uav_structured, TRUE, 100, STRUCTURED, 20, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 20, 0, 1}}, + {&ps_uav_structured32, TRUE, 320, STRUCTURED, 32, DXGI_FORMAT_UNKNOWN, 8, 2, { 2, 32, 0, 1}}, + {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 5, { 5, 4, 0, 1}}, + {&ps_srv_structured, FALSE, 100, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 0, 2, { 2, 4, 0, 1}}, + {&ps_srv_structured, FALSE, 400, STRUCTURED, 4, DXGI_FORMAT_UNKNOWN, 64, 2, { 2, 4, 0, 1}}, + {&ps_uav_typed, TRUE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_uav_typed, TRUE, 400, 0, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}}, + {&ps_uav_typed, TRUE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_uav_typed, TRUE, 400, 0, 0, DXGI_FORMAT_R16_FLOAT, 128, 1, { 1, 1, 1, 1}}, + {&ps_srv_typed, FALSE, 200, 0, 0, DXGI_FORMAT_R32_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_srv_typed, FALSE, 400, 0, 0, DXGI_FORMAT_R32_FLOAT, 64, 1, { 1, 1, 1, 1}}, + {&ps_srv_typed, FALSE, 100, 0, 0, DXGI_FORMAT_R16_FLOAT, 0, 50, { 50, 50, 50, 50}}, + {&ps_srv_typed, FALSE, 400, 0, 0, DXGI_FORMAT_R16_FLOAT, 128, 2, { 2, 2, 2, 2}}, #undef RAW #undef STRUCTURED };

1 0

Józef Kucia : d3d11/tests: Add test for UAV counters.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 2a810c45f5c6e182b887b5d2a03dfc027642f6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a810c45f5c6e182b887b5d2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:34 2017 +0100 d3d11/tests: Add test for UAV counters. 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 | 200 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cce46f2..9d9f6b6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18,6 +18,7 @@ */ #include <assert.h> +#include <stdlib.h> #define COBJMACROS #include "initguid.h" #include "d3d11.h" @@ -14703,6 +14704,204 @@ done: release_test_context(&test_context); } +static unsigned int read_uav_counter(ID3D11DeviceContext *context, + ID3D11Buffer *staging_buffer, ID3D11UnorderedAccessView *uav) +{ + D3D11_MAPPED_SUBRESOURCE map_desc; + unsigned int counter; + + ID3D11DeviceContext_CopyStructureCount(context, staging_buffer, 0, uav); + + if (FAILED(ID3D11DeviceContext_Map(context, (ID3D11Resource *)staging_buffer, 0, + D3D11_MAP_READ, 0, &map_desc))) + return 0xdeadbeef; + counter = *(unsigned int *)map_desc.pData; + ID3D11DeviceContext_Unmap(context, (ID3D11Resource *)staging_buffer, 0); + return counter; +} + +static int compare_id(const void *a, const void *b) +{ + return *(int *)a - *(int *)b; +} + +static void test_uav_counters(void) +{ + ID3D11Buffer *buffer, *buffer2, *staging_buffer; + ID3D11ComputeShader *cs_producer, *cs_consumer; + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + ID3D11UnorderedAccessView *uav, *uav2; + unsigned int data, id[128], i; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Device *device; + D3D11_BOX box; + HRESULT hr; + + static const DWORD cs_producer_code[] = + { +#if 0 + RWStructuredBuffer<uint> u; + + [numthreads(4, 1, 1)] + void main(uint3 dispatch_id : SV_DispatchThreadID) + { + uint counter = u.IncrementCounter(); + u[counter] = dispatch_id.x; + } +#endif + 0x43425844, 0x013163a8, 0xe7d371b8, 0x4f71e39a, 0xd479e584, 0x00000001, 0x000000c8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000074, 0x00050050, 0x0000001d, 0x0100086a, + 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x0200005f, 0x00020012, 0x02000068, 0x00000001, + 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x050000b2, 0x00100012, 0x00000000, 0x0011e000, + 0x00000000, 0x080000a8, 0x0011e012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, + 0x0002000a, 0x0100003e, + }; + static const DWORD cs_consumer_code[] = + { +#if 0 + RWStructuredBuffer<uint> u; + RWStructuredBuffer<uint> u2; + + [numthreads(4, 1, 1)] + void main() + { + uint counter = u.DecrementCounter(); + u2[counter] = u[counter]; + } +#endif + 0x43425844, 0x957ef3dd, 0x9f317559, 0x09c8f12d, 0xdbfd98c8, 0x00000001, 0x00000100, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000ac, 0x00050050, 0x0000002b, 0x0100086a, + 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x0400009e, 0x0011e000, 0x00000001, 0x00000004, + 0x02000068, 0x00000001, 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x050000b3, 0x00100012, + 0x00000000, 0x0011e000, 0x00000000, 0x8b0000a7, 0x80002302, 0x00199983, 0x00100022, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x090000a8, 0x0011e012, + 0x00000001, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 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; + + hr = ID3D11Device_CreateComputeShader(device, cs_producer_code, sizeof(cs_producer_code), NULL, &cs_producer); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + hr = ID3D11Device_CreateComputeShader(device, cs_consumer_code, sizeof(cs_consumer_code), NULL, &cs_consumer); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + + memset(&buffer_desc, 0, sizeof(buffer_desc)); + buffer_desc.ByteWidth = sizeof(unsigned int); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &staging_buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = 1024; + 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 = sizeof(unsigned int); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = buffer_desc.ByteWidth / sizeof(unsigned int); + U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_COUNTER; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer2); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer2, NULL, &uav2); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected initial value %u.\n", data); + data = 8; + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 8, "Got unexpected value %u.\n", data); + + ID3D11DeviceContext_CSSetShader(context, cs_producer, NULL, 0); + data = 0; + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 1, 1, &uav2, NULL); + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected value %u.\n", data); + + /* produce */ + ID3D11DeviceContext_Dispatch(context, 16, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 64, "Got unexpected value %u.\n", data); + get_buffer_readback(buffer, &rb); + memcpy(id, rb.map_desc.pData, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (i = 0; i < 64; ++i) + { + if (id[i] != i) + break; + } + ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + + /* consume */ + ID3D11DeviceContext_CSSetShader(context, cs_consumer, NULL, 0); + ID3D11DeviceContext_Dispatch(context, 16, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected value %u.\n", data); + get_buffer_readback(buffer2, &rb); + memcpy(id, rb.map_desc.pData, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (i = 0; i < 64; ++i) + { + if (id[i] != i) + break; + } + ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + + /* produce on CPU */ + for (i = 0; i < 8; ++i) + id[i] = 0xdeadbeef; + set_box(&box, 0, 0, 0, 8 * sizeof(*id), 1, 1); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)buffer, 0, &box, id, 0, 0); + data = 8; + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, &data); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 8, "Got unexpected value %u.\n", data); + + /* consume */ + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + todo_wine ok(data == 4, "Got unexpected value %u.\n", data); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + data = read_uav_counter(context, staging_buffer, uav); + ok(!data, "Got unexpected value %u.\n", data); + get_buffer_readback(buffer2, &rb); + for (i = 0; i < 8; ++i) + { + data = get_readback_color(&rb, i, 0); + todo_wine ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, i); + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(buffer); + ID3D11Buffer_Release(buffer2); + ID3D11Buffer_Release(staging_buffer); + ID3D11ComputeShader_Release(cs_producer); + ID3D11ComputeShader_Release(cs_consumer); + ID3D11UnorderedAccessView_Release(uav); + ID3D11UnorderedAccessView_Release(uav2); + release_test_context(&test_context); +} + static void test_compute_shader_registers(void) { struct data @@ -15213,6 +15412,7 @@ 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_uav_counters(); test_compute_shader_registers(); test_tgsm(); }

1 0

Józef Kucia : wined3d: Bind unordered access views even if they are not used by current shaders.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: a19e6265d7dcac0043a1be8b0c3c3ff2129b8061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19e6265d7dcac0043a1be8b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:33 2017 +0100 wined3d: Bind unordered access views even if they are not used by current shaders. An alternative would be to invalidate unordered access view bindings when a shader is set. 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 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c7f5c66..ef11c5c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3410,9 +3410,6 @@ static void context_load_unordered_access_resources(struct wined3d_context *cont for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - if (!(view = views[i])) continue; @@ -3447,12 +3444,10 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - if (!(view = views[i])) { - WARN("No unordered access view bound at index %u.\n", i); + if (shader->reg_maps.uav_resource_info[i].type) + WARN("No unordered access view bound at index %u.\n", i); GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); continue; }

1 0

Henri Verbeet : usp10/tests: Add shaping tests for fLogicalOrder and fRTL.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 9db12225f47e8fc9e0aabf8f4ee50e46337d358d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db12225f47e8fc9e0aabf8f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:43 2017 +0100 usp10/tests: Add shaping tests for fLogicalOrder and fRTL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 153 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 148 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9db12225f47e8fc9e0aab…

1 0

Henri Verbeet : usp10: Properly determine the glyph run direction when shaping Script_Arabic.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: f13dea5684f2fe3d93981d98a761995a44bce7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13dea5684f2fe3d93981d98a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:42 2017 +0100 usp10: Properly determine the glyph run direction when shaping Script_Arabic. In particular, if fLogicalOrder and fRTL are both set, the glyph order is swapped compared to the character order. In all other cases it's the same. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index aa98366..ce19465 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1055,15 +1055,15 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p return; } - if (!psa->fLogicalOrder && psa->fRTL) + if (psa->fLogicalOrder && psa->fRTL) { - dirR = 1; - dirL = -1; + dirR = -1; + dirL = 1; } else { - dirR = -1; - dirL = 1; + dirR = 1; + dirL = -1; } load_ot_tables(hdc, psc); @@ -2946,20 +2946,20 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI spaces = HeapAlloc(GetProcessHeap(),0,cGlyphs); memset(spaces,0,cGlyphs); - if (!psa->fLogicalOrder && psa->fRTL) - { - initGlyph = cGlyphs-1; - finaGlyph = 0; - dirR = 1; - dirL = -1; - } - else + if (psa->fLogicalOrder && psa->fRTL) { initGlyph = 0; finaGlyph = cGlyphs-1; dirR = -1; dirL = 1; } + else + { + initGlyph = cGlyphs-1; + finaGlyph = 0; + dirR = 1; + dirL = -1; + } for (i = 0; i < cGlyphs; i++) {

1 0

Henri Verbeet : usp10: Take the script direction into account when applying OpenType features.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: c94a5fd28c1a0009f4f6e968fc3bec624549e4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94a5fd28c1a0009f4f6e968f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:41 2017 +0100 usp10: Take the script direction into account when applying OpenType features. As opposed to just looking at the run direction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9e0addc..aa98366 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -751,6 +751,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch return; else { + int cluster_dir = pwLogClust[0] < pwLogClust[chars-1] ? 1 : -1; int i; int target_glyph = nextIndex - write_dir; int target_index = -1; @@ -775,7 +776,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch if (changeCount < 0) { /* merge glyphs */ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + for (i = target_index; i < chars && i >= 0; i += cluster_dir) { if (pwLogClust[i] == target_glyph) continue; @@ -794,8 +795,8 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } } - /* renumber trailing indexes*/ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + /* renumber trailing indexes */ + for (i = target_index; i < chars && i >= 0; i += cluster_dir) { if (pwLogClust[i] != target_glyph) pwLogClust[i] += changeCount; @@ -803,8 +804,8 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } else { - for(i = target_index; i < chars && i >= 0; i+=write_dir) - pwLogClust[i] += changeCount; + for (i = target_index; i < chars && i >= 0; i += cluster_dir) + pwLogClust[i] += changeCount; } } } @@ -3382,7 +3383,7 @@ static void SHAPE_ApplyOpenTypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS if (!psc->GSUB_Table) return; - if (!psa->fLogicalOrder && psa->fRTL) + if (scriptInformation[psa->eScript].a.fRTL && (!psa->fLogicalOrder || !psa->fRTL)) dirL = -1; else dirL = 1;

1 0

Henri Verbeet : usp10/tests: Add a ligature and diacritic to the syrc shaping test.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: badb0a7530c2d7c5a96eebc15b3d8dc5a0cf7f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=badb0a7530c2d7c5a96eebc15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:40 2017 +0100 usp10/tests: Add a ligature and diacritic to the syrc shaping test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b8c7b70..010e906 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1017,11 +1017,16 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: Glyph present when it should not be\n",x); } if (valid > 0) - winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || - (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), - "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + { + todo_wine_if(tags[item] == syrc_tag && !x) + winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || + (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), + "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + } else if (glyphProp[x].sva.uJustification != glyphItems[x].GlyphProp.sva.uJustification) + { winetest_trace("%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + } if (valid > 0) winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart || (props2 && glyphProp[x].sva.fClusterStart == props2[x].sva.fClusterStart), @@ -1225,12 +1230,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}}; /* Syriac */ - static const WCHAR test_syriac[] = {0x0710, 0x0710, 0x0710, 0x0728, 0x0718, 0x0723,0}; - static const shapeTest_char syriac_c[] = {{5,{0,0}},{4,{0,0}},{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const WCHAR test_syriac[] = {0x0710, 0x072c, 0x0728, 0x0742, 0x0718, 0x0723, 0x0720, 0x0710, 0}; + static const shapeTest_char syriac_c[] = {{6, {0, 0}}, {5, {0, 0}}, {4, {0, 0}}, + {4, {0, 0}}, {2, {0, 0}}, {1, {0, 0}}, {0, {0, 0}}, {0, {0, 0}}}; static const shapeTest_glyph syriac_g[] = { + {1,{{SCRIPT_JUSTIFY_ARABIC_NORMAL,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, - {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; @@ -1509,7 +1516,7 @@ static void test_ScriptShapeOpenType(HDC hdc) test_valid = find_font_for_range(hdc, "Estrangelo Edessa", 71, test_syriac[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_syriac, 6, &Control, &State, 0, 6, syriac_c, syriac_g); + test_shape_ok_valid(test_valid, hdc, test_syriac, 8, &Control, &State, 0, 7, syriac_c, syriac_g); SelectObject(hdc, hfont_orig); DeleteObject(hfont); }

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017