May 2021 - Wine-Commits - list.winehq.org

Francois Gouget : winetest/build-patterns: Show regressions identified in related bugs.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: tools Branch: master Commit: dc5274da1503f204c47c91db3279b3f257011a6f URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc5274da1503f204c47c91d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 18 15:19:08 2021 +0200 winetest/build-patterns: Show regressions identified in related bugs. If a commit has been identified as causing a bug related to a test, show and highlight that commit even if it is older than the oldest build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 98 +++++++++++++++++++++++++++++++++++++------------ winetest/report.css | 4 ++ 2 files changed, 79 insertions(+), 23 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 3c9b8aa..aacbb52 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -766,14 +766,35 @@ if (open(my $fh, "-|", $cmd)) # # - desc # The bug's one-line description. +# +# - regression +# The bug's "Regression SHA1" field. If set this identifies the Git commit +# causing the bug. my %bugs; my $old_build_date = $sortedbuilds[0]->{date}; my $mid_build_date = $sortedbuilds[int(@sortedbuilds/2)]->{date}; -sub create_bug($$$) +sub create_bug($$$$) { - my ($bugid, $mtime, $desc) = @_; + my ($bugid, $mtime, $regression, $desc) = @_; + + my $commit; + if ($regression) + { + $commit = $commits{$regression}; + if (!$commit) + { + my ($date, $summary) = get_build_info($regression); + $commits{$regression} = $commit = { + index => -(a)sortedbuilds, # not sorted + id => $regression, + date => $date, + build => $sortedbuilds[0], + summary => $summary, + }; + } + } my $t = Time::Piece->strptime($mtime, "%Y-%m-%d %H:%M:%S"); return { @@ -782,10 +803,11 @@ sub create_bug($$$) class => $t < $old_build_date ? "bugold" : $t < $mid_build_date ? "buginactive" : "bugactive", desc => $desc, + regression => $commit, }; } -$cmd = "wget -qO- '$bugweb/buglist.cgi?product=Wine&product=Wine-Testbot&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=source%2Ctestcase&keywords_type=allwords&rep_platform=x86&rep_platform=x86-64&columnlist=changeddate%2Cshort_desc&query_format=advanced&ctype=csv'"; +$cmd = "wget -qO- '$bugweb/buglist.cgi?product=Wine&product=Wine-Testbot&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=source%2Ctestcase&keywords_type=allwords&rep_platform=x86&rep_platform=x86-64&columnlist=changeddate%2Ccf_regression_sha1sum%2Cshort_desc&query_format=advanced&ctype=csv'"; if (open(my $fh, "-|", $cmd)) { <$fh>; # skip the header line @@ -799,15 +821,16 @@ if (open(my $fh, "-|", $cmd)) next; } - my ($bugid, $mtime, $desc) = $csv->fields(); + my ($bugid, $mtime, $commitid, $desc) = $csv->fields(); my $teststr = $desc; while ($teststr =~ s~\b([_.a-z0-9-]+)(?:/tests/|/|:)([_a-z0-9]+)\b~ ~) { my ($module, $unit) = ($1, $2); my $test = $tests{"$module:$unit"}; next if (!$test); - $bugs{$bugid} ||= create_bug($bugid, $mtime, $desc); + $bugs{$bugid} ||= create_bug($bugid, $mtime, $commitid, $desc); push @{$test->{bugs}}, $bugs{$bugid}; + $test->{regressions}->{$commitid} = $commits{$commitid}; } } close($fh); @@ -820,6 +843,10 @@ if (open(my $fh, "-|", $cmd)) foreach my $bug (sort { $a->{mtime} <=> $b->{mtime} } @{$test->{bugs}}) { $test->{desc} .= "<a href='$bugweb/show_bug.cgi?id=$bug->{id}'>$bug->{id}</a> {class}'>$bug->{desc}"; + if ($bug->{regression}) + { + $test->{desc} .= " (<a href='$gitweb/commitdiff/$bug->{regression}->{id}'>bisected</a>)"; + } $test->{desc} .= " "; } $test->{desc} .= ""; @@ -1069,6 +1096,7 @@ sub index2symbol($) } my %scope_descs = ( + R => "Caused a test regression", U => "Modifies this test", t => "Modifies a test resource (maybe for another test)", m => "Modifies the module", @@ -1091,11 +1119,16 @@ sub write_commits($$) } my $symbol = index2symbol($i++); - my ($ucount, $tcount, $tmcount) = (0, 0, 0); + my ($rcount, $sumcount, $tcount, $detcount) = (0, 0, 0, 0); foreach my $commit (sort { $a->{index} <=> $b->{index} } values %$buildcommits) { my $scope = "m"; - if ($path2commits{$test->{source}}->{$commit->{id}}) + if ($test->{regressions}->{$commit->{id}}) + { + $scope = "R"; + $rcount++; + } + elsif ($path2commits{$test->{source}}->{$commit->{id}}) { $scope = "U"; } @@ -1115,29 +1148,38 @@ sub write_commits($$) $gitweb, $commit->{id}, short_date($build->{date}), $commit->{summary}); - if ($scope eq "U") + if ($scope eq "R" or $scope eq "U") { - push @udescs, ($ucount ? "\n " : "\n$symbol."), $desc; - $ucount++; + push @udescs, ($sumcount ? "\n " : "\n$symbol."), $desc; + $sumcount++; } else { - push @tmdescs, ($tmcount ? " " : "$symbol."), $desc, "\n"; - $tmcount++; + push @tmdescs, ($detcount ? " " : "$symbol."), $desc, "\n"; + $detcount++; } } - push @udescs, " [+$tmcount in details]" if ($ucount and $tmcount); - - my @impacts; - push @impacts, "this test" if ($ucount); - push @impacts, "test resources" if ($tcount); - push @impacts, "the module" if ($tmcount > $tcount); - my $scope = $ucount ? "U" : $tcount ? "t" : "m"; - my $count = $ucount + $tmcount; - printf $html "<a class='commit%s' title='%s : %s commit%s to %s'>%s</a>", + push @udescs, " [+$detcount in details]" if ($sumcount and $detcount); + + my @desc; + push @desc, "this test" if ($sumcount > $rcount); + push @desc, "test resources" if ($tcount); + push @desc, "the module" if ($detcount > $tcount); + if (@desc) + { + my $count = $sumcount + $detcount - $rcount; + @desc = ( sprintf("%s commit%s to %s", $count, + $count > 1 ? "s" : "", join(", ", @desc)) ); + } + if ($rcount) + { + unshift @desc, sprintf("%s regression%s", $rcount, + $rcount > 1 ? "s" : ""); + } + my $scope = $rcount ? "R" : $sumcount ? "U" : $tcount ? "t" : "m"; + printf $html "<a class='commit%s' title='%s : %s'>%s</a>", $scope, short_date($build->{date}), - $count, $count > 1 ? "s" : "", - join(", ", @impacts), $symbol; + join(", ", @desc), $symbol; } print $html "</div> ← potentially related commits\n"; @@ -1255,6 +1297,16 @@ EOF $test->{colors} = {}; $test->{commits} = {}; + # The regression commits may only impact the results in Wine. + # Add them even if only reporting on the Windows results. + foreach my $bug (@{$test->{bugs}}) + { + my $commit = $bug->{regression}; + next if (!$commit); + my $buildname = $commit->{build}->{name}; + $test->{commits}->{$buildname}->{$commit->{id}} = $commit; + } + my $has_wine_failures; my $first = @sortedbuilds; my $last = -1; diff --git a/winetest/report.css b/winetest/report.css index 05ee035..80be53d 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -118,6 +118,10 @@ div.pattern :hover { color: black; text-decoration: underline; } background-color: #80aaff; } +.commitR { + color: #cc0000; + font-weight: bold; +} .commitU { font-weight: bold; }

1 0

Zebediah Figura : vkd3d-shader: Introduce write_sm1_{src, dst}_register() helpers.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: vkd3d Branch: master Commit: 9f73897725ea412c7a145722f20c5157a0bd0342 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9f73897725ea412c7a14572… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 16 12:47:52 2021 -0500 vkd3d-shader: Introduce write_sm1_{src, dst}_register() helpers. 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_codegen.c | 64 +++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b3d7d2c..7dd919b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1523,23 +1523,11 @@ 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 uint32_t sm1_encode_src(D3DSHADER_PARAM_REGISTER_TYPE type, - D3DSHADER_PARAM_SRCMOD_TYPE modifier, unsigned int swizzle, uint32_t reg) -{ - return (1u << 31) | sm1_encode_register_type(type) | modifier | (swizzle << 16) | reg; -} - struct sm1_instruction { D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode; - struct + struct sm1_dst_register { D3DSHADER_PARAM_REGISTER_TYPE type; D3DSHADER_PARAM_DSTMOD_TYPE mod; @@ -1547,7 +1535,7 @@ struct sm1_instruction uint32_t reg; } dst; - struct + struct sm1_src_register { D3DSHADER_PARAM_REGISTER_TYPE type; D3DSHADER_PARAM_SRCMOD_TYPE mod; @@ -1559,6 +1547,20 @@ struct sm1_instruction unsigned int has_dst; }; +static void write_sm1_dst_register(struct bytecode_buffer *buffer, const struct sm1_dst_register *reg) +{ + assert(reg->writemask); + put_dword(buffer, (1u << 31) | sm1_encode_register_type(reg->type) | reg->mod | (reg->writemask << 16) | reg->reg); +} + +static void write_sm1_src_register(struct bytecode_buffer *buffer, + const struct sm1_src_register *reg, unsigned int dst_writemask) +{ + unsigned int swizzle = map_swizzle(reg->swizzle, dst_writemask); + + put_dword(buffer, (1u << 31) | sm1_encode_register_type(reg->type) | reg->mod | (swizzle << 16) | reg->reg); +} + static void write_sm1_instruction(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct sm1_instruction *instr) { @@ -1570,14 +1572,10 @@ static void write_sm1_instruction(struct hlsl_ctx *ctx, struct bytecode_buffer * put_dword(buffer, token); if (instr->has_dst) - { - assert(instr->dst.writemask); - put_dword(buffer, sm1_encode_dst(instr->dst.type, instr->dst.mod, instr->dst.writemask, instr->dst.reg)); - } + write_sm1_dst_register(buffer, &instr->dst); for (i = 0; i < instr->src_count; ++i) - put_dword(buffer, sm1_encode_src(instr->srcs[i].type, instr->srcs[i].mod, - map_swizzle(instr->srcs[i].swizzle, instr->dst.writemask), instr->srcs[i].reg)); + write_sm1_src_register(buffer, &instr->srcs[i], instr->dst.writemask); }; static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) @@ -1587,16 +1585,18 @@ static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer for (i = 0; i < ctx->constant_defs.count; ++i) { uint32_t token = D3DSIO_DEF; + const struct sm1_dst_register reg = + { + .type = D3DSPR_CONST, + .writemask = VKD3DSP_WRITEMASK_ALL, + .reg = i, + }; if (ctx->profile->major_version > 1) token |= 5 << D3DSI_INSTLENGTH_SHIFT; put_dword(buffer, token); - token = (1u << 31); - token |= sm1_encode_register_type(D3DSPR_CONST); - token |= D3DSP_WRITEMASK_ALL; - token |= i; - put_dword(buffer, token); + write_sm1_dst_register(buffer, &reg); for (x = 0; x < 4; ++x) put_float(buffer, ctx->constant_defs.values[i].f[x]); } @@ -1605,12 +1605,12 @@ 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; + struct sm1_dst_register reg = {0}; + uint32_t token, usage_idx; D3DDECLUSAGE usage; bool ret; - if (sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg_idx)) + if (sm1_register_from_semantic(ctx, &var->semantic, output, &reg.type, &reg.reg)) { usage = 0; usage_idx = 0; @@ -1619,8 +1619,8 @@ static void write_sm1_semantic_dcl(struct hlsl_ctx *ctx, struct bytecode_buffer { ret = sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx); assert(ret); - type = output ? D3DSPR_OUTPUT : D3DSPR_INPUT; - reg_idx = var->reg.id; + reg.type = output ? D3DSPR_OUTPUT : D3DSPR_INPUT; + reg.reg = var->reg.id; } token = D3DSIO_DCL; @@ -1632,7 +1632,9 @@ static void write_sm1_semantic_dcl(struct hlsl_ctx *ctx, struct bytecode_buffer 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)); + + reg.writemask = (1 << var->data_type->dimx) - 1; + write_sm1_dst_register(buffer, &reg); } static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer)

1 0

Zebediah Figura : vkd3d-shader: Trace SM1 predefined registers.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: vkd3d Branch: master Commit: 0997d65589b4898a846541e99f5f0d1fdc2fe00d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0997d65589b4898a846541e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 16 12:47:51 2021 -0500 vkd3d-shader: Trace SM1 predefined registers. 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_codegen.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 716824a..b3d7d2c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1073,7 +1073,13 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var return; } - if (!sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg)) + if (sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg)) + { + TRACE("%s %s semantic %s[%u] matches predefined register %#x[%u].\n", + ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL ? "Pixel" : "Vertex", output ? "output" : "input", + var->semantic.name, var->semantic.index, type, reg); + } + else { var->reg.allocated = true; var->reg.id = (*counter)++;

1 0

Zebediah Figura : vkd3d-shader: Sanity-check the offset data type in hlsl_reg_from_deref().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: vkd3d Branch: master Commit: 0238f60d8b53e78cb30e1ab9f6ee9255c4905528 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0238f60d8b53e78cb30e1ab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 16 12:47:53 2021 -0500 vkd3d-shader: Sanity-check the offset data type in hlsl_reg_from_deref(). 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_codegen.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7dd919b..10bf80b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1171,6 +1171,11 @@ static struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct hlsl_reg ret = {0}; unsigned int offset = 0; + /* We should always have generated a cast to UINT. */ + if (offset_node) + assert(offset_node->data_type->type == HLSL_CLASS_SCALAR + && offset_node->data_type->base_type == HLSL_TYPE_UINT); + if (offset_node && offset_node->type != HLSL_IR_CONSTANT) { FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type));

1 0

Zebediah Figura : vkd3d-shader: Write SM1 load instructions.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: vkd3d Branch: master Commit: 6e475814153ace7e5af3ac1cf478f3c33872d813 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e475814153ace7e5af3ac1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 16 12:47:54 2021 -0500 vkd3d-shader: Write SM1 load instructions. 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_codegen.c | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 10bf80b..05aea21 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1663,6 +1663,48 @@ static void write_sm1_semantic_dcls(struct hlsl_ctx *ctx, struct bytecode_buffer } } +static void write_sm1_load(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) +{ + const struct hlsl_ir_load *load = hlsl_ir_load(instr); + const struct hlsl_reg reg = hlsl_reg_from_deref(&load->src, instr->data_type); + struct sm1_instruction sm1_instr = + { + .opcode = D3DSIO_MOV, + + .dst.type = D3DSPR_TEMP, + .dst.reg = instr->reg.id, + .dst.writemask = instr->reg.writemask, + .has_dst = 1, + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].reg = reg.id, + .srcs[0].swizzle = swizzle_from_writemask(reg.writemask), + .src_count = 1, + }; + + assert(instr->reg.allocated); + + if (load->src.var->is_uniform) + { + assert(reg.allocated); + sm1_instr.srcs[0].type = D3DSPR_CONST; + } + else if (load->src.var->is_input_semantic) + { + if (!sm1_register_from_semantic(ctx, &load->src.var->semantic, + false, &sm1_instr.srcs[0].type, &sm1_instr.srcs[0].reg)) + { + assert(reg.allocated); + sm1_instr.srcs[0].type = D3DSPR_INPUT; + sm1_instr.srcs[0].reg = reg.id; + } + else + sm1_instr.srcs[0].swizzle = swizzle_from_writemask((1 << load->src.var->data_type->dimx) - 1); + } + + write_sm1_instruction(ctx, buffer, &sm1_instr); +} + static void write_sm1_store(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_store *store = hlsl_ir_store(instr); @@ -1726,6 +1768,10 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct bytecode_buffer switch (instr->type) { + case HLSL_IR_LOAD: + write_sm1_load(ctx, buffer, instr); + break; + case HLSL_IR_STORE: write_sm1_store(ctx, buffer, instr); break;

1 0

Zebediah Figura : vkd3d-shader: Mark all declared non-static global variables as HLSL_STORAGE_UNIFORM.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: vkd3d Branch: master Commit: b20e182da14f43c99111c9bbfce2f870f6aabacd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b20e182da14f43c99111c9b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 16 12:47:50 2021 -0500 vkd3d-shader: Mark all declared non-static global variables as HLSL_STORAGE_UNIFORM. Fixes: 549be35c0aff6aa78f1dc9a08df89ce8de16db2c 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 | 6 ++++++ libs/vkd3d-shader/hlsl_codegen.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2c9fe55..bcb1c20 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1427,6 +1427,12 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Variable '%s' is declared as both \"uniform\" and \"static\".", var->name); + /* Mark it as uniform. We need to do this here since synthetic + * variables also get put in the global scope, but shouldn't be + * considered uniforms, and we have no way of telling otherwise. */ + if (!(modifiers & HLSL_STORAGE_STATIC)) + var->modifiers |= HLSL_STORAGE_UNIFORM; + if ((func = hlsl_get_func_decl(ctx, var->name))) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0dfbfb9..716824a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1757,7 +1757,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun { if (var->data_type->type == HLSL_CLASS_OBJECT) list_add_tail(&ctx->extern_vars, &var->extern_entry); - else if (!(var->modifiers & HLSL_STORAGE_STATIC)) + else if (var->modifiers & HLSL_STORAGE_UNIFORM) prepend_uniform_copy(ctx, entry_func->body, var); }

1 0

Zebediah Figura : quartz/tests: Fix some test failures related to thread timing.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 9172ca5baa27b0c929b14a49f60333613cc30c65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9172ca5baa27b0c929b14a49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 10:49:13 2021 -0500 quartz/tests: Fix some test failures related to thread timing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 8 +++++--- dlls/quartz/tests/vmr9.c | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 797ea7acc7c..22cc703a539 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -971,7 +971,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = IMediaControl_GetState(control, 0, &state); + hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_BeginFlush(pin); @@ -1083,7 +1083,8 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input hr = IPin_BeginFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == E_FAIL, "Got hr %#x.\n", hr); hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1093,7 +1094,8 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == E_FAIL, "Got hr %#x.\n", hr); IMediaSeeking_Release(seeking); } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 1697a321915..c7a84d65b7b 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1199,7 +1199,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = IMediaControl_GetState(control, 0, &state); + hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_BeginFlush(pin); @@ -1453,7 +1453,8 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); } static void test_current_image(IBaseFilter *filter, IMemInputPin *input,

1 0

Jacek Caban : winepulse: Move timer loop to unix lib.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 13cac6287c454146eff73aabc4b92b5c8f76d4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=13cac6287c454146eff73aab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:05:06 2021 +0200 winepulse: Move timer loop to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 87 +--------------------------------- dlls/winepulse.drv/pulse.c | 107 +++++++++++++++++++++++++++++++++++++++++- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 107 insertions(+), 89 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 975f38794ac..f9b16bee66b 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -251,93 +251,8 @@ static void pulse_op_cb(pa_stream *s, int success, void *user) { static DWORD WINAPI pulse_timer_cb(void *user) { - LARGE_INTEGER delay; - UINT32 adv_bytes; ACImpl *This = user; - int success; - pa_operation *o; - - pulse->lock(); - delay.QuadPart = -This->pulse_stream->mmdev_period_usec * 10; - pa_stream_get_time(This->pulse_stream->stream, &This->pulse_stream->last_time); - pulse->unlock(); - - while(!This->pulse_stream->please_quit){ - pa_usec_t now, adv_usec = 0; - int err; - - NtDelayExecution(FALSE, &delay); - - pulse->lock(); - - delay.QuadPart = -This->pulse_stream->mmdev_period_usec * 10; - - o = pa_stream_update_timing_info(This->pulse_stream->stream, pulse_op_cb, &success); - if (o) - { - while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse->cond_wait(); - pa_operation_unref(o); - } - err = pa_stream_get_time(This->pulse_stream->stream, &now); - if(err == 0){ - TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(This->pulse_stream->last_time)); - if(This->pulse_stream->started && (This->dataflow == eCapture || This->pulse_stream->held_bytes)){ - if(This->pulse_stream->just_underran){ - This->pulse_stream->last_time = now; - This->pulse_stream->just_started = TRUE; - } - - if(This->pulse_stream->just_started){ - /* let it play out a period to absorb some latency and get accurate timing */ - pa_usec_t diff = now - This->pulse_stream->last_time; - - if(diff > This->pulse_stream->mmdev_period_usec){ - This->pulse_stream->just_started = FALSE; - This->pulse_stream->last_time = now; - } - }else{ - INT32 adjust = This->pulse_stream->last_time + This->pulse_stream->mmdev_period_usec - now; - - adv_usec = now - This->pulse_stream->last_time; - - if(adjust > ((INT32)(This->pulse_stream->mmdev_period_usec / 2))) - adjust = This->pulse_stream->mmdev_period_usec / 2; - else if(adjust < -((INT32)(This->pulse_stream->mmdev_period_usec / 2))) - adjust = -1 * This->pulse_stream->mmdev_period_usec / 2; - - delay.QuadPart = -(This->pulse_stream->mmdev_period_usec + adjust) * 10; - - This->pulse_stream->last_time += This->pulse_stream->mmdev_period_usec; - } - - if(This->dataflow == eRender){ - pulse->write(This->pulse_stream); - - /* regardless of what PA does, advance one period */ - adv_bytes = min(This->pulse_stream->period_bytes, This->pulse_stream->held_bytes); - This->pulse_stream->lcl_offs_bytes += adv_bytes; - This->pulse_stream->lcl_offs_bytes %= This->pulse_stream->real_bufsize_bytes; - This->pulse_stream->held_bytes -= adv_bytes; - }else if(This->dataflow == eCapture){ - pulse->read(This->pulse_stream); - } - }else{ - This->pulse_stream->last_time = now; - delay.QuadPart = -This->pulse_stream->mmdev_period_usec * 10; - } - } - - if (This->pulse_stream->event) - SetEvent(This->pulse_stream->event); - - TRACE("%p after update, adv usec: %d, held: %u, delay usec: %u\n", - This, (int)adv_usec, - (int)(This->pulse_stream->held_bytes/ pa_frame_size(&This->pulse_stream->ss)), (unsigned int)(-delay.QuadPart / 10)); - - pulse->unlock(); - } - + pulse->timer_loop(This->pulse_stream); return 0; } diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1dd906aef68..d720b79a22d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1054,7 +1054,7 @@ static void WINAPI pulse_write(struct pulse_stream *stream) stream->pa_held_bytes -= to_write; } -static void WINAPI pulse_read(struct pulse_stream *stream) +static void pulse_read(struct pulse_stream *stream) { size_t bytes = pa_stream_readable_size(stream->stream); @@ -1154,6 +1154,109 @@ static void WINAPI pulse_read(struct pulse_stream *stream) } } +static void WINAPI pulse_timer_loop(struct pulse_stream *stream) +{ + LARGE_INTEGER delay; + UINT32 adv_bytes; + int success; + pa_operation *o; + + pulse_lock(); + delay.QuadPart = -stream->mmdev_period_usec * 10; + pa_stream_get_time(stream->stream, &stream->last_time); + pulse_unlock(); + + while (!stream->please_quit) + { + pa_usec_t now, adv_usec = 0; + int err; + + NtDelayExecution(FALSE, &delay); + + pulse_lock(); + + delay.QuadPart = -stream->mmdev_period_usec * 10; + + o = pa_stream_update_timing_info(stream->stream, pulse_op_cb, &success); + if (o) + { + while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) + pulse_cond_wait(); + pa_operation_unref(o); + } + err = pa_stream_get_time(stream->stream, &now); + if (err == 0) + { + TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(stream->last_time)); + if (stream->started && (stream->dataflow == eCapture || stream->held_bytes)) + { + if(stream->just_underran) + { + stream->last_time = now; + stream->just_started = TRUE; + } + + if (stream->just_started) + { + /* let it play out a period to absorb some latency and get accurate timing */ + pa_usec_t diff = now - stream->last_time; + + if (diff > stream->mmdev_period_usec) + { + stream->just_started = FALSE; + stream->last_time = now; + } + } + else + { + INT32 adjust = stream->last_time + stream->mmdev_period_usec - now; + + adv_usec = now - stream->last_time; + + if(adjust > ((INT32)(stream->mmdev_period_usec / 2))) + adjust = stream->mmdev_period_usec / 2; + else if(adjust < -((INT32)(stream->mmdev_period_usec / 2))) + adjust = -1 * stream->mmdev_period_usec / 2; + + delay.QuadPart = -(stream->mmdev_period_usec + adjust) * 10; + + stream->last_time += stream->mmdev_period_usec; + } + + if (stream->dataflow == eRender) + { + pulse_write(stream); + + /* regardless of what PA does, advance one period */ + adv_bytes = min(stream->period_bytes, stream->held_bytes); + stream->lcl_offs_bytes += adv_bytes; + stream->lcl_offs_bytes %= stream->real_bufsize_bytes; + stream->held_bytes -= adv_bytes; + } + else if(stream->dataflow == eCapture) + { + pulse_read(stream); + } + } + else + { + stream->last_time = now; + delay.QuadPart = -stream->mmdev_period_usec * 10; + } + } + + if (stream->event) + NtSetEvent(stream->event, NULL); + + TRACE("%p after update, adv usec: %d, held: %u, delay usec: %u\n", + stream, (int)adv_usec, + (int)(stream->held_bytes/ pa_frame_size(&stream->ss)), + (unsigned int)(-delay.QuadPart / 10)); + + pulse_unlock(); + } +} + static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) { HRESULT hr = S_OK; @@ -1212,8 +1315,8 @@ static const struct unix_funcs unix_funcs = pulse_create_stream, pulse_release_stream, pulse_write, - pulse_read, pulse_stop, + pulse_timer_loop, pulse_set_volumes, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 5413c4d2c78..4188dacc25f 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -79,8 +79,8 @@ struct unix_funcs struct pulse_stream **ret); void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); void (WINAPI *write)(struct pulse_stream *stream); - void (WINAPI *read)(struct pulse_stream *stream); HRESULT (WINAPI *stop)(struct pulse_stream *stream); + void (WINAPI *timer_loop)(struct pulse_stream *stream); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config);

1 0

Jacek Caban : winepulse: Move pulse_write to unix lib.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: d7b957654d4739b8dd07c91f051b7940f416ef42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b957654d4739b8dd07c91f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:04:56 2021 +0200 winepulse: Move pulse_write to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 190 +----------------------------------------- dlls/winepulse.drv/mult.c | 4 + dlls/winepulse.drv/pulse.c | 190 ++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 4 files changed, 197 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7b957654d4739b8dd07…

1 0

Jacek Caban : winepulse: Adjust pulse stream volumes for master volume.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 8060e56b26add8eafffb211119798569ea3188ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=8060e56b26add8eafffb2111… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:03:58 2021 +0200 winepulse: Adjust pulse stream volumes for master volume. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 7 +++++-- dlls/winepulse.drv/pulse.c | 5 +++-- dlls/winepulse.drv/unixlib.h | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 2a9ebd86c3a..8933a95d834 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -264,7 +264,7 @@ static int write_buffer(const ACImpl *This, BYTE *buffer, UINT32 bytes) channels = This->pulse_stream->ss.channels; for (i = 0; i < channels; i++) { - vol[i] = This->pulse_stream->vol[i] * This->session->master_vol * This->session->channel_vols[i]; + vol[i] = This->pulse_stream->vol[i] * This->session->channel_vols[i]; adjust |= vol[i] != 1.0f; } if (!adjust) goto write; @@ -528,7 +528,7 @@ static DWORD WINAPI pulse_timer_cb(void *user) static void set_stream_volumes(ACImpl *This) { - pulse->set_volumes(This->pulse_stream, This->vol); + pulse->set_volumes(This->pulse_stream, This->session->master_vol, This->vol); } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, @@ -2593,6 +2593,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -2606,6 +2607,8 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( pulse->lock(); session->master_vol = level; + LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) + set_stream_volumes(client); pulse->unlock(); return S_OK; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index f0bfcd98b7d..02f4d11a7f1 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1004,12 +1004,13 @@ static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) return hr; } -static void WINAPI pulse_set_volumes(struct pulse_stream *stream, const float *volumes) +static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, + const float *volumes) { unsigned int i; for (i = 0; i < stream->ss.channels; i++) - stream->vol[i] = volumes[i]; + stream->vol[i] = volumes[i] * master_volume; } static const struct unix_funcs unix_funcs = diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 7b5c5400a1f..8636f11d6f5 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -80,6 +80,7 @@ struct unix_funcs void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); void (WINAPI *read)(struct pulse_stream *stream); HRESULT (WINAPI *stop)(struct pulse_stream *stream); - void (WINAPI *set_volumes)(struct pulse_stream *stream, const float *volumes); + void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, + const float *volumes); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); };

1 0