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

Hans Leidekker : webservices: Add support for writing attributes and text in binary mode.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: e6b9f9a63483dba5de8dc33690c0f42e9c1e903e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b9f9a63483dba5de8dc3369… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:54 2017 +0200 webservices: Add support for writing attributes and text in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 100 ++++++++++++-- dlls/webservices/writer.c | 284 +++++++++++++++++++++++++++++----------- 2 files changed, 302 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6b9f9a63483dba5de8dc…

1 0

Alistair Leslie-Hughes : wined3d: Allow passing NULL to context_reacquire( ).
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: c9ea06e7a8fef557bd781c2b56cd81a3629ec839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ea06e7a8fef557bd781c2b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 20 14:12:31 2017 +0200 wined3d: Allow passing NULL to context_reacquire(). A context associated with a query may be destroyed together with a swapchain. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 89731e5..6d09c22 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3970,7 +3970,7 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, { struct wined3d_context *current_context; - if (context->tid != GetCurrentThreadId()) + if (!context || context->tid != GetCurrentThreadId()) return NULL; current_context = context_acquire(device, context->current_rt.texture,

1 0

Sven Hesse : wined3d: Implement SM5 gather4_po_c opcode.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 4b376ba7d2748b3959b38b8c948b1c7549895930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b376ba7d2748b3959b38b8c9… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Mon May 22 19:15:02 2017 +0200 wined3d: Implement SM5 gather4_po_c opcode. A combination of gather4_c and gather4_po. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> 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 | 11 +++++++---- dlls/wined3d/shader.c | 4 +++- dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1a49aa6..c9e5880 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5128,6 +5128,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_GATHER4 */ NULL, /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GATHER4_PO */ NULL, + /* WINED3DSIH_GATHER4_PO_C */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2ace2b4..7a9007e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5877,9 +5877,11 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) } has_offset = ins->handler_idx == WINED3DSIH_GATHER4_PO + || ins->handler_idx == WINED3DSIH_GATHER4_PO_C || wined3d_shader_instruction_has_texel_offset(ins); - resource_param_idx = ins->handler_idx == WINED3DSIH_GATHER4_PO ? 2 : 1; + resource_param_idx = + (ins->handler_idx == WINED3DSIH_GATHER4_PO || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) ? 2 : 1; resource_idx = ins->src[resource_param_idx].reg.idx[0].offset; sampler_idx = ins->src[resource_param_idx + 1].reg.idx[0].offset; component_idx = shader_glsl_swizzle_get_component(ins->src[resource_param_idx + 1].swizzle, 0); @@ -5902,12 +5904,12 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); - if (ins->handler_idx == WINED3DSIH_GATHER4_C) + if (ins->handler_idx == WINED3DSIH_GATHER4_C || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) { - shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); + shader_glsl_add_src_param(ins, &ins->src[resource_param_idx + 2], WINED3DSP_WRITEMASK_0, &compare_param); shader_addline(buffer, ", %s", compare_param.param_str); } - if (ins->handler_idx == WINED3DSIH_GATHER4_PO) + if (ins->handler_idx == WINED3DSIH_GATHER4_PO || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) { shader_glsl_add_src_param(ins, &ins->src[1], (1u << offset_size) - 1, &offset_param); shader_addline(buffer, ", %s", offset_param.param_str); @@ -10681,6 +10683,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_GATHER4 */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_C */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_PO */ shader_glsl_gather4, + /* WINED3DSIH_GATHER4_PO_C */ shader_glsl_gather4, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ shader_glsl_nop, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 177ca1b..144dbff 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -148,6 +148,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_GATHER4 */ "gather4", /* WINED3DSIH_GATHER4_C */ "gather4_c", /* WINED3DSIH_GATHER4_PO */ "gather4_po", + /* WINED3DSIH_GATHER4_PO_C */ "gather4_po_c", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", @@ -1586,7 +1587,8 @@ 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_GATHER4_PO) + else if (ins.handler_idx == WINED3DSIH_GATHER4_PO + || ins.handler_idx == WINED3DSIH_GATHER4_PO_C) { shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, ins.src[3].reg.idx[0].offset, reg_maps->sampler_map.count); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 384a744..a9fedbc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -235,6 +235,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_GATHER4_PO = 0x7f, + WINED3D_SM5_OP_GATHER4_PO_C = 0x80, WINED3D_SM5_OP_RCP = 0x81, WINED3D_SM5_OP_F32TOF16 = 0x82, WINED3D_SM5_OP_F16TOF32 = 0x83, @@ -1014,6 +1015,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_GATHER4_PO, WINED3DSIH_GATHER4_PO, "f", "fiRS"}, + {WINED3D_SM5_OP_GATHER4_PO_C, WINED3DSIH_GATHER4_PO_C, "f", "fiRSf"}, {WINED3D_SM5_OP_RCP, WINED3DSIH_RCP, "f", "f"}, {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "u", "f"}, {WINED3D_SM5_OP_F16TOF32, WINED3DSIH_F16TOF32, "f", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f2916b..321f4d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -773,6 +773,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_GATHER4, WINED3DSIH_GATHER4_C, WINED3DSIH_GATHER4_PO, + WINED3DSIH_GATHER4_PO_C, WINED3DSIH_GE, WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS,

1 0

Hugh McMaster : regedit: Only show the 'New' pop-up menu when right-clicking beneath the listview item list.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: e880c9ca8c557fe9df536ae5970fe0b57a793868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e880c9ca8c557fe9df536ae59… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:21 2017 +0000 regedit: Only show the 'New' pop-up menu when right-clicking beneath the listview item list. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 258 ++++++++++++++++++++++---------------------- po/bg.po | 258 ++++++++++++++++++++++---------------------- po/ca.po | 258 ++++++++++++++++++++++---------------------- po/cs.po | 258 ++++++++++++++++++++++---------------------- po/da.po | 258 ++++++++++++++++++++++---------------------- po/de.po | 258 ++++++++++++++++++++++---------------------- po/el.po | 258 ++++++++++++++++++++++---------------------- po/en.po | 258 ++++++++++++++++++++++---------------------- po/en_US.po | 258 ++++++++++++++++++++++---------------------- po/eo.po | 258 ++++++++++++++++++++++---------------------- po/es.po | 258 ++++++++++++++++++++++---------------------- po/fa.po | 258 ++++++++++++++++++++++---------------------- po/fi.po | 258 ++++++++++++++++++++++---------------------- po/fr.po | 258 ++++++++++++++++++++++---------------------- po/he.po | 258 ++++++++++++++++++++++---------------------- po/hi.po | 258 ++++++++++++++++++++++---------------------- po/hr.po | 258 ++++++++++++++++++++++---------------------- po/hu.po | 258 ++++++++++++++++++++++---------------------- po/it.po | 258 ++++++++++++++++++++++---------------------- po/ja.po | 258 ++++++++++++++++++++++---------------------- po/ko.po | 258 ++++++++++++++++++++++---------------------- po/lt.po | 258 ++++++++++++++++++++++---------------------- po/ml.po | 258 ++++++++++++++++++++++---------------------- po/nb_NO.po | 258 ++++++++++++++++++++++---------------------- po/nl.po | 258 ++++++++++++++++++++++---------------------- po/or.po | 258 ++++++++++++++++++++++---------------------- po/pa.po | 258 ++++++++++++++++++++++---------------------- po/pl.po | 258 ++++++++++++++++++++++---------------------- po/pt_BR.po | 258 ++++++++++++++++++++++---------------------- po/pt_PT.po | 258 ++++++++++++++++++++++---------------------- po/rm.po | 258 ++++++++++++++++++++++---------------------- po/ro.po | 258 ++++++++++++++++++++++---------------------- po/ru.po | 258 ++++++++++++++++++++++---------------------- po/sk.po | 258 ++++++++++++++++++++++---------------------- po/sl.po | 258 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 258 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 258 ++++++++++++++++++++++---------------------- po/sv.po | 258 ++++++++++++++++++++++---------------------- po/te.po | 258 ++++++++++++++++++++++---------------------- po/th.po | 258 ++++++++++++++++++++++---------------------- po/tr.po | 258 ++++++++++++++++++++++---------------------- po/uk.po | 258 ++++++++++++++++++++++---------------------- po/wa.po | 258 ++++++++++++++++++++++---------------------- po/wine.pot | 258 ++++++++++++++++++++++---------------------- po/zh_CN.po | 258 ++++++++++++++++++++++---------------------- po/zh_TW.po | 258 ++++++++++++++++++++++---------------------- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 3 +- programs/regedit/regedit.rc | 14 +++ 49 files changed, 5951 insertions(+), 5936 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e880c9ca8c557fe9df536…

1 0

Vincent Povirk : gdiplus: Check SHADEBLENDCAPS only for printer devices.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: b8a8e1bde9382897927945ec0b58b8a2fcfcfe59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a8e1bde9382897927945ec0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 22 13:20:58 2017 -0500 gdiplus: Check SHADEBLENDCAPS only for printer devices. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c0d58d..815ffb0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -324,7 +324,8 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + if (GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) { TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); @@ -404,7 +405,8 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE || + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && + GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) memcpy(temp_bits, src, src_width * src_height * 4); else

1 0

Hugh McMaster : regedit: Update and sort the pop-up menus.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 7bf054f198695abb445e5d2ebd7b777d6a1bba71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf054f198695abb445e5d2eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:11 2017 +0000 regedit: Update and sort the pop-up menus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 266 ++++++++++++++++++++++---------------------- po/bg.po | 266 ++++++++++++++++++++++---------------------- po/ca.po | 266 ++++++++++++++++++++++---------------------- po/cs.po | 266 ++++++++++++++++++++++---------------------- po/da.po | 266 ++++++++++++++++++++++---------------------- po/de.po | 266 ++++++++++++++++++++++---------------------- po/el.po | 266 ++++++++++++++++++++++---------------------- po/en.po | 266 ++++++++++++++++++++++---------------------- po/en_US.po | 266 ++++++++++++++++++++++---------------------- po/eo.po | 266 ++++++++++++++++++++++---------------------- po/es.po | 266 ++++++++++++++++++++++---------------------- po/fa.po | 266 ++++++++++++++++++++++---------------------- po/fi.po | 266 ++++++++++++++++++++++---------------------- po/fr.po | 266 ++++++++++++++++++++++---------------------- po/he.po | 266 ++++++++++++++++++++++---------------------- po/hi.po | 266 ++++++++++++++++++++++---------------------- po/hr.po | 266 ++++++++++++++++++++++---------------------- po/hu.po | 266 ++++++++++++++++++++++---------------------- po/it.po | 266 ++++++++++++++++++++++---------------------- po/ja.po | 266 ++++++++++++++++++++++---------------------- po/ko.po | 266 ++++++++++++++++++++++---------------------- po/lt.po | 266 ++++++++++++++++++++++---------------------- po/ml.po | 266 ++++++++++++++++++++++---------------------- po/nb_NO.po | 266 ++++++++++++++++++++++---------------------- po/nl.po | 266 ++++++++++++++++++++++---------------------- po/or.po | 266 ++++++++++++++++++++++---------------------- po/pa.po | 266 ++++++++++++++++++++++---------------------- po/pl.po | 266 ++++++++++++++++++++++---------------------- po/pt_BR.po | 266 ++++++++++++++++++++++---------------------- po/pt_PT.po | 266 ++++++++++++++++++++++---------------------- po/rm.po | 266 ++++++++++++++++++++++---------------------- po/ro.po | 266 ++++++++++++++++++++++---------------------- po/ru.po | 266 ++++++++++++++++++++++---------------------- po/sk.po | 266 ++++++++++++++++++++++---------------------- po/sl.po | 266 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 266 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 266 ++++++++++++++++++++++---------------------- po/sv.po | 266 ++++++++++++++++++++++---------------------- po/te.po | 266 ++++++++++++++++++++++---------------------- po/th.po | 266 ++++++++++++++++++++++---------------------- po/tr.po | 266 ++++++++++++++++++++++---------------------- po/uk.po | 266 ++++++++++++++++++++++---------------------- po/wa.po | 266 ++++++++++++++++++++++---------------------- po/wine.pot | 266 ++++++++++++++++++++++---------------------- po/zh_CN.po | 266 ++++++++++++++++++++++---------------------- po/zh_TW.po | 266 ++++++++++++++++++++++---------------------- programs/regedit/childwnd.c | 2 +- programs/regedit/listview.c | 2 +- programs/regedit/main.h | 7 +- programs/regedit/regedit.rc | 22 ++-- 50 files changed, 6136 insertions(+), 6133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bf054f198695abb445e5…

1 0

Paul Gofman : d3dx9: Add 'acos' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 537390ed8df7499531181a14e690b1a9f5035176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537390ed8df7499531181a14e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:34 2017 +0300 d3dx9: Add 'acos' preshader opcode. 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/preshader.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 428215e..05618b9 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -38,6 +38,7 @@ enum pres_ops PRESHADER_OP_SIN, PRESHADER_OP_COS, PRESHADER_OP_ASIN, + PRESHADER_OP_ACOS, PRESHADER_OP_MIN, PRESHADER_OP_MAX, PRESHADER_OP_LT, @@ -127,6 +128,7 @@ static double pres_log(double *args, int n) #endif } static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} +static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -161,6 +163,7 @@ static const struct op_info pres_op_info[] = {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ + {0x10b, "acos", 1, 0, pres_acos}, /* PRESHADER_OP_ACOS */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index dc22bd7..b8c5737 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4558,6 +4558,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"asin", 0x10a00001, 1, {0xbe9c00ad, 0xffc00000, 0xffc00000, 0xffc00000}, {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"acos", 0x10b00001, 1, {0x3ff01006, 0xffc00000, 0xffc00000, 0xffc00000}, + {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Paul Gofman : d3dx9: Add 'atan' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 89043af09f88925d33df02324d89d55af0ce6094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89043af09f88925d33df02324… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:35 2017 +0300 d3dx9: Add 'atan' preshader opcode. 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/preshader.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 05618b9..72f6ff5 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -39,6 +39,7 @@ enum pres_ops PRESHADER_OP_COS, PRESHADER_OP_ASIN, PRESHADER_OP_ACOS, + PRESHADER_OP_ATAN, PRESHADER_OP_MIN, PRESHADER_OP_MAX, PRESHADER_OP_LT, @@ -129,6 +130,7 @@ static double pres_log(double *args, int n) } static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));} +static double pres_atan(double *args, int n) {return atan(args[0]);} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -164,6 +166,7 @@ static const struct op_info pres_op_info[] = {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ {0x10b, "acos", 1, 0, pres_acos}, /* PRESHADER_OP_ACOS */ + {0x10c, "atan", 1, 0, pres_atan}, /* PRESHADER_OP_ATAN */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b8c5737..ffdb1dd 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4560,6 +4560,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"acos", 0x10b00001, 1, {0x3ff01006, 0xffc00000, 0xffc00000, 0xffc00000}, {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"atan", 0x10c00001, 1, {0xbe9539d4, 0x3fa9b465, 0xbf927420, 0x3fc90fdb}, + {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Paul Gofman : d3dx9: Add 'atan2' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 2f4789895372977036af9046241514676925ccbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4789895372977036af90462… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:36 2017 +0300 d3dx9: Add 'atan2' preshader opcode. 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/preshader.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 72f6ff5..7940e2f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -46,6 +46,7 @@ enum pres_ops PRESHADER_OP_GE, PRESHADER_OP_ADD, PRESHADER_OP_MUL, + PRESHADER_OP_ATAN2, PRESHADER_OP_CMP, PRESHADER_OP_DOT, PRESHADER_OP_DOTSWIZ6, @@ -131,6 +132,7 @@ static double pres_log(double *args, int n) static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));} static double pres_atan(double *args, int n) {return atan(args[0]);} +static double pres_atan2(double *args, int n) {return atan2(args[0], args[1]);} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -173,6 +175,7 @@ static const struct op_info pres_op_info[] = {0x203, "ge", 2, 0, pres_ge }, /* PRESHADER_OP_GE */ {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ + {0x206, "atan2", 2, 0, pres_atan2}, /* PRESHADER_OP_ATAN2 */ {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ffdb1dd..0fa8821 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4562,6 +4562,10 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"atan", 0x10c00001, 1, {0xbe9539d4, 0x3fa9b465, 0xbf927420, 0x3fc90fdb}, {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"atan2 test #1", 0x20600004, 2, {0xbfc90fdb, 0x40490fdb, 0x80000000, 0x7fc00000}, + {-0.3f, 0.0f, -0.0f, NAN}, {0.0f, -0.0f, 0.0f, 1.0f}}, + {"atan2 test #2", 0x20600004, 2, {0xbfc90fdb, 0, 0xc0490fdb, 0}, + {-0.3f, 0.0f, -0.0f, -0.0f}, {-0.0f, 0.0f, -0.0f, 1.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Paul Gofman : d3dx9: Add 'div' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: cd62062673584cae4776561306705ec3e3c18464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd62062673584cae477656130… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:37 2017 +0300 d3dx9: Add 'div' preshader opcode. 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/preshader.c | 6 ++++++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 7940e2f..50ab18f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -47,6 +47,7 @@ enum pres_ops PRESHADER_OP_ADD, PRESHADER_OP_MUL, PRESHADER_OP_ATAN2, + PRESHADER_OP_DIV, PRESHADER_OP_CMP, PRESHADER_OP_DOT, PRESHADER_OP_DOTSWIZ6, @@ -134,6 +135,10 @@ static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]) static double pres_atan(double *args, int n) {return atan(args[0]);} static double pres_atan2(double *args, int n) {return atan2(args[0], args[1]);} +/* According to the test results 'div' operation always returns 0. Compiler does not seem to ever + * generate it, using rcp + mul instead, so probably it is not implemented in native d3dx. */ +static double pres_div(double *args, int n) {return 0.0;} + #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 #define PRES_SCALAR_FLAG 0x80000000 @@ -176,6 +181,7 @@ static const struct op_info pres_op_info[] = {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ {0x206, "atan2", 2, 0, pres_atan2}, /* PRESHADER_OP_ATAN2 */ + {0x208, "div", 2, 0, pres_div}, /* PRESHADER_OP_DIV */ {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0fa8821..09b786b 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4566,6 +4566,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {-0.3f, 0.0f, -0.0f, NAN}, {0.0f, -0.0f, 0.0f, 1.0f}}, {"atan2 test #2", 0x20600004, 2, {0xbfc90fdb, 0, 0xc0490fdb, 0}, {-0.3f, 0.0f, -0.0f, -0.0f}, {-0.0f, 0.0f, -0.0f, 1.0f}}, + {"div", 0x20800004, 2, {0, 0, 0, 0}, + {-0.3f, 0.0f, -2.2f, NAN}, {0.0f, -0.0f, -3.0f, 1.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0