November 2016 - Wine-commits

Józef Kucia : d3d11: Implement UAV binding.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 35a6ca530e0fa69212b05fa3705bb539634ddced URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a6ca530e0fa69212b05fa37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:06 2016 +0100 d3d11: Implement UAV binding. 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/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 33 +++++++++++++++++++++++++++++++-- dlls/d3d11/view.c | 9 +++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 78cd265..52c43d6 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -237,6 +237,8 @@ struct d3d11_unordered_access_view HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Resource *resource, const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, struct d3d11_unordered_access_view **view) DECLSPEC_HIDDEN; +struct d3d11_unordered_access_view *unsafe_impl_from_ID3D11UnorderedAccessView( + ID3D11UnorderedAccessView *iface) DECLSPEC_HIDDEN; /* ID3D11InputLayout, ID3D10InputLayout */ struct d3d_input_layout diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f90d512..1cb033d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -634,9 +634,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord UINT unordered_access_view_start_slot, UINT unordered_access_view_count, ID3D11UnorderedAccessView *const *unordered_access_views, const UINT *initial_counts) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " "unordered_access_view_start_slot %u, unordered_access_view_count %u, unordered_access_views %p, " - "initial_counts %p partial-stub!\n", + "initial_counts %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view, unordered_access_view_start_slot, unordered_access_view_count, unordered_access_views, initial_counts); @@ -646,6 +649,32 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord d3d11_immediate_context_OMSetRenderTargets(iface, render_target_view_count, render_target_views, depth_stencil_view); } + + 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) + { + wined3d_device_set_unordered_access_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < unordered_access_view_count; ++i) + { + struct d3d11_unordered_access_view *view + = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_views[i]); + + wined3d_device_set_unordered_access_view(device->wined3d_device, + unordered_access_view_start_slot + i, + view ? view->wined3d_view : NULL); + } + for (; unordered_access_view_start_slot + i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) + { + wined3d_device_set_unordered_access_view(device->wined3d_device, i, NULL); + } + wined3d_mutex_unlock(); + } } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index d670cb2..06e3cd6 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2526,3 +2526,12 @@ HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Reso return S_OK; } + +struct d3d11_unordered_access_view *unsafe_impl_from_ID3D11UnorderedAccessView(ID3D11UnorderedAccessView *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_unordered_access_view_vtbl); + + return impl_from_ID3D11UnorderedAccessView(iface); +}

1 0

Józef Kucia : wined3d: Invalidate texture locations while binding UAVs.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 71ad7a8952370f88b434dcb4e98728175d9f4711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ad7a8952370f88b434dcb4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:07 2016 +0100 wined3d: Invalidate texture locations while binding 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 | 2 ++ dlls/wined3d/view.c | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 30 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2993e0c..e626e20 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3418,6 +3418,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, texture = texture_from_resource(view->resource); wined3d_texture_load(texture, context, FALSE); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); + gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); GL_EXTCALL(glBindImageTexture(i, gl_texture->name, view->level_idx, GL_TRUE, 0, GL_READ_WRITE, view->format->glInternal)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 59885e5..e2b52ef 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -504,6 +504,27 @@ void * CDECL wined3d_unordered_access_view_get_parent(const struct wined3d_unord return view->parent; } +void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, + DWORD location) +{ + struct wined3d_resource *resource = view->resource; + struct wined3d_texture *texture; + unsigned int sub_resource_idx; + unsigned int i; + + if (resource->type == WINED3D_RTYPE_BUFFER || resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return; + } + + texture = texture_from_resource(resource); + + sub_resource_idx = view->layer_idx * texture->level_count + view->level_idx; + for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_invalidate_location(texture, sub_resource_idx, location); +} + static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view, const struct wined3d_unordered_access_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -544,6 +565,8 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces desc->u.texture.layer_idx, desc->u.texture.layer_count); } + 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); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4a68c0e..d16d031 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3263,9 +3263,14 @@ struct wined3d_unordered_access_view const struct wined3d_format *format; + 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, + DWORD location) DECLSPEC_HIDDEN; + struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain,

1 0

Józef Kucia : wined3d: Implement SM5 atomic_iadd instruction.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 29aa581cdd2411ef82aa55a99c171b031ae69e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29aa581cdd2411ef82aa55a99… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:08 2016 +0100 wined3d: Implement SM5 atomic_iadd instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 66 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 762b8a7..bbafe69 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5202,6 +5202,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ABS */ shader_hw_map2gl, /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, + /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BFREV */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f0df045..fa233c7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2821,8 +2821,9 @@ static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param /* From a given parameter token, generate the corresponding GLSL string. * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ -static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, - const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src) +static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instruction *ins, + const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, + enum wined3d_data_type data_type) { BOOL is_color = FALSE; char swizzle_str[6]; @@ -2842,7 +2843,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i { char reg_name[200]; - switch (wined3d_src->reg.data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: sprintf(reg_name, "%s", glsl_src->reg_name); @@ -2856,7 +2857,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i sprintf(reg_name, "floatBitsToUint(%s)", glsl_src->reg_name); break; default: - FIXME("Unhandled data type %#x.\n", wined3d_src->reg.data_type); + FIXME("Unhandled data type %#x.\n", data_type); sprintf(reg_name, "%s", glsl_src->reg_name); break; } @@ -2865,6 +2866,12 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i } } +static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, + const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src) +{ + shader_glsl_add_src_param_ext(ins, wined3d_src, mask, glsl_src, wined3d_src->reg.data_type); +} + /* From a given parameter token, generate the corresponding GLSL string. * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ @@ -4720,6 +4727,56 @@ static unsigned int shader_glsl_find_sampler(const struct wined3d_shader_sampler return ~0u; } +static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) +{ + static const unsigned int image_coord_size[] = + { + 0, /* WINED3D_SHADER_RESOURCE_NONE */ + 0, /* WINED3D_SHADER_RESOURCE_BUFFER */ + 1, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + 0, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + 0, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + 0, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + }; + + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; + struct glsl_src_param image_coord_param, image_data_param; + enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type data_type; + unsigned int uav_idx; + DWORD coord_mask; + const char *op; + + switch (ins->handler_idx) + { + case WINED3DSIH_ATOMIC_IADD: op = "imageAtomicAdd"; break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } + + uav_idx = ins->dst[0].reg.idx[0].offset; + resource_type = reg_maps->uav_resource_info[uav_idx].type; + if (resource_type >= ARRAY_SIZE(image_coord_size)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + } + data_type = reg_maps->uav_resource_info[uav_idx].data_type; + coord_mask = (1u << image_coord_size[resource_type]) - 1; + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); + shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); + shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, %s);\n", + op, shader_glsl_get_prefix(version->type), uav_idx, + image_coord_param.param_str, image_data_param.param_str); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { static const unsigned int texture_size_component_count[] = @@ -8765,6 +8822,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ABS */ shader_glsl_map2gl, /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, + /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BFREV */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4201db3..ed64e89 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -43,6 +43,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ABS */ "abs", /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", + /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_BEM */ "bem", /* WINED3DSIH_BFI */ "bfi", /* WINED3DSIH_BFREV */ "bfrev", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 520e3c6..84b22c3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -243,6 +243,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, + WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, }; @@ -858,6 +859,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, + {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d16d031..8d2bb75 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -557,6 +557,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ABS, WINED3DSIH_ADD, WINED3DSIH_AND, + WINED3DSIH_ATOMIC_IADD, WINED3DSIH_BEM, WINED3DSIH_BFI, WINED3DSIH_BFREV,

1 0

Józef Kucia : wined3d: Add support for UAV reads.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 0131d4e6d1fae9eb1a7b63f2d0aabf290bdc805c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0131d4e6d1fae9eb1a7b63f2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:09 2016 +0100 wined3d: Add support for UAV reads. 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 | 14 +++++++++++--- dlls/wined3d/shader.c | 15 ++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa233c7..9a1556d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2068,7 +2068,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /* Declare images */ for (i = 0; i < ARRAY_SIZE(reg_maps->uav_resource_info); ++i) { - const char *image_type_prefix, *image_type; + const char *image_type_prefix, *image_type, *read_format; if (!reg_maps->uav_resource_info[i].type) continue; @@ -2079,18 +2079,22 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont case WINED3D_DATA_UNORM: case WINED3D_DATA_SNORM: image_type_prefix = ""; + read_format = "r32f"; break; case WINED3D_DATA_INT: image_type_prefix = "i"; + read_format = "r32i"; break; case WINED3D_DATA_UINT: image_type_prefix = "u"; + read_format = "r32ui"; break; default: image_type_prefix = ""; + read_format = ""; ERR("Unhandled resource data type %#x.\n", reg_maps->uav_resource_info[i].data_type); break; } @@ -2111,8 +2115,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont break; } - shader_addline(buffer, "writeonly uniform %s%s %s_image%u;\n", - image_type_prefix, image_type, prefix, i); + if (reg_maps->uav_read_mask & (1u << i)) + shader_addline(buffer, "layout(%s) uniform %s%s %s_image%u;\n", + read_format, image_type_prefix, image_type, prefix, i); + else + shader_addline(buffer, "writeonly uniform %s%s %s_image%u;\n", + image_type_prefix, image_type, prefix, i); } /* Declare uniforms for NP2 texcoord fixup: diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ed64e89..e1c097a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1228,7 +1228,20 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_NRM) reg_maps->usesnrm = 1; + if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) + { + unsigned int reg_idx = ins.dst[0].reg.idx[0].offset; + if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) + { + ERR("Invalid UAV index %u.\n", reg_idx); + break; + } + reg_maps->uav_read_mask |= (1u << reg_idx); + } + else if (ins.handler_idx == WINED3DSIH_NRM) + { + reg_maps->usesnrm = 1; + } else if (ins.handler_idx == WINED3DSIH_DSY || ins.handler_idx == WINED3DSIH_DSY_COARSE || ins.handler_idx == WINED3DSIH_DSY_FINE) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8d2bb75..4fe6dff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -839,6 +839,7 @@ struct wined3d_shader_reg_maps BYTE bumpmat; /* MAX_TEXTURES, 8 */ BYTE luminanceparams; /* MAX_TEXTURES, 8 */ struct wined3d_shader_resource_info uav_resource_info[MAX_UNORDERED_ACCESS_VIEWS]; + DWORD uav_read_mask; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ WORD usesnrm : 1; WORD vpos : 1;

1 0

Józef Kucia : wined3d: Synchronize shader memory accesses after each draw call.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: d368779b9ac90494888f4f4d9af0b6f90f150aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d368779b9ac90494888f4f4d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:10 2016 +0100 wined3d: Synchronize shader memory accesses after each draw call. 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 | 4 ++++ dlls/wined3d/drawprim.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e626e20..989daf2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3396,6 +3396,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, struct gl_texture *gl_texture; unsigned int i; + context->uses_uavs = 0; + if (!(shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) return; @@ -3416,6 +3418,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; } + 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); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 36c8d98..ebccb1d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -578,6 +578,12 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s draw_primitive_arrays(context, state, idx_data, idx_size, base_vertex_idx, start_idx, index_count, start_instance, instance_count); + if (context->uses_uavs) + { + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); + checkGLcall("glMemoryBarrier"); + } + if (ib_query) wined3d_event_query_issue(ib_query, device); for (i = 0; i < context->num_buffer_queries; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4fe6dff..ace0a55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1505,8 +1505,9 @@ struct wined3d_context DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ DWORD update_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; + DWORD uses_uavs : 1; DWORD destroy_delayed : 1; - DWORD padding : 12; + DWORD padding : 11; DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask;

1 0

Józef Kucia : d3d11/tests: Add test for 2D texture UAV in pixel shader.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 7cd0262c50f10cbb2f67a4c48b353e2ac7039fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd0262c50f10cbb2f67a4c48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:11 2016 +0100 d3d11/tests: Add test for 2D texture UAV in pixel shader. 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 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6640db0..496b715 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8350,6 +8350,90 @@ static void test_draw_depth_only(void) release_test_context(&test_context); } +static void test_draw_uav_only(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11UnorderedAccessView *uav; + ID3D11DeviceContext *context; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + RWTexture2D<int> u; + + void main() + { + InterlockedAdd(u[uint2(0, 0)], 1); + } +#endif + 0x43425844, 0x237a8398, 0xe7b34c17, 0xa28c91a4, 0xb3614d73, 0x00000001, 0x0000009c, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000048, 0x00000050, 0x00000012, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00003333, 0x0a0000ad, 0x0011e000, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004001, 0x00000001, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const UINT values[4] = {0}; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_SINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &test_context.backbuffer_rtv, NULL, + 0, 1, &uav, NULL); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, values); + memset(&vp, 0, sizeof(vp)); + vp.Width = 1.0f; + vp.Height = 100.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, values); + draw_quad(&test_context); + check_texture_color(texture, 100, 1); + + draw_quad(&test_context); + draw_quad(&test_context); + draw_quad(&test_context); + draw_quad(&test_context); + check_texture_color(texture, 500, 1); + + ID3D11PixelShader_Release(ps); + ID3D11Texture2D_Release(texture); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + static void test_cb_relative_addressing(void) { struct d3d11_test_context test_context; @@ -11114,6 +11198,7 @@ START_TEST(d3d11) test_clear_render_target_view(); test_clear_depth_stencil_view(); test_draw_depth_only(); + test_draw_uav_only(); test_cb_relative_addressing(); test_getdc(); test_shader_stage_input_output_matching();

1 0

Józef Kucia : wined3d: Extract resource type info to shared table.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 4b8bcdf8f63183ec509783ed3a64cfe2a7dfa678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8bcdf8f63183ec509783ed3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 23 14:36:12 2016 +0100 wined3d: Extract resource type info to shared table. 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 | 80 ++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a1556d..74a6060 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -50,6 +50,26 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_LOAD 0x08 #define WINED3D_GLSL_SAMPLE_OFFSET 0x10 +static const struct +{ + unsigned int coord_size; + unsigned int resinfo_size; + const char *type_part; +} +resource_type_info[] = +{ + {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ + {1, 1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + {2, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + {3, 3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + {3, 2, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + {2, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + {3, 3, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + {3, 3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ +}; + struct glsl_dst_param { char reg_name[150]; @@ -2994,24 +3014,6 @@ static BOOL shader_glsl_has_core_grad(const struct wined3d_gl_info *gl_info, static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD resource_idx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { - static const struct - { - unsigned int coord_size; - const char *type_part; - } - resource_types[] = - { - {0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ - {1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - {2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - {3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - {3, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - {3, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ - }; enum wined3d_shader_resource_type resource_type = ctx->reg_maps->resource_info[resource_idx].type; struct shader_glsl_ctx_priv *priv = ctx->backend_data; const struct wined3d_gl_info *gl_info = ctx->gl_info; @@ -3029,7 +3031,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; - if (resource_type >= ARRAY_SIZE(resource_types)) + if (resource_type >= ARRAY_SIZE(resource_type_info)) { ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; @@ -3046,7 +3048,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) base = "shadow"; - type_part = resource_types[resource_type].type_part; + type_part = resource_type_info[resource_type].type_part; if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) type_part = "2DRect"; if (!type_part[0]) @@ -3075,7 +3077,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context string_buffer_sprintf(sample_function->name, "%s%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", offset ? "Offset" : "", suffix); - coord_size = resource_types[resource_type].coord_size; + coord_size = resource_type_info[resource_type].coord_size; deriv_size = coord_size; if (shadow) ++coord_size; @@ -4737,20 +4739,6 @@ static unsigned int shader_glsl_find_sampler(const struct wined3d_shader_sampler static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { - static const unsigned int image_coord_size[] = - { - 0, /* WINED3D_SHADER_RESOURCE_NONE */ - 0, /* WINED3D_SHADER_RESOURCE_BUFFER */ - 1, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - 0, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - 0, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - 0, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ - }; - const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; struct glsl_src_param image_coord_param, image_data_param; @@ -4770,13 +4758,13 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) uav_idx = ins->dst[0].reg.idx[0].offset; resource_type = reg_maps->uav_resource_info[uav_idx].type; - if (resource_type >= ARRAY_SIZE(image_coord_size)) + if (resource_type >= ARRAY_SIZE(resource_type_info)) { ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << image_coord_size[resource_type]) - 1; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); @@ -4787,20 +4775,6 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { - static const unsigned int texture_size_component_count[] = - { - 0, /* WINED3D_SHADER_RESOURCE_NONE */ - 1, /* WINED3D_SHADER_RESOURCE_BUFFER */ - 1, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ - }; - const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; enum wined3d_shader_resource_type resource_type; @@ -4825,7 +4799,7 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); - if (resource_type >= ARRAY_SIZE(texture_size_component_count)) + if (resource_type >= ARRAY_SIZE(resource_type_info)) { ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; @@ -4839,7 +4813,7 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", shader_glsl_get_prefix(version->type), sampler_bind_idx, lod_param.param_str); - for (i = 0; i < 3 - texture_size_component_count[resource_type]; ++i) + for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) shader_addline(ins->ctx->buffer, "0, "); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS])

1 0

Nikolay Sivov : d2d1: Implement retrieving dash pattern data for stroke styles.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: caac9837427959ecbb353f1992ae986258b416be URL: http://source.winehq.org/git/wine.git/?a=commit;h=caac9837427959ecbb353f199… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 24 14:29:37 2016 +0300 d2d1: Implement retrieving dash pattern data for stroke styles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 4 ++- dlls/d2d1/factory.c | 8 ++++- dlls/d2d1/stroke.c | 59 +++++++++++++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index bfe60ee..29823cc 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -224,9 +224,11 @@ struct d2d_stroke_style ID2D1Factory *factory; D2D1_STROKE_STYLE_PROPERTIES desc; + float *dashes; + UINT32 dash_count; }; -void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, +HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; struct d2d_mesh diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 6de0271..3bb240f 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -213,6 +213,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa ID2D1StrokeStyle **stroke_style) { struct d2d_stroke_style *object; + HRESULT hr; TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", iface, desc, dashes, dash_count, stroke_style); @@ -220,7 +221,12 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_stroke_style_init(object, iface, desc, dashes, dash_count); + if (FAILED(hr = d2d_stroke_style_init(object, iface, desc, dashes, dash_count))) + { + WARN("Failed to initialize stroke style, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } TRACE("Created stroke style %p.\n", object); *stroke_style = &object->ID2D1StrokeStyle_iface; diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 3b5dbfd..c5a1d50 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -67,6 +67,8 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) if (!refcount) { ID2D1Factory_Release(style->factory); + if (style->desc.dashStyle == D2D1_DASH_STYLE_CUSTOM) + HeapFree(GetProcessHeap(), 0, style->dashes); HeapFree(GetProcessHeap(), 0, style); } @@ -147,14 +149,22 @@ static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1Stro static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return 0; + return style->dash_count; } -static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface, float *dashes, UINT32 count) +static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface, float *dashes, UINT32 dash_count) { - FIXME("iface %p, dashes %p, count %u stub!\n", iface, dashes, count); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p, dashes %p, count %u.\n", iface, dashes, dash_count); + + memcpy(dashes, style->dashes, min(style->dash_count, dash_count) * sizeof(*dashes)); + if (dash_count > style->dash_count) + memset(dashes + style->dash_count, 0, (dash_count - style->dash_count) * sizeof(*dashes)); } static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl = @@ -174,13 +184,50 @@ static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl = d2d_stroke_style_GetDashes, }; -void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, +HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) { - FIXME("Ignoring stroke style properties.\n"); + static const struct + { + UINT32 dash_count; + float dashes[6]; + } + builtin_dash_styles[] = + { + /* D2D1_DASH_STYLE_SOLID */ { 0 }, + /* D2D1_DASH_STYLE_DASH */ { 2, {2.0f, 2.0f}}, + /* D2D1_DASH_STYLE_DOT */ { 2, {0.0f, 2.0f}}, + /* D2D1_DASH_STYLE_DASH_DOT */ { 4, {2.0f, 2.0f, 0.0f, 2.0f}}, + /* D2D1_DASH_STYLE_DASH_DOT_DOT */ { 6, {2.0f, 2.0f, 0.0f, 2.0f, 0.0f, 2.0f}}, + }; + + if (desc->dashStyle > D2D1_DASH_STYLE_CUSTOM) + return E_INVALIDARG; style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; style->refcount = 1; + + if (desc->dashStyle == D2D1_DASH_STYLE_CUSTOM) + { + if (!dashes || !dash_count) + return E_INVALIDARG; + + if (!(style->dashes = HeapAlloc(GetProcessHeap(), 0, dash_count * sizeof(*style->dashes)))) + return E_OUTOFMEMORY; + memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); + style->dash_count = dash_count; + } + else + { + if (dashes) + return E_INVALIDARG; + + style->dashes = (float *)builtin_dash_styles[desc->dashStyle].dashes; + style->dash_count = builtin_dash_styles[desc->dashStyle].dash_count; + } + ID2D1Factory_AddRef(style->factory = factory); style->desc = *desc; + + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 857cba2..7fcda64 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3335,6 +3335,20 @@ static void test_desktop_dpi(void) static void test_stroke_style(void) { + static const struct + { + D2D1_DASH_STYLE dash_style; + UINT32 dash_count; + float dashes[6]; + } + dash_style_tests[] = + { + {D2D1_DASH_STYLE_SOLID, 0}, + {D2D1_DASH_STYLE_DASH, 2, {2.0f, 2.0f}}, + {D2D1_DASH_STYLE_DOT, 2, {0.0f, 2.0f}}, + {D2D1_DASH_STYLE_DASH_DOT, 4, {2.0f, 2.0f, 0.0f, 2.0f}}, + {D2D1_DASH_STYLE_DASH_DOT_DOT, 6, {2.0f, 2.0f, 0.0f, 2.0f, 0.0f, 2.0f}}, + }; D2D1_STROKE_STYLE_PROPERTIES desc; ID2D1StrokeStyle *style; ID2D1Factory *factory; @@ -3344,6 +3358,8 @@ static void test_stroke_style(void) D2D1_LINE_JOIN line_join; float miter_limit, dash_offset; D2D1_DASH_STYLE dash_style; + unsigned int i; + float dashes[2]; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -3374,9 +3390,78 @@ static void test_stroke_style(void) dash_offset = ID2D1StrokeStyle_GetDashOffset(style); ok(dash_offset == -1.0f, "Unexpected dash offset %f.\n", dash_offset); + /* Custom dash pattern, no dashes data specified. */ + desc.startCap = D2D1_CAP_STYLE_SQUARE; + desc.endCap = D2D1_CAP_STYLE_ROUND; + desc.dashCap = D2D1_CAP_STYLE_TRIANGLE; + desc.lineJoin = D2D1_LINE_JOIN_BEVEL; + desc.miterLimit = 1.5f; + desc.dashStyle = D2D1_DASH_STYLE_CUSTOM; + desc.dashOffset = 0.0f; + + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style); + ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr); + + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, dashes, 0, &style); + ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr); + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, dashes, 1, &style); + ok(hr == S_OK, "Unexpected return value, %#x.\n", hr); ID2D1StrokeStyle_Release(style); + /* Builtin style, dashes are specified. */ + desc.dashStyle = D2D1_DASH_STYLE_DOT; + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, dashes, 1, &style); + ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr); + + /* Invalid style. */ + desc.dashStyle = 100; + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style); + ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr); + + /* Test returned dash pattern for builtin styles. */ + desc.startCap = D2D1_CAP_STYLE_SQUARE; + desc.endCap = D2D1_CAP_STYLE_ROUND; + desc.dashCap = D2D1_CAP_STYLE_TRIANGLE; + desc.lineJoin = D2D1_LINE_JOIN_BEVEL; + desc.miterLimit = 1.5f; + desc.dashOffset = 0.0f; + + for (i = 0; i < sizeof(dash_style_tests)/sizeof(dash_style_tests[0]); i++) + { + float dashes[10]; + UINT dash_count; + + desc.dashStyle = dash_style_tests[i].dash_style; + + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style); + ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr); + + dash_count = ID2D1StrokeStyle_GetDashesCount(style); + ok(dash_count == dash_style_tests[i].dash_count, "%u: unexpected dash count %u, expected %u.\n", + i, dash_count, dash_style_tests[i].dash_count); + ok(dash_count < sizeof(dashes)/sizeof(dashes[0]), "%u: unexpectedly large dash count %u.\n", i, dash_count); + if (dash_count == dash_style_tests[i].dash_count) + { + unsigned int j; + + ID2D1StrokeStyle_GetDashes(style, dashes, dash_count); + ok(!memcmp(dashes, dash_style_tests[i].dashes, sizeof(*dashes) * dash_count), + "%u: unexpected dash array.\n", i); + + /* Ask for more dashes than style actually has. */ + memset(dashes, 0xcc, sizeof(dashes)); + ID2D1StrokeStyle_GetDashes(style, dashes, sizeof(dashes)/sizeof(dashes[0])); + ok(!memcmp(dashes, dash_style_tests[i].dashes, sizeof(*dashes) * dash_count), + "%u: unexpected dash array.\n", i); + + for (j = dash_count; j < sizeof(dashes)/sizeof(dashes[0]); j++) + ok(dashes[j] == 0.0f, "%u: unexpected dash value at %u.\n", i, j); + } + + ID2D1StrokeStyle_Release(style); + } + /* NULL dashes array, non-zero length. */ memset(&desc, 0, sizeof(desc)); hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 1, &style);

1 0

Huw Davies : user32/tests: Mark built-in wndproc auto-detection behaviour as broken on Windows 8 and 10.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 400e0af66c9435a7f5aff15bfcd7c10ecfd2352b URL: http://source.winehq.org/git/wine.git/?a=commit;h=400e0af66c9435a7f5aff15bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 23 12:10:01 2016 +0000 user32/tests: Mark built-in wndproc auto-detection behaviour as broken on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 14f0aa3..6ab4cfe 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -685,9 +685,16 @@ static void test_builtinproc(void) cls.lpfnWndProc = pDefWindowProcW; atom = RegisterClassExA(&cls); - hwnd = CreateWindowExW(0, classW, NULL, WS_OVERLAPPEDWINDOW, + hwnd = CreateWindowExW(0, classW, unistring, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleW(NULL), 0); - ok(IsWindowUnicode(hwnd), "Windows should be Unicode\n"); + ok(IsWindowUnicode(hwnd) || + broken(!IsWindowUnicode(hwnd)) /* Windows 8 and 10 */, + "Windows should be Unicode\n"); + SendMessageW(hwnd, WM_GETTEXT, sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + if (IsWindowUnicode(hwnd)) + ok(memcmp(buf, unistring, sizeof(unistring)) == 0, "WM_GETTEXT invalid return\n"); + else + ok(memcmp(buf, unistring, sizeof(unistring)) != 0, "WM_GETTEXT invalid return\n"); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)pDefWindowProcA); ok(IsWindowUnicode(hwnd), "Windows should have remained Unicode\n"); if (GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA)

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 24 Nov '16

24 Nov '16

Module: wine Branch: master Commit: 1e78138b5896c401b209b6a9de19cb379e4da366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e78138b5896c401b209b6a9d… Author: Mingcong Bai <jeffbaichina(a)gmail.com> Date: Tue Nov 22 10:09:29 2016 -0600 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 1202 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 687 insertions(+), 515 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e78138b5896c401b209b…

1 0