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

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

18 May '21

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: Trace SM1 predefined registers.
by Alexandre Julliard 18 May '21

18 May '21

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: Introduce write_sm1_{src, dst}_register() helpers.
by Alexandre Julliard 18 May '21

18 May '21

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: Sanity-check the offset data type in hlsl_reg_from_deref().
by Alexandre Julliard 18 May '21

18 May '21

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 18 May '21

18 May '21

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 18 May '21

18 May '21

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

Jacek Caban : winepulse: Move pulse_read to unix lib.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: a5d4079c8285c10ab2019c9fd9d19a6b22babb76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d4079c8285c10ab2019c9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:03:19 2021 +0200 winepulse: Move pulse_read 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 | 92 +------------------------------------- dlls/winepulse.drv/pulse.c | 101 ++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 103 insertions(+), 91 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index d0d497c4bbb..0e1da1364fa 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -434,96 +434,6 @@ static void pulse_write(ACImpl *This) This->pulse_stream->pa_held_bytes -= to_write; } -static void pulse_read(ACImpl *This) -{ - size_t bytes = pa_stream_readable_size(This->pulse_stream->stream); - - TRACE("Readable total: %zu, fragsize: %u\n", bytes, pa_stream_get_buffer_attr(This->pulse_stream->stream)->fragsize); - - bytes += This->pulse_stream->peek_len - This->pulse_stream->peek_ofs; - - while (bytes >= This->pulse_stream->period_bytes) { - BYTE *dst = NULL, *src; - size_t src_len, copy, rem = This->pulse_stream->period_bytes; - - if (This->pulse_stream->started) { - LARGE_INTEGER stamp, freq; - ACPacket *p, *next; - - if (!(p = (ACPacket*)list_head(&This->pulse_stream->packet_free_head))) { - p = (ACPacket*)list_head(&This->pulse_stream->packet_filled_head); - if (!p) return; - if (!p->discont) { - next = (ACPacket*)p->entry.next; - next->discont = 1; - } else - p = (ACPacket*)list_tail(&This->pulse_stream->packet_filled_head); - } else { - This->pulse_stream->held_bytes += This->pulse_stream->period_bytes; - } - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - p->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - p->discont = 0; - list_remove(&p->entry); - list_add_tail(&This->pulse_stream->packet_filled_head, &p->entry); - - dst = p->data; - } - - while (rem) { - if (This->pulse_stream->peek_len) { - copy = min(rem, This->pulse_stream->peek_len - This->pulse_stream->peek_ofs); - - if (dst) { - memcpy(dst, This->pulse_stream->peek_buffer + This->pulse_stream->peek_ofs, copy); - dst += copy; - } - - rem -= copy; - This->pulse_stream->peek_ofs += copy; - if(This->pulse_stream->peek_len == This->pulse_stream->peek_ofs) - This->pulse_stream->peek_len = This->pulse_stream->peek_ofs = 0; - - } else if (pa_stream_peek(This->pulse_stream->stream, (const void**)&src, &src_len) == 0 && src_len) { - - copy = min(rem, src_len); - - if (dst) { - if(src) - memcpy(dst, src, copy); - else - silence_buffer(This->pulse_stream->ss.format, dst, copy); - - dst += copy; - } - - rem -= copy; - - if (copy < src_len) { - if (src_len > This->pulse_stream->peek_buffer_len) { - HeapFree(GetProcessHeap(), 0, This->pulse_stream->peek_buffer); - This->pulse_stream->peek_buffer = HeapAlloc(GetProcessHeap(), 0, src_len); - This->pulse_stream->peek_buffer_len = src_len; - } - - if(src) - memcpy(This->pulse_stream->peek_buffer, src + copy, src_len - copy); - else - silence_buffer(This->pulse_stream->ss.format, This->pulse_stream->peek_buffer, src_len - copy); - - This->pulse_stream->peek_len = src_len - copy; - This->pulse_stream->peek_ofs = 0; - } - - pa_stream_drop(This->pulse_stream->stream); - } - } - - bytes -= This->pulse_stream->period_bytes; - } -} - static DWORD WINAPI pulse_timer_cb(void *user) { LARGE_INTEGER delay; @@ -595,7 +505,7 @@ static DWORD WINAPI pulse_timer_cb(void *user) 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->read(This->pulse_stream); } }else{ This->pulse_stream->last_time = now; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 260723815f6..d434f47d6dc 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -851,6 +851,106 @@ static void WINAPI pulse_release_stream(struct pulse_stream *stream, HANDLE time RtlFreeHeap(GetProcessHeap(), 0, stream); } +static void WINAPI pulse_read(struct pulse_stream *stream) +{ + size_t bytes = pa_stream_readable_size(stream->stream); + + TRACE("Readable total: %zu, fragsize: %u\n", bytes, pa_stream_get_buffer_attr(stream->stream)->fragsize); + + bytes += stream->peek_len - stream->peek_ofs; + + while (bytes >= stream->period_bytes) + { + BYTE *dst = NULL, *src; + size_t src_len, copy, rem = stream->period_bytes; + + if (stream->started) + { + LARGE_INTEGER stamp, freq; + ACPacket *p, *next; + + if (!(p = (ACPacket*)list_head(&stream->packet_free_head))) + { + p = (ACPacket*)list_head(&stream->packet_filled_head); + if (!p) return; + if (!p->discont) { + next = (ACPacket*)p->entry.next; + next->discont = 1; + } else + p = (ACPacket*)list_tail(&stream->packet_filled_head); + } + else + { + stream->held_bytes += stream->period_bytes; + } + NtQueryPerformanceCounter(&stamp, &freq); + p->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + p->discont = 0; + list_remove(&p->entry); + list_add_tail(&stream->packet_filled_head, &p->entry); + + dst = p->data; + } + + while (rem) + { + if (stream->peek_len) + { + copy = min(rem, stream->peek_len - stream->peek_ofs); + + if (dst) + { + memcpy(dst, stream->peek_buffer + stream->peek_ofs, copy); + dst += copy; + } + + rem -= copy; + stream->peek_ofs += copy; + if(stream->peek_len == stream->peek_ofs) + stream->peek_len = stream->peek_ofs = 0; + + } + else if (pa_stream_peek(stream->stream, (const void**)&src, &src_len) == 0 && src_len) + { + copy = min(rem, src_len); + + if (dst) { + if(src) + memcpy(dst, src, copy); + else + silence_buffer(stream->ss.format, dst, copy); + + dst += copy; + } + + rem -= copy; + + if (copy < src_len) + { + if (src_len > stream->peek_buffer_len) + { + RtlFreeHeap(GetProcessHeap(), 0, stream->peek_buffer); + stream->peek_buffer = RtlAllocateHeap(GetProcessHeap(), 0, src_len); + stream->peek_buffer_len = src_len; + } + + if(src) + memcpy(stream->peek_buffer, src + copy, src_len - copy); + else + silence_buffer(stream->ss.format, stream->peek_buffer, src_len - copy); + + stream->peek_len = src_len - copy; + stream->peek_ofs = 0; + } + + pa_stream_drop(stream->stream); + } + } + + bytes -= stream->period_bytes; + } +} + static const struct unix_funcs unix_funcs = { pulse_lock, @@ -860,6 +960,7 @@ static const struct unix_funcs unix_funcs = pulse_main_loop, pulse_create_stream, pulse_release_stream, + pulse_read, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 51c850ac1ae..c725082e96d 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -77,5 +77,6 @@ struct unix_funcs const WAVEFORMATEX *fmt, UINT32 *channel_count, struct pulse_stream **ret); void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); + void (WINAPI *read)(struct pulse_stream *stream); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); };

1 0

Jacek Caban : winepulse: Move pulse_stop to unix lib.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: b1ddfca16e4696a52adf2bdd8333eeffb3c6170c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ddfca16e4696a52adf2bdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:03:29 2021 +0200 winepulse: Move pulse_stop 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 | 34 +++------------------------- dlls/winepulse.drv/pulse.c | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 56 insertions(+), 31 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0e1da1364fa..589a87076ff 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1223,40 +1223,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr = S_OK; - pa_operation *o; - int success; - TRACE("(%p)\n", This); - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) { - pulse->unlock(); - return hr; - } - - if (!This->pulse_stream->started) { - pulse->unlock(); - return S_FALSE; - } + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - if (This->dataflow == eRender) { - o = pa_stream_cork(This->pulse_stream->stream, 1, pulse_op_cb, &success); - if (o) { - while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse->cond_wait(); - pa_operation_unref(o); - } else - success = 0; - if (!success) - hr = E_FAIL; - } - if (SUCCEEDED(hr)) { - This->pulse_stream->started = FALSE; - } - pulse->unlock(); - return hr; + return pulse->stop(This->pulse_stream); } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index d434f47d6dc..fed34167018 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -200,11 +200,23 @@ static void pulse_started_callback(pa_stream *s, void *userdata) TRACE("%p: (Re)started playing\n", userdata); } +static void pulse_op_cb(pa_stream *s, int success, void *user) +{ + TRACE("Success: %i\n", success); + *(int*)user = success; + pulse_broadcast(); +} + static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes) { memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); } +static BOOL pulse_stream_valid(struct pulse_stream *stream) +{ + return pa_stream_get_state(stream->stream) == PA_STREAM_READY; +} + static HRESULT pulse_connect(const char *name) { if (pulse_ctx && PA_CONTEXT_IS_GOOD(pa_context_get_state(pulse_ctx))) @@ -951,6 +963,45 @@ static void WINAPI pulse_read(struct pulse_stream *stream) } } +static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) +{ + HRESULT hr = S_OK; + pa_operation *o; + int success; + + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + + if (!stream->started) + { + pulse_unlock(); + return S_FALSE; + } + + if (stream->dataflow == eRender) + { + o = pa_stream_cork(stream->stream, 1, pulse_op_cb, &success); + if (o) + { + while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) + pulse_cond_wait(); + pa_operation_unref(o); + } + else + success = 0; + if (!success) + hr = E_FAIL; + } + if (SUCCEEDED(hr)) + stream->started = FALSE; + pulse_unlock(); + return hr; +} + static const struct unix_funcs unix_funcs = { pulse_lock, @@ -961,6 +1012,7 @@ static const struct unix_funcs unix_funcs = pulse_create_stream, pulse_release_stream, pulse_read, + pulse_stop, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index c725082e96d..ca764afa19d 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -78,5 +78,6 @@ struct unix_funcs struct pulse_stream **ret); void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); void (WINAPI *read)(struct pulse_stream *stream); + HRESULT (WINAPI *stop)(struct pulse_stream *stream); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); };

1 0

Jacek Caban : winepulse: Store volume levels in pulse_stream.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: bca0706f3a93fa0a57f4dbdc6ae541e8f25afb34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca0706f3a93fa0a57f4dbdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:03:38 2021 +0200 winepulse: Store volume levels in pulse_stream. 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 | 9 ++++++++- dlls/winepulse.drv/pulse.c | 13 ++++++++++++- dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 589a87076ff..2a9ebd86c3a 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->vol[i] * This->session->master_vol * This->session->channel_vols[i]; + vol[i] = This->pulse_stream->vol[i] * This->session->master_vol * This->session->channel_vols[i]; adjust |= vol[i] != 1.0f; } if (!adjust) goto write; @@ -526,6 +526,11 @@ static DWORD WINAPI pulse_timer_cb(void *user) return 0; } +static void set_stream_volumes(ACImpl *This) +{ + pulse->set_volumes(This->pulse_stream, This->vol); +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, UINT *num, UINT *def_index) { @@ -870,6 +875,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if (SUCCEEDED(hr)) { hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if (SUCCEEDED(hr)) { + set_stream_volumes(This); list_add_tail(&This->session->clients, &This->entry); } else { pulse->release_stream(This->pulse_stream, NULL); @@ -2038,6 +2044,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for (i = 0; i < count; ++i) This->vol[i] = levels[i]; + set_stream_volumes(This); out: pulse->unlock(); return hr; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index fed34167018..f0bfcd98b7d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -755,7 +755,7 @@ static HRESULT WINAPI pulse_create_stream(const char *name, EDataFlow dataflow, struct pulse_stream **ret) { struct pulse_stream *stream; - unsigned int bufsize_bytes; + unsigned int i, bufsize_bytes; HRESULT hr; if (FAILED(hr = pulse_connect(name))) @@ -765,6 +765,8 @@ static HRESULT WINAPI pulse_create_stream(const char *name, EDataFlow dataflow, return E_OUTOFMEMORY; stream->dataflow = dataflow; + for (i = 0; i < ARRAY_SIZE(stream->vol); ++i) + stream->vol[i] = 1.f; hr = pulse_spec_from_waveformat(stream, fmt); TRACE("Obtaining format returns %08x\n", hr); @@ -1002,6 +1004,14 @@ static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) return hr; } +static void WINAPI pulse_set_volumes(struct pulse_stream *stream, const float *volumes) +{ + unsigned int i; + + for (i = 0; i < stream->ss.channels; i++) + stream->vol[i] = volumes[i]; +} + static const struct unix_funcs unix_funcs = { pulse_lock, @@ -1013,6 +1023,7 @@ static const struct unix_funcs unix_funcs = pulse_release_stream, pulse_read, pulse_stop, + pulse_set_volumes, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index ca764afa19d..7b5c5400a1f 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -49,6 +49,7 @@ struct pulse_stream DWORD flags; AUDCLNT_SHAREMODE share; HANDLE event; + float vol[PA_CHANNELS_MAX]; INT32 locked; UINT32 bufsize_frames, real_bufsize_bytes, period_bytes; @@ -79,5 +80,6 @@ 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); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); };

1 0

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

17 May '21

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