wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : vkd3d-shader: Write SM1 semantic declarations.
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: db849f2b4507d7ef15d5d87eb4ec969034387729 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db849f2b4507d7ef15d5d87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:07 2021 -0500 vkd3d-shader: Write SM1 semantic declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d9types.h | 32 +++++++++++ libs/vkd3d-shader/hlsl_codegen.c | 114 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_d3d9types.h b/include/vkd3d_d3d9types.h index 1f88644..c204202 100644 --- a/include/vkd3d_d3d9types.h +++ b/include/vkd3d_d3d9types.h @@ -29,6 +29,10 @@ #define D3DSI_INSTLENGTH_SHIFT 24 +#define D3DSP_DCL_USAGE_SHIFT 0 +#define D3DSP_DCL_USAGEINDEX_SHIFT 16 +#define D3DSP_DSTMOD_SHIFT 20 + #define D3DSP_REGTYPE_SHIFT 28 #define D3DSP_REGTYPE_SHIFT2 8 #define D3DSP_REGTYPE_MASK (0x7 << D3DSP_REGTYPE_SHIFT) @@ -43,6 +47,24 @@ #define D3DPS_VERSION(major, minor) (0xffff0000 | ((major) << 8) | (minor)) #define D3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor)) +typedef enum _D3DDECLUSAGE +{ + D3DDECLUSAGE_POSITION = 0x0, + D3DDECLUSAGE_BLENDWEIGHT = 0x1, + D3DDECLUSAGE_BLENDINDICES = 0x2, + D3DDECLUSAGE_NORMAL = 0x3, + D3DDECLUSAGE_PSIZE = 0x4, + D3DDECLUSAGE_TEXCOORD = 0x5, + D3DDECLUSAGE_TANGENT = 0x6, + D3DDECLUSAGE_BINORMAL = 0x7, + D3DDECLUSAGE_TESSFACTOR = 0x8, + D3DDECLUSAGE_POSITIONT = 0x9, + D3DDECLUSAGE_COLOR = 0xa, + D3DDECLUSAGE_FOG = 0xb, + D3DDECLUSAGE_DEPTH = 0xc, + D3DDECLUSAGE_SAMPLE = 0xd, +} D3DDECLUSAGE; + typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { D3DSIO_NOP = 0x00, @@ -136,6 +158,16 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE D3DSIO_FORCE_DWORD = 0x7fffffff, } D3DSHADER_INSTRUCTION_OPCODE_TYPE; +typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE +{ + D3DSPDM_NONE = 0 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_SATURATE = 1 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_PARTIALPRECISION = 2 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_MSAMPCENTROID = 4 << D3DSP_DSTMOD_SHIFT, + + D3DSPDM_FORCE_DWORD = 0x7fffffff, +} D3DSHADER_PARAM_DSTMOD_TYPE; + typedef enum _D3DSHADER_PARAM_REGISTER_TYPE { D3DSPR_TEMP = 0x00, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9f2c278..d499511 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1013,6 +1013,49 @@ static bool sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_s return false; } +static bool sm1_usage_from_semantic(const struct hlsl_semantic *semantic, D3DDECLUSAGE *usage, uint32_t *usage_idx) +{ + static const struct + { + const char *name; + D3DDECLUSAGE usage; + } + semantics[] = + { + {"binormal", D3DDECLUSAGE_BINORMAL}, + {"blendindices", D3DDECLUSAGE_BLENDINDICES}, + {"blendweight", D3DDECLUSAGE_BLENDWEIGHT}, + {"color", D3DDECLUSAGE_COLOR}, + {"depth", D3DDECLUSAGE_DEPTH}, + {"fog", D3DDECLUSAGE_FOG}, + {"normal", D3DDECLUSAGE_NORMAL}, + {"position", D3DDECLUSAGE_POSITION}, + {"positiont", D3DDECLUSAGE_POSITIONT}, + {"psize", D3DDECLUSAGE_PSIZE}, + {"sample", D3DDECLUSAGE_SAMPLE}, + {"sv_depth", D3DDECLUSAGE_DEPTH}, + {"sv_position", D3DDECLUSAGE_POSITION}, + {"sv_target", D3DDECLUSAGE_COLOR}, + {"tangent", D3DDECLUSAGE_TANGENT}, + {"tessfactor", D3DDECLUSAGE_TESSFACTOR}, + {"texcoord", D3DDECLUSAGE_TEXCOORD}, + }; + + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(semantics); ++i) + { + if (!ascii_strcasecmp(semantic->name, semantics[i].name)) + { + *usage = semantics[i].usage; + *usage_idx = semantic->index; + return true; + } + } + + return false; +} + static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int *counter, bool output) { assert(var->semantic.name); @@ -1020,7 +1063,15 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version < 4) { D3DSHADER_PARAM_REGISTER_TYPE type; - unsigned int reg; + uint32_t reg, usage_idx; + D3DDECLUSAGE usage; + + if (!sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, + "Invalid semantic '%s'.", var->semantic.name); + return; + } if (!sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg)) { @@ -1371,6 +1422,12 @@ static uint32_t sm1_encode_register_type(D3DSHADER_PARAM_REGISTER_TYPE type) | ((type << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2); } +static uint32_t sm1_encode_dst(D3DSHADER_PARAM_REGISTER_TYPE type, + D3DSHADER_PARAM_DSTMOD_TYPE modifier, unsigned int writemask, unsigned int reg) +{ + return (1u << 31) | sm1_encode_register_type(type) | modifier | (writemask << 16) | reg; +} + static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) { unsigned int i, x; @@ -1393,6 +1450,60 @@ static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer } } +static void write_sm1_semantic_dcl(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, + const struct hlsl_ir_var *var, bool output) +{ + D3DSHADER_PARAM_REGISTER_TYPE type; + uint32_t token, usage_idx, reg_idx; + D3DDECLUSAGE usage; + bool ret; + + if (sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg_idx)) + { + usage = 0; + usage_idx = 0; + } + else + { + ret = sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx); + assert(ret); + type = output ? D3DSPR_OUTPUT : D3DSPR_INPUT; + reg_idx = var->reg.id; + } + + token = D3DSIO_DCL; + if (ctx->profile->major_version > 1) + token |= 2 << D3DSI_INSTLENGTH_SHIFT; + put_dword(buffer, token); + + token = (1u << 31); + token |= usage << D3DSP_DCL_USAGE_SHIFT; + token |= usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT; + put_dword(buffer, token); + put_dword(buffer, sm1_encode_dst(type, D3DSPDM_NONE, (1 << var->data_type->dimx) - 1, reg_idx)); +} + +static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) +{ + bool write_in = false, write_out = false; + struct hlsl_ir_var *var; + + if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) + write_in = true; + else if (ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX && ctx->profile->major_version == 3) + write_in = write_out = true; + else if (ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX && ctx->profile->major_version < 3) + write_in = true; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (write_in && var->is_input_semantic) + write_sm1_semantic_dcl(ctx, buffer, var, false); + if (write_out && var->is_output_semantic) + write_sm1_semantic_dcl(ctx, buffer, var, true); + } +} + static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { @@ -1404,6 +1515,7 @@ static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl * write_sm1_uniforms(ctx, &buffer, entry_func); write_sm1_constant_defs(ctx, &buffer); + write_sm1_semantic_dcls(ctx, &buffer); put_dword(&buffer, D3DSIO_END);

1 0

Zebediah Figura : tests: Add some tests for HLSL storage qualifiers.
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: 4d4aeb9bb4a77ec6ec3c1eb92680a6dfc9d30439 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4d4aeb9bb4a77ec6ec3c1eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:06 2021 -0500 tests: Add some tests for HLSL storage qualifiers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-invalid.shader_test | 60 +++++++++++++++++++++++++++++++ tests/hlsl-storage-qualifiers.shader_test | 20 +++++++++++ 3 files changed, 82 insertions(+) diff --git a/Makefile.am b/Makefile.am index 542b66e..e853786 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ + tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -261,6 +262,7 @@ XFAIL_TESTS = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ + tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 0711d26..7205598 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -121,6 +121,12 @@ float4 main(in float4 i) : sv_target return 0; } +[pixel shader fail] +float4 main(float4 i) : sv_target +{ + return 0; +} + [pixel shader fail] struct {float4 a;}; @@ -159,3 +165,57 @@ void main(out struct output o) o.t = float4(0, 0, 0, 0); o.a = 0; } + +[pixel shader fail] +uniform in float4 f; +float4 main() : sv_target { return 0; } + +[pixel shader fail] +in float4 f; +float4 main() : sv_target { return 0; } + +[pixel shader fail] +static uniform float4 f; +float4 main() : sv_target { return 0; } + +[pixel shader fail] +void main(out uniform float4 o : sv_target) +{ + o = 0; +} + +[pixel shader fail] +void sub(out uniform float4 o) +{ + o = 0; +} + +void main(out float4 o : sv_target) +{ + sub(o); +} + +[pixel shader fail] +void sub(in out uniform float4 o) +{ +} + +void main(out float4 o : sv_target) +{ + o = 0; + sub(o); +} + +[pixel shader fail] +float4 main(void) : sv_target +{ + uniform float f; + return 0; +} + +[pixel shader fail] +float4 main(void) : sv_target +{ + in float f; + return 0; +} diff --git a/tests/hlsl-storage-qualifiers.shader_test b/tests/hlsl-storage-qualifiers.shader_test new file mode 100644 index 0000000..0e22bb6 --- /dev/null +++ b/tests/hlsl-storage-qualifiers.shader_test @@ -0,0 +1,20 @@ +[pixel shader] +void sub2(in uniform float4 i, out float4 o) +{ + o = i; +} + +void sub(float a, uniform float b, in float c, uniform in float d, out float4 o) +{ + sub2(float4(a, b, c, d), o); +} + +void main(in uniform float a, uniform float b, out float4 o : sv_target) +{ + sub(a, b, 0.3, 0.4, o); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

Zebediah Figura : vkd3d-shader: Forbid declaring variables as both "uniform" and "static".
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: 07fb4ea1aee6a57941a901f80fd2722427297f11 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=07fb4ea1aee6a57941a901f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:05 2021 -0500 vkd3d-shader: Forbid declaring variables as both "uniform" and "static". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9eef5e2..2c9fe55 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1423,6 +1423,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t { local = false; + if ((modifiers & HLSL_STORAGE_UNIFORM) && (modifiers & HLSL_STORAGE_STATIC)) + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Variable '%s' is declared as both \"uniform\" and \"static\".", var->name); + if ((func = hlsl_get_func_decl(ctx, var->name))) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED,

1 0

Zebediah Figura : vkd3d-shader: Forbid declaring parameters as both "out" and "uniform".
by Alexandre Julliard 14 May '21

14 May '21

Module: vkd3d Branch: master Commit: 1bc2ea37c26ca955603ca369832228dde2ebdf37 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1bc2ea37c26ca955603ca36… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 10 23:36:04 2021 -0500 vkd3d-shader: Forbid declaring parameters as both "out" and "uniform". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4e17e80..9eef5e2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -763,6 +763,10 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct list *list, if (param->type->type == HLSL_CLASS_MATRIX) assert(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + if ((param->modifiers & HLSL_STORAGE_OUT) && (param->modifiers & HLSL_STORAGE_UNIFORM)) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Parameter '%s' is declared as both \"out\" and \"uniform\".", param->name); + if (!(var = hlsl_new_var(param->name, param->type, loc, &param->semantic, param->modifiers, param->reg_reservation))) return false; var->is_param = 1;

1 0

Francois Gouget : winetest/build-patterns: Add a testtext CSS class.
by Alexandre Julliard 14 May '21

14 May '21

Module: tools Branch: master Commit: 57c5fec113c83f60f1413f6c2a4c107daa664f86 URL: https://source.winehq.org/git/tools.git/?a=commit;h=57c5fec113c83f60f1413f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 14 11:39:40 2021 +0200 winetest/build-patterns: Add a testtext CSS class. It is needed to maintain a 4 pixel space between the description and the englobing testfile box. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- winetest/report.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index c9fcb66..06d527f 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1074,7 +1074,7 @@ sub write_pattern($$$) compute_set_colors($test->{colors}); - print $html $test->{desc} if (defined $test->{desc}); + print $html "<div class='testtext'>$test->{desc}</div>\n" if (defined $test->{desc}); print $html "<div class='test'>\n"; write_newmodes_line($html, $test) if (%{$test->{newmodes}}); diff --git a/winetest/report.css b/winetest/report.css index 4c91972..f789808 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -28,6 +28,12 @@ div.output, div.test { margin: 0; } +div.testtext { + text-align: left; + padding: 0 0 0 4px; + margin: 0; +} + div.updownbar { padding: 4px; margin-bottom: 5px;

1 0

Zhiyi Zhang : include: Add fUseStandardBidi field in SCRIPT_CONTROL.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 7529f46a850bc43982b8c5a5a236c880049d274e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7529f46a850bc43982b8c5a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 13 18:37:38 2021 +0800 include: Add fUseStandardBidi field in SCRIPT_CONTROL. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/usp10.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/usp10.h b/include/usp10.h index 09416aefe06..b1ff458b598 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -98,7 +98,8 @@ typedef struct tag_SCRIPT_CONTROL { DWORD fNumericOverride :1; DWORD fLegacyBidiClass :1; DWORD fMergeNeutralItems :1; - DWORD fReserved :7; + DWORD fUseStandardBidi :1; + DWORD fReserved :6; } SCRIPT_CONTROL; typedef struct {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: c1071b1a377ed04886a303e6560c2d19d99d003f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1071b1a377ed04886a303e6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 13 19:50:07 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index afadedd5dc1..203a71c0e70 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-30 09:04+0300\n" +"PO-Revision-Date: 2021-05-13 19:49+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14523,10 +14523,8 @@ msgid "reg: Unsupported registry data type [%1]\n" msgstr "reg: Nepalaikomas registro duomenų tipas [%1]\n" #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg: Už parametro [/d] privalo būti tinkama šešioliktainė reikšmė\n" +msgstr "reg: Už parametro [/d] privalo būti tinkama skaitinė reikšmė\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -14565,10 +14563,8 @@ msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Už parametro [/d] privalo būti tinkama eilutė\n" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: Nepavyko pašalinti registro rakto „%1“.\n" +msgstr "reg: Nepavyko pašalinti visų „%1“ registro reikšmių\n" #: programs/reg/reg.rc:136 msgid ""

1 0

Piotr Caban : ucrtbase: Store sse and x87 exception in fexcept_t.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 90fd548d0ab00bcdd1ced37caa1d3cc5a682e366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90fd548d0ab00bcdd1ced37c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:41 2021 +0200 ucrtbase: Store sse and x87 exception in fexcept_t. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3792a09e526..2e827dd32c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2369,10 +2369,13 @@ int CDECL fesetexceptflag(const fexcept_t *status, int excepts) fegetenv(&env); #if _MSVCR_VER>=140 && (defined(__i386__) || defined(__x86_64__)) env._Fe_stat &= ~fenv_encode(excepts, excepts); - env._Fe_stat |= fenv_encode(*status & excepts, *status & excepts); + env._Fe_stat |= *status & fenv_encode(excepts, excepts); +#elif _MSVCR_VER>=140 + env._Fe_stat &= ~fenv_encode(0, excepts); + env._Fe_stat |= *status & fenv_encode(0, excepts); #else env._Fe_stat &= ~excepts; - env._Fe_stat |= (*status & excepts); + env._Fe_stat |= *status & excepts; #endif return fesetenv(&env); } @@ -2418,7 +2421,15 @@ int CDECL feclearexcept(int flags) */ int CDECL fegetexceptflag(fexcept_t *status, int excepts) { +#if _MSVCR_VER>=140 && defined(__i386__) + unsigned int x87, sse; + _statusfp2(&x87, &sse); + *status = fenv_encode(x87 & excepts, sse & excepts); +#elif _MSVCR_VER>=140 + *status = fenv_encode(0, _statusfp() & excepts); +#else *status = _statusfp() & excepts; +#endif return 0; } #endif

1 0

Piotr Caban : ucrtbase: Store sse and x87 status in fegetenv function family.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 1b7e93c4c29de37ea258a515bcca5ffdd18c85c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7e93c4c29de37ea258a515… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:38 2021 +0200 ucrtbase: Store sse and x87 status in fegetenv function family. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 193 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b7e93c4c29de37ea258…

1 0

Piotr Caban : msvcr120: Don't modify fenv_t members in _except1.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 29cbb60f6daaf721ac81733c023048bb6cd2660e URL: https://source.winehq.org/git/wine.git/?a=commit;h=29cbb60f6daaf721ac81733c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:34 2021 +0200 msvcr120: Don't modify fenv_t members in _except1. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 78d5580a0ec..ab5981174b4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4934,9 +4934,9 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, { ULONG_PTR exception_arg; DWORD exception = 0; - fenv_t env; DWORD fpword = 0; WORD operation; + int raise = 0; TRACE("(%x %x %lf %lf %x %p)\n", fpe, op, arg, res, cw, unk); @@ -4946,49 +4946,47 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, operation = op << 5; exception_arg = (ULONG_PTR)&operation; - fegetenv(&env); - if (fpe & 0x1) { /* overflow */ if ((fpe == 0x1 && (cw & 0x8)) || (fpe==0x11 && (cw & 0x28))) { /* 32-bit version also sets SW_INEXACT here */ - env._Fe_stat |= FE_OVERFLOW; - if (fpe & 0x10) env._Fe_stat |= FE_INEXACT; + raise |= FE_OVERFLOW; + if (fpe & 0x10) raise |= FE_INEXACT; res = signbit(res) ? -INFINITY : INFINITY; } else { exception = EXCEPTION_FLT_OVERFLOW; } } else if (fpe & 0x2) { /* underflow */ if ((fpe == 0x2 && (cw & 0x10)) || (fpe==0x12 && (cw & 0x30))) { - env._Fe_stat |= FE_UNDERFLOW; - if (fpe & 0x10) env._Fe_stat |= FE_INEXACT; + raise |= FE_UNDERFLOW; + if (fpe & 0x10) raise |= FE_INEXACT; res = signbit(res) ? -0.0 : 0.0; } else { exception = EXCEPTION_FLT_UNDERFLOW; } } else if (fpe & 0x4) { /* zerodivide */ if ((fpe == 0x4 && (cw & 0x4)) || (fpe==0x14 && (cw & 0x24))) { - env._Fe_stat |= FE_DIVBYZERO; - if (fpe & 0x10) env._Fe_stat |= FE_INEXACT; + raise |= FE_DIVBYZERO; + if (fpe & 0x10) raise |= FE_INEXACT; } else { exception = EXCEPTION_FLT_DIVIDE_BY_ZERO; } } else if (fpe & 0x8) { /* invalid */ if (fpe == 0x8 && (cw & 0x1)) { - env._Fe_stat |= FE_INVALID; + raise |= FE_INVALID; } else { exception = EXCEPTION_FLT_INVALID_OPERATION; } } else if (fpe & 0x10) { /* inexact */ if (fpe == 0x10 && (cw & 0x20)) { - env._Fe_stat |= FE_INEXACT; + raise |= FE_INEXACT; } else { exception = EXCEPTION_FLT_INEXACT_RESULT; } } if (exception) - env._Fe_stat = 0; - fesetenv(&env); + raise = 0; + feraiseexcept(raise); if (exception) RaiseException(exception, 0, 1, &exception_arg);

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021