January 2023 - Wine-Commits

Zebediah Figura : tests: Test entry point semantics on function declarations.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: vkd3d Branch: master Commit: 68c232cfaba27d667e3741fc415f9168a6f32dee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68c232cfaba27d667e3741fc415f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 19:19:37 2021 -0500 tests: Test entry point semantics on function declarations. --- Makefile.am | 1 + tests/entry-point-semantics.shader_test | 52 +++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/Makefile.am b/Makefile.am index 959da8f5..f9199472 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ vkd3d_shader_tests = \ tests/cbuffer.shader_test \ tests/compute.shader_test \ tests/conditional.shader_test \ + tests/entry-point-semantics.shader_test \ tests/exp.shader_test \ tests/floor.shader_test \ tests/frac.shader_test \ diff --git a/tests/entry-point-semantics.shader_test b/tests/entry-point-semantics.shader_test new file mode 100644 index 00000000..a32a0e7b --- /dev/null +++ b/tests/entry-point-semantics.shader_test @@ -0,0 +1,52 @@ +% Test how semantics are determined when spread across the entry point's +% definition and its declarations. + +[vertex shader] +void main(out float tex : texcoord, inout float4 pos : sv_position) +{ + tex = 0.2; +} + +[pixel shader fail] + +float4 main(float tex : texcoord) : sv_target; + +float4 main(float tex) +{ + return tex; +} + +[pixel shader fail] + +float4 main(float tex) +{ + return tex; +} + +float4 main(float tex : texcoord) : sv_target; + +[pixel shader] + +float4 main(float tex : bogus) : bogus; + +float4 main(float tex : texcoord) : sv_target +{ + return tex; +} + +[test] +draw quad +probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2) + +[pixel shader] + +float4 main(float tex : texcoord) : sv_target +{ + return tex; +} + +float4 main(float tex : bogus) : bogus; + +[test] +draw quad +probe (0, 0) rgba (0.2, 0.2, 0.2, 0.2)

1 0

Zebediah Figura : tests: Add some tests for early return from user-defined functions.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: vkd3d Branch: master Commit: 7460d7adc2633b03c7fed8deeedbe9db883fd5dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7460d7adc2633b03c7fed8deeedbe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 15:48:02 2021 -0500 tests: Add some tests for early return from user-defined functions. --- Makefile.am | 1 + tests/function-return.shader_test | 315 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 316 insertions(+) diff --git a/Makefile.am b/Makefile.am index a2625a5c..a8f91ca4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,7 @@ vkd3d_shader_tests = \ tests/exp.shader_test \ tests/floor.shader_test \ tests/frac.shader_test \ + tests/function-return.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-attributes.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/function-return.shader_test b/tests/function-return.shader_test new file mode 100644 index 00000000..32fd01f9 --- /dev/null +++ b/tests/function-return.shader_test @@ -0,0 +1,315 @@ +% Test early return from a user-defined function. + +[pixel shader todo] + +float func(out float o) +{ + o = 0.1; + return 0.2; + o = 0.3; + return 0.4; +} + +void func2(out float o) +{ + o = 0.5; + return; + o = 0.6; +} + +float4 main() : sv_target +{ + float4 ret; + + ret.z = 0.7; + ret.x = func(ret.y); + func2(ret.w); + ret.z = 0.8; + return ret; +} + +[test] +todo draw quad +probe all rgba (0.2, 0.1, 0.8, 0.5); + +[pixel shader todo] + +uniform float f; + +float func(out float o) +{ + o = 0.1; + if (f < 0.3) + { + return 0.2; + o = 0.3; + } + else if (f < 0.7) + { + o = 0.4; + return 0.5; + } + o = 0.6; + return 0.7; +} + +float func2(out float o) +{ + o = 0.1; + if (f < 0.5) + { + o = 0.2; + } + else + { + o = 0.4; + return 0.3; + } + return 0.5; +} + +float4 main() : sv_target +{ + float4 ret; + + ret.x = func(ret.y); + ret.z = func2(ret.w); + ret += 0.1; + return ret; +} + +[test] +uniform 0 float 0.1 +todo draw quad +probe all rgba (0.3, 0.2, 0.6, 0.3) 1 +uniform 0 float 0.4 +todo draw quad +probe all rgba (0.6, 0.5, 0.6, 0.3) 1 +uniform 0 float 0.6 +todo draw quad +probe all rgba (0.6, 0.5, 0.4, 0.5) 1 +uniform 0 float 0.8 +todo draw quad +probe all rgba (0.8, 0.7, 0.4, 0.5) 1 + +[pixel shader todo] + +uniform float f; + +float func(out float o) +{ + o = 0.1; + if (f < 0.3) + { + return 0.2; + } + o += 0.3; + if (f < 0.7) + { + return 0.5; + } + o += 0.5; + return 1.0; +} + +float func2(out float o) +{ + o = 0.1; + if (f < 0.7) + { + if (f < 0.3) + return 0.2; + o += 0.3; + } + o += 0.5; + return 1.0; +} + +float4 main() : sv_target +{ + float4 ret; + + ret.x = func(ret.y); + ret.z = func2(ret.w); + return ret; +} + +[test] +uniform 0 float 0.1 +todo draw quad +probe all rgba (0.2, 0.1, 0.2, 0.1) 1 +uniform 0 float 0.5 +todo draw quad +probe all rgba (0.5, 0.4, 1.0, 0.9) 1 +uniform 0 float 0.9 +todo draw quad +probe all rgba (1.0, 0.9, 1.0, 0.6) 1 + +[pixel shader todo] + +float func(out float o) +{ + o = 0.1; + for (;;) + { + o *= 2; + return 0.3; + o *= 3; + } + o = 0; + return 0.4; +} + +float func2(out float o) +{ + o = 0.1; + for (;;) + { + if (o > 0.5) + return 0.2; + o *= 2; + } + o = 0; + return 0.3; +} + +float4 main() : sv_target +{ + float4 ret; + + ret.x = func(ret.y); + ret.z = func2(ret.w); + ret += 0.1; + return ret; +} + +[test] +todo draw quad +probe all rgba (0.4, 0.3, 0.3, 0.9) 1 + +[pixel shader todo] + +uniform float f; + +float func(out float o) +{ + int i; + + o = 0.1; + for (i = 0; i < 4; ++i) + { + if (o > f) + return 0.2; + o *= 2; + } + o = 0; + return 0.3; +} + +float func2(out float o) +{ + if (f < 0.5) + { + o = 0.1; + for (;;) + { + o *= 2; + return 0.2; + } + o *= 3; + return 0.3; + } + else + { + o = 0.4; + } + o = 0.5; + return 0.6; +} + +float4 main() : sv_target +{ + float4 ret; + + ret.x = func(ret.y); + ret.z = func2(ret.w); + ret += 0.1; + return ret; +} + +[test] +uniform 0 float 0.0 +todo draw quad +probe all rgba (0.3, 0.2, 0.3, 0.3) 1 + +uniform 0 float 0.1 +todo draw quad +probe all rgba (0.3, 0.3, 0.3, 0.3) 1 + +uniform 0 float 0.3 +todo draw quad +probe all rgba (0.3, 0.5, 0.3, 0.3) 1 + +uniform 0 float 0.7 +todo draw quad +probe all rgba (0.3, 0.9, 0.7, 0.6) 1 + +uniform 0 float 0.9 +todo draw quad +probe all rgba (0.4, 0.1, 0.7, 0.6) 1 + +[pixel shader todo] + +uniform float4 f[3]; + +float func(out float o) +{ + int i, j; + + o = 0.1; + for (i = 0; i < 3; ++i) + { + for (j = 0; j < 3; ++j) + { + if (o > f[j].x) + return 0.2; + } + o *= 2; + } + o = 0; + return 0.3; +} + +float4 main() : sv_target +{ + float4 ret; + + ret.x = func(ret.y); + ret.zw = 0.5; + ret += 0.1; + return ret; +} + +[test] + +uniform 0 float4 0.3 0.0 0.0 0.0 +uniform 4 float4 0.0 0.0 0.0 0.0 +uniform 8 float4 0.1 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.3, 0.2, 0.6, 0.6) 1 + +uniform 4 float4 0.35 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.3, 0.3, 0.6, 0.6) 1 + +uniform 8 float4 0.5 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.3, 0.5, 0.6, 0.6) 1 + +uniform 0 float4 1.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.3, 0.5, 0.6, 0.6) 1 + +uniform 4 float4 2.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.4, 0.1, 0.6, 0.6) 1

1 0

Zebediah Figura : tests: Add more tests for early return from the entry point.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: vkd3d Branch: master Commit: 4954c363477c1537cd6974ade72c5b5ac53cb715 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4954c363477c1537cd6974ade72c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 16:07:31 2021 -0500 tests: Add more tests for early return from the entry point. --- Makefile.am | 2 +- tests/hlsl-return-void.shader_test | 11 -- tests/return.shader_test | 263 +++++++++++++++++++++++++++++++++++++ 3 files changed, 264 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index a8f91ca4..959da8f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,7 +102,6 @@ vkd3d_shader_tests = \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-numthreads.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ - tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ tests/hlsl-single-numeric-initializer.shader_test \ tests/hlsl-smoothstep.shader_test \ @@ -130,6 +129,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/return.shader_test \ tests/round.shader_test \ tests/sampler.shader_test \ tests/sampler-offset.shader_test \ diff --git a/tests/hlsl-return-void.shader_test b/tests/hlsl-return-void.shader_test deleted file mode 100644 index d7231d6c..00000000 --- a/tests/hlsl-return-void.shader_test +++ /dev/null @@ -1,11 +0,0 @@ -[pixel shader] -void main(out float4 ret : sv_target) -{ - ret = float4(0.1, 0.2, 0.3, 0.4); - return; - ret = float4(0.5, 0.6, 0.7, 0.8); -} - -[test] -draw quad -todo probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/return.shader_test b/tests/return.shader_test new file mode 100644 index 00000000..e913d15d --- /dev/null +++ b/tests/return.shader_test @@ -0,0 +1,263 @@ +% Test early return from the entry point. + +[pixel shader] + +float4 main() : sv_target +{ + return float4(0.1, 0.2, 0.3, 0.4); + return float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) + +[pixel shader] + +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + return; + ret = float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) + +[pixel shader] + +uniform float f; + +float4 main() : sv_target +{ + if (f < 0.5) + return float4(0.1, 0.2, 0.3, 0.4); + return float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +uniform 0 float 0.2 +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) +uniform 0 float 0.8 +draw quad +probe all rgba (0.5, 0.6, 0.7, 0.8) + +[pixel shader] + +uniform float f; + +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + if (f < 0.5) + { + ret += 0.1; + } + else + { + return; + ret += 0.3; + } + ret += 0.1; +} + +[test] +uniform 0 float 0.2 +draw quad +probe all rgba (0.3, 0.4, 0.5, 0.6) +uniform 0 float 0.8 +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) + +[pixel shader] + +uniform float f; + +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + if (f < 0.3) + { + return; + } + ret += 0.1; + if (f < 0.7) + { + return; + } + ret += 0.3; +} + +[test] +uniform 0 float 0.1 +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) 1 +uniform 0 float 0.5 +draw quad +todo probe all rgba (0.2, 0.3, 0.4, 0.5) 1 +uniform 0 float 0.9 +draw quad +probe all rgba (0.5, 0.6, 0.7, 0.8) 1 + +[pixel shader] + +uniform float f; + +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + if (f < 0.7) + { + if (f < 0.3) + return; + ret += 0.1; + } + ret += 0.3; +} + +[test] +uniform 0 float 0.1 +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) 1 +uniform 0 float 0.5 +draw quad +probe all rgba (0.5, 0.6, 0.7, 0.8) 1 +uniform 0 float 0.9 +draw quad +probe all rgba (0.4, 0.5, 0.6, 0.7) 1 + +[pixel shader todo] + +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + for (;;) + { + ret *= 2; + return; + ret *= 3; + } + ret += 0.1; +} + +[test] +todo draw quad +todo probe all rgba (0.2, 0.4, 0.6, 0.8) + +[pixel shader] + +uniform float f; + +void main(out float4 ret : sv_target) +{ + int i; + + ret = 0.1; + for (i = 0; i < 4; ++i) + { + if (ret.x > f) + return; + ret *= 2; + } + ret = 0.9; +} + +[test] +uniform 0 float 0.0 +draw quad +todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1 + +uniform 0 float 0.1 +draw quad +todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1 + +uniform 0 float 0.3 +draw quad +todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 + +uniform 0 float 0.7 +draw quad +todo probe all rgba (0.8, 0.8, 0.8, 0.8) 1 + +uniform 0 float 0.9 +draw quad +todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1 + +[pixel shader todo] + +uniform float f; + +void main(out float4 ret : sv_target) +{ + if (f < 0.5) + { + ret = 0.1; + for (;;) + { + ret *= 2; + return; + } + ret *= 3; + return; + } + else + { + ret = 0.4; + } + ret = 0.5; +} + +[test] +uniform 0 float 0.2 +todo draw quad +todo probe all rgba (0.2, 0.2, 0.2, 0.2) +uniform 0 float 0.8 +todo draw quad +todo probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader todo] + +uniform float4 f[3]; + +void main(out float4 ret : sv_target) +{ + int i, j; + + ret = 0.1; + for (i = 0; i < 3; ++i) + { + for (j = 0; j < 3; ++j) + { + if (ret.x > f[j].x) + return; + } + ret *= 2; + } + ret = 0.9; +} + +[test] + +uniform 0 float4 0.3 0.0 0.0 0.0 +uniform 4 float4 0.0 0.0 0.0 0.0 +uniform 8 float4 0.1 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1 + +uniform 4 float4 0.35 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1 + +uniform 8 float4 0.5 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 + +uniform 0 float4 1.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 + +uniform 4 float4 2.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1

1 0

Zebediah Figura : vkd3d-shader/hlsl: Emit a hlsl_fixme() for HLSL_IR_CALL instructions.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: vkd3d Branch: master Commit: aa3badbd9d17225bb84ca5f03aa87f0eb0954b64 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aa3badbd9d17225bb84ca5f03aa87… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 30 13:29:17 2023 -0600 vkd3d-shader/hlsl: Emit a hlsl_fixme() for HLSL_IR_CALL instructions. Avoid outputting invalid shaders. --- libs/vkd3d-shader/hlsl_sm1.c | 4 +++ libs/vkd3d-shader/hlsl_sm4.c | 4 +++ tests/hlsl-function.shader_test | 8 ++--- tests/hlsl-numthreads.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 40 +++++++++++------------ tests/hlsl-static-initializer.shader_test | 4 +-- tests/hlsl-storage-qualifiers.shader_test | 4 +-- tests/uav-out-param.shader_test | 4 +-- 8 files changed, 39 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index a66d4028..facf81b8 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -824,6 +824,10 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b switch (instr->type) { + case HLSL_IR_CALL: + hlsl_fixme(ctx, &instr->loc, "Inline call instructions.\n"); + break; + case HLSL_IR_CONSTANT: write_sm1_constant(ctx, buffer, instr); break; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index af59b7c7..fb14889d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2360,6 +2360,10 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * switch (instr->type) { + case HLSL_IR_CALL: + hlsl_fixme(ctx, &instr->loc, "Inline call instructions.\n"); + break; + case HLSL_IR_CONSTANT: write_sm4_constant(ctx, buffer, hlsl_ir_constant(instr)); break; diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index eee6f2d1..e3ed5819 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -118,7 +118,7 @@ void func() { } -[pixel shader] +[pixel shader todo] float func(in float a, out float b, inout float c) { @@ -139,10 +139,10 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.5, 0.6, 0.7, 0) -[pixel shader] +[pixel shader todo] void func(in float a, inout float2 b) { @@ -160,7 +160,7 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.6, 0.1, 0.5, 0) % Recursion is forbidden. diff --git a/tests/hlsl-numthreads.shader_test b/tests/hlsl-numthreads.shader_test index 404d7d76..0d75a924 100644 --- a/tests/hlsl-numthreads.shader_test +++ b/tests/hlsl-numthreads.shader_test @@ -153,7 +153,7 @@ static int x = 1; [numthreads((x = 2), 1, 1)] void main() {} -[compute shader] +[compute shader todo] static int x = 1; diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test index e88a4109..a58d015d 100644 --- a/tests/hlsl-return-implicit-conversion.shader_test +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -38,7 +38,7 @@ float4x1 main() : sv_target draw quad probe all rgba (0.4, 0.3, 0.2, 0.1) -[pixel shader] +[pixel shader todo] float3 func() { return float3x1(0.4, 0.3, 0.2); @@ -50,10 +50,10 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader] +[pixel shader todo] float3 func() { return float1x3(0.4, 0.3, 0.2); @@ -65,10 +65,10 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader] +[pixel shader todo] float1x3 func() { return float3(0.4, 0.3, 0.2); @@ -80,10 +80,10 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader] +[pixel shader todo] float3x1 func() { return float3(0.4, 0.3, 0.2); @@ -95,7 +95,7 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] @@ -120,7 +120,7 @@ float4 main() : sv_target return float4(func(), 0.0); } -[pixel shader] +[pixel shader todo] float3 func() { return float4(0.4, 0.3, 0.2, 0.1); @@ -132,10 +132,10 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader] +[pixel shader todo] float3 func() { return float4x1(0.4, 0.3, 0.2, 0.1); @@ -147,10 +147,10 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader] +[pixel shader todo] float3 func() { return float1x4(0.4, 0.3, 0.2, 0.1); @@ -162,7 +162,7 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail todo] @@ -176,7 +176,7 @@ float4 main() : sv_target return float4(func(), 0.0); } -[pixel shader] +[pixel shader todo] float3x1 func() { return float4x1(0.4, 0.3, 0.2, 0.1); @@ -188,7 +188,7 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] @@ -202,7 +202,7 @@ float4 main() : sv_target return float4(func(), 0.0); } -[pixel shader] +[pixel shader todo] float1x3 func() { return float4(0.4, 0.3, 0.2, 0.1); @@ -214,7 +214,7 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) [pixel shader fail] @@ -228,7 +228,7 @@ float4 main() : sv_target return float4(func(), 0.0); } -[pixel shader] +[pixel shader todo] float1x3 func() { return float1x4(0.4, 0.3, 0.2, 0.1); @@ -240,5 +240,5 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.4, 0.3, 0.2, 0.0) diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test index 6dc874f9..286145c4 100644 --- a/tests/hlsl-static-initializer.shader_test +++ b/tests/hlsl-static-initializer.shader_test @@ -1,4 +1,4 @@ -[pixel shader] +[pixel shader todo] float myfunc() { return 0.6; @@ -12,7 +12,7 @@ float4 main() : sv_target } [test] -draw quad +todo draw quad todo probe all rgba (0.8, 0.0, 0.0, 0.0) diff --git a/tests/hlsl-storage-qualifiers.shader_test b/tests/hlsl-storage-qualifiers.shader_test index 59066c5f..965101e8 100644 --- a/tests/hlsl-storage-qualifiers.shader_test +++ b/tests/hlsl-storage-qualifiers.shader_test @@ -1,4 +1,4 @@ -[pixel shader] +[pixel shader todo] void sub2(in uniform float4 i, out float4 o) { o = i; @@ -17,5 +17,5 @@ void main(in uniform float4 a, uniform float4 b, out float4 o : sv_target) [test] uniform 0 float4 0.1 0.0 0.0 0.0 uniform 4 float4 0.2 0.0 0.0 0.0 -draw quad +todo draw quad todo probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/uav-out-param.shader_test b/tests/uav-out-param.shader_test index 054a2da6..646d14f6 100644 --- a/tests/uav-out-param.shader_test +++ b/tests/uav-out-param.shader_test @@ -7,7 +7,7 @@ size (1, 1) 0.1 0.2 0.3 0.4 -[compute shader] +[compute shader todo] RWTexture2D<float4> u; @@ -23,5 +23,5 @@ void main() } [test] -dispatch 1 1 1 +todo dispatch 1 1 1 todo probe uav 0 (0, 0) rgba (0.1, 0.3, 0.3, 0.5)

1 0

Alexandre Julliard : wow64cpu: Move base address to leave more room for wow64.dll.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 6c75cddb9851095694dfa397870919d4cc70d3ef URL: https://gitlab.winehq.org/wine/wine/-/commit/6c75cddb9851095694dfa397870919… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 22:12:30 2023 +0100 wow64cpu: Move base address to leave more room for wow64.dll. --- dlls/wow64cpu/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in index 0bf3c35ab3b..a4a43fc85cd 100644 --- a/dlls/wow64cpu/Makefile.in +++ b/dlls/wow64cpu/Makefile.in @@ -1,6 +1,6 @@ MODULE = wow64cpu.dll IMPORTS = wow64 ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f100000 +EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f400000 C_SRCS = cpu.c

1 0

Eric Pouech : include: Use stream to denote MSF stream/file.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 9a74d2b62f372dbfa07d54e838aa6597b4cabeb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a74d2b62f372dbfa07d54e838aa65… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 31 17:29:04 2023 +0100 include: Use stream to denote MSF stream/file. Try to apply consistent naming: - file refers to (PDB) file - stream refers to a stream/file inside the PDB stream at MSF level (we were also using file for the later, which isn't very simple to follow). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 142 +++++++++++++++--------------- include/wine/mscvpdb.h | 69 ++++++++------- tools/winedump/pdb.c | 230 ++++++++++++++++++++++++------------------------- 3 files changed, 220 insertions(+), 221 deletions(-)

1 0

Eric Pouech : include: Be consistent in naming regarding MSF's block.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 71abef09065c33c13cbd30b0f3369ab59cab1747 URL: https://gitlab.winehq.org/wine/wine/-/commit/71abef09065c33c13cbd30b0f3369a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 31 17:28:59 2023 +0100 include: Be consistent in naming regarding MSF's block. No longer calling it sometimes 'page'. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 2 +- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 9debc34e77c..1b998ab5e36 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3555,7 +3555,7 @@ static BOOL pdb_init(const struct pdb_lookup* pdb_lookup, struct pdb_file_info* struct PDB_DS_ROOT* root; pdb_file->u.ds.toc = - pdb_ds_read(pdb, (const UINT*)((const char*)pdb + pdb->toc_page * pdb->block_size), + pdb_ds_read(pdb, (const UINT*)((const char*)pdb + pdb->toc_block * pdb->block_size), pdb->toc_size); root = pdb_read_ds_file(pdb, pdb_file->u.ds.toc, 1); if (!root) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 90adc3ee465..7e3af84034f 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2398,10 +2398,10 @@ struct PDB_DS_HEADER char signature[32]; unsigned int block_size; unsigned int unknown1; - unsigned int num_pages; + unsigned int num_blocks; unsigned int toc_size; unsigned int unknown2; - unsigned int toc_page; + unsigned int toc_block; }; struct PDB_JG_TOC diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index ab844fd8555..0060d9d48be 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -1120,7 +1120,7 @@ static BOOL pdb_ds_init(struct pdb_reader* reader) if (!reader->u.ds.header) return FALSE; reader->read_file = pdb_ds_read_file; reader->u.ds.toc = pdb_ds_read(reader->u.ds.header, - (const UINT *)((const char*)reader->u.ds.header + reader->u.ds.header->toc_page * reader->u.ds.header->block_size), + (const UINT *)((const char*)reader->u.ds.header + reader->u.ds.header->toc_block * reader->u.ds.header->block_size), reader->u.ds.header->toc_size); memset(reader->file_used, 0, sizeof(reader->file_used)); return TRUE; @@ -1137,20 +1137,20 @@ static void pdb_ds_dump(void) "\tsignature: %.*s\n" "\tblock_size: %08x\n" "\tunknown1: %08x\n" - "\tnum_pages: %08x\n" + "\tnum_blocks: %08x\n" "\ttoc_size: %08x\n" "\tunknown2: %08x\n" - "\ttoc_page: %08x\n", + "\ttoc_block: %08x\n", (int)sizeof(pdb7) - 1, reader.u.ds.header->signature, reader.u.ds.header->block_size, reader.u.ds.header->unknown1, - reader.u.ds.header->num_pages, + reader.u.ds.header->num_blocks, reader.u.ds.header->toc_size, reader.u.ds.header->unknown2, - reader.u.ds.header->toc_page); + reader.u.ds.header->toc_block); /* files with static indexes: - * 0: JG says old toc pages + * 0: JG says old toc blocks * 1: root structure * 2: types * 3: modules

1 0

Rémi Bernon : win32u/tests: Test NtUserGetPointerInfoList syscall signature.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: d970584b6240e73e2568471939235ae79850b540 URL: https://gitlab.winehq.org/wine/wine/-/commit/d970584b6240e73e2568471939235a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 28 10:35:54 2023 +0100 win32u/tests: Test NtUserGetPointerInfoList syscall signature. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53847 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51537 --- dlls/win32u/tests/win32u.c | 252 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+)

1 0

Eric Pouech : include: Consistenly use _size to name the size of a sub-block.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 26f89d84e257d19787e8941198f09af0e2332923 URL: https://gitlab.winehq.org/wine/wine/-/commit/26f89d84e257d19787e8941198f09a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 31 17:29:02 2023 +0100 include: Consistenly use _size to name the size of a sub-block. We were using either _size or _len depending on which one. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 18 +++++++------- include/wine/mscvpdb.h | 12 +++++----- tools/winedump/pdb.c | 64 +++++++++++++++++++++++++------------------------- 3 files changed, 47 insertions(+), 47 deletions(-)

1 0

Eric Pouech : include: Update some fields in PDB headers.
by Alexandre Julliard Jan. 31, 2023

Jan. 31, 2023

Module: wine Branch: master Commit: 27f3676cfc6d821de82bf104c1fc5b4b745b02a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/27f3676cfc6d821de82bf104c1fc5b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 31 17:29:01 2023 +0100 include: Update some fields in PDB headers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 7e3af84034f..10d1438e0ea 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2387,7 +2387,7 @@ struct PDB_JG_HEADER char ident[40]; unsigned int signature; unsigned int block_size; - unsigned short free_list; + unsigned short free_list_block; unsigned short total_alloc; struct PDB_FILE toc; unsigned short toc_block[1]; @@ -2397,7 +2397,7 @@ struct PDB_DS_HEADER { char signature[32]; unsigned int block_size; - unsigned int unknown1; + unsigned int free_list_block; unsigned int num_blocks; unsigned int toc_size; unsigned int unknown2; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 0060d9d48be..3bf4f7a0606 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -997,15 +997,15 @@ static void pdb_jg_dump(void) */ pdb_jg_init(&reader); printf("Header (JG):\n" - "\tident: %.*s\n" - "\tsignature: %08x\n" - "\tblock_size: %08x\n" - "\tfree_list: %04x\n" - "\ttotal_alloc:%04x\n", + "\tident: %.*s\n" + "\tsignature: %08x\n" + "\tblock_size: %08x\n" + "\tfree_list_block: %04x\n" + "\ttotal_alloc: %04x\n", (int)sizeof(pdb2) - 1, reader.u.jg.header->ident, reader.u.jg.header->signature, reader.u.jg.header->block_size, - reader.u.jg.header->free_list, + reader.u.jg.header->free_list_block, reader.u.jg.header->total_alloc); reader.u.jg.root = reader.read_file(&reader, 1); @@ -1136,14 +1136,14 @@ static void pdb_ds_dump(void) printf("Header (DS)\n" "\tsignature: %.*s\n" "\tblock_size: %08x\n" - "\tunknown1: %08x\n" + "\tfree_list_block: %08x\n" "\tnum_blocks: %08x\n" "\ttoc_size: %08x\n" "\tunknown2: %08x\n" "\ttoc_block: %08x\n", (int)sizeof(pdb7) - 1, reader.u.ds.header->signature, reader.u.ds.header->block_size, - reader.u.ds.header->unknown1, + reader.u.ds.header->free_list_block, reader.u.ds.header->num_blocks, reader.u.ds.header->toc_size, reader.u.ds.header->unknown2,

1 0