March 2017 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Create and destroy surface DCs through the CS.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: ad46b67674b694cae8341f14fdc9253896c58783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad46b67674b694cae8341f14f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:16 2017 +0100 wined3d: Create and destroy surface DCs through the CS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 98 ---------------------------- dlls/wined3d/texture.c | 143 +++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 122 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad46b67674b694cae8341…

1 0

Henri Verbeet : wined3d: Pass a context to blit_shader.blit_surface().
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: 717225bf9bbbf19fdc101039348256352595379e URL: http://source.winehq.org/git/wine.git/?a=commit;h=717225bf9bbbf19fdc1010393… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:17 2017 +0100 wined3d: Pass a context to blit_shader.blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 10 ++-------- dlls/wined3d/surface.c | 28 +++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 66adf0f..60bfbe3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7789,22 +7789,18 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } } -static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, +static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in, - const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_context *context; RECT src_rect = *src_rect_in; RECT dst_rect = *dst_rect_in; struct wined3d_color_key alpha_test_key; - /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_texture, dst_sub_resource_idx); - /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (surface_get_sub_resource(src_surface)->locations @@ -7850,8 +7846,6 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ || (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture))) context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_texture->resource.draw_binding); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_texture->resource.draw_binding); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index aa85698..f142d91 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2780,16 +2780,15 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, return WINED3D_OK; } -static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, - struct wined3d_surface *src_surface, const RECT *src_rect, +static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, + struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, - const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + const struct wined3d_gl_info *gl_info = context->gl_info; /* Blit from offscreen surface to render target */ struct wined3d_color_key old_blt_key = src_texture->async.src_blt_color_key; @@ -2799,9 +2798,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); - context = context_acquire(device, dst_texture, dst_sub_resource_idx); - gl_info = context->gl_info; - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); @@ -2811,8 +2807,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - context_release(context); - /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); @@ -3466,10 +3460,10 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, &box, NULL, 0, &src_box, WINED3D_BLT_DEPTH_FILL, &fx, WINED3D_TEXF_POINT); } -static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, - struct wined3d_surface *src_surface, const RECT *src_rect, +static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, + struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, - const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { /* FIXME: Remove error returns from surface_blt_cpu. */ ERR("Blit method not implemented by cpu_blit.\n"); @@ -3761,8 +3755,12 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format); if (blitter) { - blitter->blit_surface(device, blit_op, filter, src_surface, - src_rect, dst_surface, dst_rect, color_key); + struct wined3d_context *context; + + context = context_acquire(device, dst_texture, dst_sub_resource_idx); + blitter->blit_surface(device, blit_op, context, src_surface, + src_rect, dst_surface, dst_rect, color_key, filter); + context_release(context); return WINED3D_OK; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b5134a..64e669b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1880,10 +1880,10 @@ struct blit_shader const RECT *rect, const struct wined3d_color *color); HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, float depth, DWORD stencil); - void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter, + void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, - const struct wined3d_color_key *color_key); + const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter); }; extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Only copy source/ destination rectangles when needed in arbfp_blit_surface().
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d5527c2d1cc08b1877a824004da22fc4326ac223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5527c2d1cc08b1877a824004… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:18 2017 +0100 wined3d: Only copy source/destination rectangles when needed in arbfp_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 60bfbe3..3f0388a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7790,16 +7790,15 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, } static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, - struct wined3d_surface *src_surface, const RECT *src_rect_in, - struct wined3d_surface *dst_surface, const RECT *dst_rect_in, + struct wined3d_surface *src_surface, const RECT *src_rect, + struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - RECT src_rect = *src_rect_in; - RECT dst_rect = *dst_rect_in; struct wined3d_color_key alpha_test_key; + RECT s, d; /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -7815,8 +7814,10 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ * rectangle instead. */ surface_load_fb_texture(src_surface, FALSE, context); - src_rect.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.top; - src_rect.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.bottom; + s = *src_rect; + s.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.top; + s.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - s.bottom; + src_rect = &s; } else wined3d_texture_load(src_texture, context, FALSE); @@ -7824,7 +7825,11 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ context_apply_blit_state(context, device); if (!wined3d_resource_is_offscreen(&dst_texture->resource)) - surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); + { + d = *dst_rect; + surface_translate_drawable_coords(dst_surface, context->win_handle, &d); + dst_rect = &d; + } if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { @@ -7837,7 +7842,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ arbfp_blit_set(device->blit_priv, context, src_surface, color_key); /* Draw a textured quad */ - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); + draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info);

1 0

Henri Verbeet : wined3d: Modify resource locations in wined3d_surface_blt( ) instead of the blitters.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d85d977a354203e93d373120578dddb5e3799cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85d977a354203e93d3731205… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:19 2017 +0100 wined3d: Modify resource locations in wined3d_surface_blt() instead of the blitters. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ---- dlls/wined3d/surface.c | 11 ++++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3f0388a..b23f2c0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7794,7 +7794,6 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_color_key alpha_test_key; @@ -7850,9 +7849,6 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ if (wined3d_settings.strict_draw_ordering || (dst_texture->swapchain && (dst_texture->swapchain->front_buffer == dst_texture))) context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_texture->resource.draw_binding); } static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f142d91..12ed35a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2785,8 +2785,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2810,9 +2808,6 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); - - wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_texture->resource.draw_binding); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_texture->resource.draw_binding); } const struct blit_shader ffp_blit = { @@ -3761,6 +3756,12 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst blitter->blit_surface(device, blit_op, context, src_surface, src_rect, dst_surface, dst_rect, color_key, filter); context_release(context); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, + dst_texture->resource.draw_binding); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, + ~dst_texture->resource.draw_binding); + return WINED3D_OK; } }

1 0

Francois Gouget : ddraw: Make ddraw_destroy_swapchain() static.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d2aa533b9c00b205c657ce5853ab932a0179a779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2aa533b9c00b205c657ce585… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 16 15:38:31 2017 +0100 ddraw: Make ddraw_destroy_swapchain() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b72ec6e..5f90a75 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -361,7 +361,7 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) return ddraw1_AddRef(&This->IDirectDraw_iface); } -void ddraw_destroy_swapchain(struct ddraw *ddraw) +static void ddraw_destroy_swapchain(struct ddraw *ddraw) { TRACE("Destroying the swapchain.\n"); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 48b6c70..7d640f7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -127,7 +127,6 @@ struct ddraw HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; void ddraw_d3dcaps1_from_7(D3DDEVICEDESC *caps1, D3DDEVICEDESC7 *caps7) DECLSPEC_HIDDEN; -void ddraw_destroy_swapchain(struct ddraw *ddraw) DECLSPEC_HIDDEN; HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) DECLSPEC_HIDDEN; void ddraw_update_lost_surfaces(struct ddraw *ddraw) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : oledb32: Support DBTYPE_NUMERIC in IDataConvert GetConversionSize.
by Alexandre Julliard 16 Mar '17

16 Mar '17

Module: wine Branch: master Commit: a744cc81df75f4123fb4a9cd8d42e0287ecbc5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a744cc81df75f4123fb4a9cd8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 16 04:53:56 2017 +0000 oledb32: Support DBTYPE_NUMERIC in IDataConvert GetConversionSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 ++ dlls/oledb32/tests/convert.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index eadac76..0d45ef0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -139,6 +139,8 @@ static int get_length(DBTYPE type) return sizeof(FILETIME); case DBTYPE_GUID: return sizeof(GUID); + case DBTYPE_NUMERIC: + return sizeof(DB_NUMERIC); case DBTYPE_BYTES: case DBTYPE_WSTR: case DBTYPE_STR: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 28f15e8..b8b3c6f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2857,6 +2857,9 @@ static void test_getconversionsize(void) ok(hr == S_OK, "got 0x%08x\n", hr); VariantClear(&var); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_NUMERIC, DBTYPE_NUMERIC, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == sizeof(DB_NUMERIC), "%ld\n", dst_len); } static void test_converttobytes(void)

1 0

Paul Gofman : d3dx9: Set dirty flag on parameter change.
by Alexandre Julliard 16 Mar '17

16 Mar '17

Module: wine Branch: master Commit: af4e4a9af5d81ac6c232e99a1be9552deb680b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4e4a9af5d81ac6c232e99a1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 14 15:46:56 2017 +0300 d3dx9: Set dirty flag on parameter change. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 5 ++++ dlls/d3dx9_36/effect.c | 61 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 9d926c7..27b91a7 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -192,6 +192,8 @@ struct d3dx_param_eval struct d3dx_const_tab shader_inputs; }; +#define PARAMETER_FLAG_DIRTY 0x1u + struct d3dx_parameter { char *name; @@ -206,6 +208,7 @@ struct d3dx_parameter UINT member_count; DWORD flags; UINT bytes; + DWORD runtime_flags; DWORD object_id; D3DXHANDLE handle; @@ -215,6 +218,8 @@ struct d3dx_parameter struct d3dx_parameter *referenced_param; struct d3dx_param_eval *param_eval; + + DWORD *dirty_flag_ptr; }; struct d3dx9_base_effect; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 42f5aea..202a9a3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1316,6 +1316,29 @@ static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_eff return NULL; } +static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data) +{ + unsigned int i; + unsigned int member_count; + + if (param_func(data, param)) + return TRUE; + + member_count = param->element_count ? param->element_count : param->member_count; + for (i = 0; i < member_count; ++i) + { + if (walk_parameter_tree(&param->members[i], param_func, data)) + return TRUE; + } + return FALSE; +} + +static void set_dirty(struct d3dx_parameter *param) +{ + *param->dirty_flag_ptr |= PARAMETER_FLAG_DIRTY; +} + static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const void *data, UINT bytes) { @@ -1364,6 +1387,7 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, case D3DXPT_FLOAT: TRACE("Copy %u bytes\n", param->bytes); memcpy(param->data, data, param->bytes); + set_dirty(param); break; default: @@ -1450,6 +1474,7 @@ static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { set_number(param->data, param->type, &b, D3DXPT_BOOL); + set_dirty(param); return D3D_OK; } @@ -1495,6 +1520,7 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1544,7 +1570,12 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN { if (param->rows == 1 && param->columns == 1) { - set_number(param->data, param->type, &n, D3DXPT_INT); + DWORD value; + + set_number(&value, param->type, &n, D3DXPT_INT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; return D3D_OK; } @@ -1564,6 +1595,7 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN { ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; } + set_dirty(param); return D3D_OK; } } @@ -1631,6 +1663,7 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, { set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1678,7 +1711,12 @@ static HRESULT d3dx9_base_effect_set_float(struct d3dx9_base_effect *base, D3DXH if (param && !param->element_count && param->rows == 1 && param->columns == 1) { - set_number((DWORD *)param->data, param->type, &f, D3DXPT_FLOAT); + DWORD value; + + set_number(&value, param->type, &f, D3DXPT_FLOAT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; return D3D_OK; } @@ -1723,6 +1761,7 @@ static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, { set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1777,6 +1816,7 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, { case D3DXPC_SCALAR: case D3DXPC_VECTOR: + set_dirty(param); if (param->type == D3DXPT_INT && param->bytes == 4) { DWORD tmp; @@ -1870,6 +1910,7 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_VECTOR: + set_dirty(param); if (param->type == D3DXPT_FLOAT) { if (param->columns == 4) @@ -1956,6 +1997,7 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, { case D3DXPC_MATRIX_ROWS: set_matrix(param, matrix); + set_dirty(param); return D3D_OK; case D3DXPC_SCALAR: @@ -2021,6 +2063,7 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix(&param->members[i], &matrix[i]); @@ -2095,6 +2138,7 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix(&param->members[i], matrix[i]); @@ -2167,6 +2211,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect * switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); set_matrix_transpose(param, matrix); return D3D_OK; @@ -2236,6 +2281,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_ef switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix_transpose(&param->members[i], &matrix[i]); @@ -2310,6 +2356,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9 switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix_transpose(&param->members[i], matrix[i]); @@ -2414,6 +2461,7 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, if (oltexture) IDirect3DBaseTexture9_Release(oltexture); *(struct IDirect3DBaseTexture9 **)param->data = texture; + set_dirty(param); return D3D_OK; } @@ -5798,6 +5846,12 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; } +static BOOL param_set_dirty_flag_ptr(void *dirty_flag_ptr, struct d3dx_parameter *param) +{ + param->dirty_flag_ptr = (DWORD *)dirty_flag_ptr; + return FALSE; +} + static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *data, UINT data_size, DWORD start) { const char *ptr = data + start; @@ -5907,6 +5961,9 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } } + for (i = 0; i < base->parameter_count; ++i) + walk_parameter_tree(&base->parameters[i], param_set_dirty_flag_ptr, + &base->parameters[i].runtime_flags); return D3D_OK; err_out:

1 0

Paul Gofman : d3dx9/tests: Extend test effect and add checks to test_effect_preshader().
by Alexandre Julliard 16 Mar '17

16 Mar '17

Module: wine Branch: master Commit: 96e0b2777ada7fc617c73a7637e0db3a8fef2930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e0b2777ada7fc617c73a763… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 14 15:46:58 2017 +0300 d3dx9/tests: Extend test effect and add checks to test_effect_preshader(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 562 ++++++++++++++++++++++++++----------------- 1 file changed, 336 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96e0b2777ada7fc617c73…

1 0

Paul Gofman : d3dx9/tests: Factor out op results test helper function from test_effect_preshader().
by Alexandre Julliard 16 Mar '17

16 Mar '17

Module: wine Branch: master Commit: eca2f87a2ed164c3e8e3e847c546953a22147adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca2f87a2ed164c3e8e3e847c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 15 23:40:07 2017 +0100 d3dx9/tests: Factor out op results test helper function from test_effect_preshader(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 137 ++++++++++++++++++++++++++----------------- 1 file changed, 84 insertions(+), 53 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 27328e4..24817dc 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3938,6 +3938,88 @@ static void test_effect_preshader_compare_shader_(unsigned int line, IDirect3DDe IDirect3DVertexShader9_Release(vshader); } +static const struct +{ + const char *comment; + BOOL todo[4]; + unsigned int result[4]; + unsigned int ulps; +} +test_effect_preshader_op_expected[] = +{ + {"1 / op", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + {"rsq", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}, 1}, + {"mul", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, + {"add", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, + {"lt", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, + {"ge", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, + {"neg", {FALSE, FALSE, FALSE, FALSE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, + {"rcp", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, + + {"frac", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, + {"min", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, + {"max", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, +#if __x86_64__ + {"sin", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, + {"cos", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, +#else + {"sin", {FALSE, FALSE, FALSE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, + {"cos", {FALSE, FALSE, FALSE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, +#endif + {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, + {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, + {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}}, + + {"dotswiz", {FALSE, FALSE, FALSE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, + {"reladdr", { TRUE, TRUE, TRUE, TRUE}, {0xc00ccccd, 0x40000000, 0x41a00000, 0x41500000}}, +}; + +enum expected_state_update +{ + EXPECTED_STATE_ZERO, + EXPECTED_STATE_UPDATED, + EXPECTED_STATE_ANYTHING +}; + +#define test_effect_preshader_op_results(a, b, c) test_effect_preshader_op_results_(__LINE__, a, b, c) +static void test_effect_preshader_op_results_(unsigned int line, IDirect3DDevice9 *device, + const enum expected_state_update *expected_state, const char *updated_param) +{ + static const D3DCOLORVALUE black = {0.0f}; + unsigned int i, j; + D3DLIGHT9 light; + const float *v; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_op_expected); ++i) + { + hr = IDirect3DDevice9_GetLight(device, i % 8, &light); + ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); + + v = i < 8 ? &light.Diffuse.r : (i < 16 ? &light.Ambient.r : &light.Specular.r); + if (!expected_state || expected_state[i] == EXPECTED_STATE_UPDATED) + { + for (j = 0; j < 4; ++j) + { + todo_wine_if(test_effect_preshader_op_expected[i].todo[j]) + ok_(__FILE__, line)(compare_float(v[j], + ((const float *)test_effect_preshader_op_expected[i].result)[j], + test_effect_preshader_op_expected[i].ulps), + "Operation %s, component %u, expected %#x, got %#x (%g).\n", + test_effect_preshader_op_expected[i].comment, j, + test_effect_preshader_op_expected[i].result[j], + ((const unsigned int *)v)[j], v[j]); + } + } + else if (expected_state[i] == EXPECTED_STATE_ZERO) + { + ok_(__FILE__, line)(!memcmp(v, &black, sizeof(black)), + "Parameter %s, test %d, operation %s, state updated unexpectedly.\n", + updated_param, i, test_effect_preshader_op_expected[i].comment); + } + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fconstsv[] = @@ -4002,46 +4084,12 @@ static void test_effect_preshader(IDirect3DDevice9 *device) { {4, 3, 2, 1} }; - static const struct - { - const char *comment; - BOOL todo[4]; - unsigned int result[4]; - unsigned int ulps; - } - test_effect_preshader_op_results[] = - { - {"1 / op", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, - {"rsq", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0x7f800000, 0x3f2c985c, 0x1f800001}, 1}, - {"mul", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0x40d33334, 0x7f800000}}, - {"add", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc0a66666, 0x7f7fffff}}, - {"lt", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0x00000000, 0x00000000}}, - {"ge", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f800000, 0x3f800000}}, - {"neg", {FALSE, FALSE, FALSE, FALSE}, {0x80000000, 0x00000000, 0x400ccccd, 0xff7fffff}}, - {"rcp", {FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbee8ba2e, 0x00200000}}, - {"frac", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x00000000, 0x3f4ccccc, 0x00000000}}, - {"min", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xc0400000, 0x40800000}}, - {"max", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x40000000, 0xc00ccccd, 0x7f7fffff}}, -#if __x86_64__ - {"sin", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0xbf0599b3}}, - {"cos", {FALSE, FALSE, FALSE, FALSE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0x3f5a5f96}}, -#else - {"sin", {FALSE, FALSE, FALSE, TRUE}, {0x00000000, 0x80000000, 0xbf4ef99e, 0x3f792dc4}}, - {"cos", {FALSE, FALSE, FALSE, TRUE}, {0x3f800000, 0x3f800000, 0xbf16a803, 0xbe6acefc}}, -#endif - {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, - {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, - {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}}, - {"dotswiz", {FALSE, FALSE, FALSE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, - {"reladdr", { TRUE, TRUE, TRUE, TRUE}, {0xc00ccccd, 0x40000000, 0x41a00000, 0x41500000}}, - }; #define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) #define TEST_EFFECT_PRES_NFLOATP ARRAY_SIZE(test_effect_preshader_fconstsp) #define TEST_EFFECT_PRES_NFLOATMAX (TEST_EFFECT_PRES_NFLOATV > TEST_EFFECT_PRES_NFLOATP ? \ TEST_EFFECT_PRES_NFLOATV : TEST_EFFECT_PRES_NFLOATP) #define TEST_EFFECT_PRES_NBOOL ARRAY_SIZE(test_effect_preshader_bconsts) #define TEST_EFFECT_PRES_NINT ARRAY_SIZE(test_effect_preshader_iconsts) -#define TEST_EFFECT_PRES_NOPTESTS ARRAY_SIZE(test_effect_preshader_op_results) static const D3DXVECTOR4 fvect1 = {28.0f, 29.0f, 30.0f, 31.0f}; static const D3DXVECTOR4 fvect2 = {0.0f, 0.0f, 1.0f, 0.0f}; @@ -4053,12 +4101,11 @@ static void test_effect_preshader(IDirect3DDevice9 *device) unsigned int npasses; DWORD value; BOOL bval; - D3DLIGHT9 light; D3DXVECTOR4 fdata[TEST_EFFECT_PRES_NFLOATMAX]; int idata[TEST_EFFECT_PRES_NINT][4]; BOOL bdata[TEST_EFFECT_PRES_NBOOL]; IDirect3DVertexShader9 *vshader; - unsigned int i, j; + unsigned int i; D3DCAPS9 caps; hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -4160,23 +4207,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ok(hr == D3D_OK && !bval, "Got result %#x, boolean register value %u.\n", hr, bval); } - for (i = 0; i < TEST_EFFECT_PRES_NOPTESTS; ++i) - { - float *v; - - hr = IDirect3DDevice9_GetLight(device, i % 8, &light); - v = i < 8 ? &light.Diffuse.r : (i < 16 ? &light.Ambient.r : &light.Specular.r); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - for (j = 0; j < 4; ++j) - { - todo_wine_if(test_effect_preshader_op_results[i].todo[j]) - ok(compare_float(v[j], ((float *)test_effect_preshader_op_results[i].result)[j], - test_effect_preshader_op_results[i].ulps), - "Operation %s, component %u, expected %#x, got %#x (%g).\n", - test_effect_preshader_op_results[i].comment, j, - test_effect_preshader_op_results[i].result[j], ((unsigned int *)v)[j], v[j]); - } - } + test_effect_preshader_op_results(device, NULL, NULL); hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MINFILTER, &value); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

André Hentschel : opencl: Fix some spec file entries.
by Alexandre Julliard 16 Mar '17

16 Mar '17

Module: wine Branch: master Commit: b0a35bbcd20a6c741fb45843dbcc51eb55d76eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a35bbcd20a6c741fb45843d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 15 23:24:52 2017 +0100 opencl: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/opencl.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opencl/opencl.spec b/dlls/opencl/opencl.spec index f2a4a70..ba8ce6e 100644 --- a/dlls/opencl/opencl.spec +++ b/dlls/opencl/opencl.spec @@ -5,8 +5,8 @@ @ stdcall clGetDeviceIDs( long long long ptr ptr ) wine_clGetDeviceIDs @ stdcall clGetDeviceInfo( long long long ptr ptr ) wine_clGetDeviceInfo -@ stdcall clCreateContext( ptr long ptr long ptr ptr ) wine_clCreateContext -@ stdcall clCreateContextFromType( ptr long long ptr ptr ) wine_clCreateContextFromType +@ stdcall clCreateContext(ptr long ptr ptr ptr ptr) wine_clCreateContext +@ stdcall clCreateContextFromType(ptr long ptr ptr ptr) wine_clCreateContextFromType @ stdcall clRetainContext( long ) wine_clRetainContext @ stdcall clReleaseContext( long ) wine_clReleaseContext @ stdcall clGetContextInfo( long long long ptr ptr ) wine_clGetContextInfo @@ -71,7 +71,7 @@ @ stdcall clEnqueueUnmapMemObject( long long ptr long ptr ptr ) wine_clEnqueueUnmapMemObject @ stdcall clEnqueueNDRangeKernel( long long long ptr ptr ptr long ptr ptr ) wine_clEnqueueNDRangeKernel @ stdcall clEnqueueTask( long long long ptr ptr ) wine_clEnqueueTask -@ stdcall clEnqueueNativeKernel( long long ptr long long ptr ptr long ptr ptr ) wine_clEnqueueNativeKernel +@ stdcall clEnqueueNativeKernel(long ptr ptr long long ptr ptr long ptr ptr) wine_clEnqueueNativeKernel @ stdcall clEnqueueMarker( long ptr ) wine_clEnqueueMarker @ stdcall clEnqueueWaitForEvents( long long ptr ) wine_clEnqueueWaitForEvents @ stdcall clEnqueueBarrier( long ) wine_clEnqueueBarrier

1 0