April 2022 - Wine-commits - list.winehq.org

Giovanni Mascellani : vkd3d-shader/hlsl: Test the INT_MIN / -1 constant folding special case.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: vkd3d Branch: master Commit: 6b6ff48ece4320103f78ef4e6be5eb98b32bbafe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b6ff48ece4320103f78ef4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 27 10:56:21 2022 +0200 vkd3d-shader/hlsl: Test the INT_MIN / -1 constant folding special case. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/arithmetic-int.shader_test | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index c2eee2ba..8b6d6d7c 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -41,3 +41,19 @@ float4 main() : SV_TARGET return x % y; } + +[require] +shader model >= 4.0 + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = -2147483648; + int y = -1; + + return x / y; +} + +[test] +draw quad +probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Do not generate useless swizzles.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: vkd3d Branch: master Commit: c5c50a8b9bc7e3bcbb5caabb24b44ced59d0eb70 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c5c50a8b9bc7e3bcbb5caab… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 27 10:56:22 2022 +0200 vkd3d-shader/hlsl: Do not generate useless swizzles. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f31bfe9f..5f1d5997 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -246,6 +246,7 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v && src_type->type <= HLSL_CLASS_VECTOR && dst_type->type <= HLSL_CLASS_VECTOR && src_type->dimx == 1) { + struct hlsl_ir_node *replacement; struct hlsl_ir_swizzle *swizzle; struct hlsl_ir_expr *new_cast; @@ -255,11 +256,17 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v if (!(new_cast = hlsl_new_cast(ctx, cast->operands[0].node, dst_scalar_type, &cast->node.loc))) return false; list_add_after(&cast->node.entry, &new_cast->node.entry); - if (!(swizzle = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, X, X, X), dst_type->dimx, &new_cast->node, &cast->node.loc))) - return false; - list_add_after(&new_cast->node.entry, &swizzle->node.entry); + replacement = &new_cast->node; - hlsl_replace_node(&cast->node, &swizzle->node); + if (dst_type->dimx != 1) + { + if (!(swizzle = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, X, X, X), dst_type->dimx, replacement, &cast->node.loc))) + return false; + list_add_after(&new_cast->node.entry, &swizzle->node.entry); + replacement = &swizzle->node; + } + + hlsl_replace_node(&cast->node, replacement); return true; }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Simplify flow in add_array_load().
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: vkd3d Branch: master Commit: e2b4f01a9fa627d1fc533c27a93a8214c1466bc1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e2b4f01a9fa627d1fc533c2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 27 10:56:23 2022 +0200 vkd3d-shader/hlsl: Simplify flow in add_array_load(). Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 291f8392..968f36ae 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -587,13 +587,18 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls const struct hlsl_type *expr_type = array->data_type; struct hlsl_type *data_type; struct hlsl_ir_constant *c; - struct hlsl_ir_node *mul; if (expr_type->type == HLSL_CLASS_ARRAY) { data_type = expr_type->e.array.type; + if (!(c = hlsl_new_uint_constant(ctx, hlsl_type_get_array_element_reg_size(data_type), &loc))) return false; + list_add_tail(instrs, &c->node.entry); + + if (!(index = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) + return false; + list_add_tail(instrs, &index->entry); } else if (expr_type->type == HLSL_CLASS_MATRIX) { @@ -604,8 +609,6 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls else if (expr_type->type == HLSL_CLASS_VECTOR) { data_type = hlsl_get_scalar_type(ctx, expr_type->base_type); - if (!(c = hlsl_new_uint_constant(ctx, 1, &loc))) - return false; } else { @@ -616,12 +619,6 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls return false; } - list_add_tail(instrs, &c->node.entry); - if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, index, &c->node))) - return false; - list_add_tail(instrs, &mul->entry); - index = mul; - return !!add_load(ctx, instrs, array, index, data_type, loc); }

1 0

Francisco Casas : vkd3d-shader/hlsl: Support all complex initalizers.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: vkd3d Branch: master Commit: 246ff145110672b8de1c374335162dd0466687ad URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=246ff145110672b8de1c374… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Apr 27 10:56:24 2022 +0200 vkd3d-shader/hlsl: Support all complex initalizers. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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.c | 79 +++++++++++++ libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 123 ++++++--------------- libs/vkd3d-shader/hlsl_codegen.c | 2 +- tests/hlsl-initializer-flatten.shader_test | 10 +- .../hlsl-initializer-invalid-arg-count.shader_test | 4 +- tests/hlsl-initializer-local-array.shader_test | 4 +- tests/hlsl-initializer-nested.shader_test | 4 +- tests/hlsl-initializer-static-array.shader_test | 4 +- tests/hlsl-initializer-struct.shader_test | 6 +- 10 files changed, 129 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=246ff145110672b8de1…

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Support matrix indexing.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: vkd3d Branch: master Commit: ff3ec5d4a54c4504c7cbf5c82ec535a74babb0a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ff3ec5d4a54c4504c7cbf5c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 27 10:56:25 2022 +0200 vkd3d-shader/hlsl: Support matrix indexing. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(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 | 91 ++++++++++++++++++++++++++++++- tests/hlsl-initializer-matrix.shader_test | 8 +-- tests/hlsl-matrix-indexing.shader_test | 8 +-- 3 files changed, 96 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d67ffb79..9eb007a3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -581,6 +581,93 @@ static bool add_record_load(struct hlsl_ctx *ctx, struct list *instrs, struct hl return !!add_load(ctx, instrs, record, &c->node, field->type, loc); } +static struct hlsl_ir_expr *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + const struct vkd3d_shader_location *loc); + +static struct hlsl_ir_node *add_matrix_scalar_load(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *matrix, struct hlsl_ir_node *x, struct hlsl_ir_node *y, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *major, *minor; + struct hlsl_ir_expr *mul, *add; + struct hlsl_ir_constant *four; + struct hlsl_ir_load *load; + struct hlsl_type *type = matrix->data_type, *scalar_type; + + scalar_type = hlsl_get_scalar_type(ctx, type->base_type); + + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + { + minor = x; + major = y; + } + else + { + minor = y; + major = x; + } + + if (!(four = hlsl_new_uint_constant(ctx, 4, loc))) + return NULL; + list_add_tail(instrs, &four->node.entry); + + if (!(mul = add_binary_arithmetic_expr(ctx, instrs, HLSL_OP2_MUL, &four->node, major, loc))) + return NULL; + + if (!(add = add_binary_arithmetic_expr(ctx, instrs, HLSL_OP2_ADD, &mul->node, minor, loc))) + return NULL; + + if (!(load = add_load(ctx, instrs, matrix, &add->node, scalar_type, *loc))) + return NULL; + + return &load->node; +} + +static bool add_matrix_index(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *matrix, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *mat_type = matrix->data_type, *ret_type; + struct vkd3d_string_buffer *name; + static unsigned int counter = 0; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + unsigned int i; + + ret_type = hlsl_get_vector_type(ctx, mat_type->base_type, mat_type->dimx); + + name = vkd3d_string_buffer_get(&ctx->string_buffers); + vkd3d_string_buffer_printf(name, "<index-%u>", counter++); + var = hlsl_new_synthetic_var(ctx, name->buffer, ret_type, *loc); + vkd3d_string_buffer_release(&ctx->string_buffers, name); + if (!var) + return false; + + for (i = 0; i < mat_type->dimx; ++i) + { + struct hlsl_ir_store *store; + struct hlsl_ir_node *value; + struct hlsl_ir_constant *c; + + if (!(c = hlsl_new_uint_constant(ctx, i, loc))) + return false; + list_add_tail(instrs, &c->node.entry); + + if (!(value = add_matrix_scalar_load(ctx, instrs, matrix, &c->node, index, loc))) + return false; + + if (!(store = hlsl_new_store(ctx, var, &c->node, value, 0, *loc))) + return false; + list_add_tail(instrs, &store->node.entry); + } + + if (!(load = hlsl_new_var_load(ctx, var, *loc))) + return false; + list_add_tail(instrs, &load->node.entry); + + return true; +} + static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location loc) { @@ -602,9 +689,7 @@ static bool add_array_load(struct hlsl_ctx *ctx, struct list *instrs, struct hls } else if (expr_type->type == HLSL_CLASS_MATRIX) { - /* This needs to be lowered now, while we still have type information. */ - FIXME("Index of matrix type.\n"); - return false; + return add_matrix_index(ctx, instrs, array, index, &loc); } else if (expr_type->type == HLSL_CLASS_VECTOR) { diff --git a/tests/hlsl-initializer-matrix.shader_test b/tests/hlsl-initializer-matrix.shader_test index c4fafea7..790d402d 100644 --- a/tests/hlsl-initializer-matrix.shader_test +++ b/tests/hlsl-initializer-matrix.shader_test @@ -6,7 +6,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (21, 22, 23, 0) @@ -18,7 +18,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (21, 22, 23, 0) @@ -30,7 +30,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (21, 22, 23, 24) @@ -42,7 +42,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (21, 22, 31, 32) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index 8057179e..a0a89829 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -11,7 +11,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float4 9.0 10.0 11.0 12.0 uniform 12 float4 13.0 14.0 15.0 16.0 -todo draw quad +draw quad probe all rgba (1.0, 2.0, 10.0, 15.0) [pixel shader] @@ -27,7 +27,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float4 9.0 10.0 11.0 12.0 uniform 12 float4 13.0 14.0 15.0 16.0 -todo draw quad +draw quad probe all rgba (1.0, 2.0, 10.0, 15.0) [pixel shader] @@ -43,7 +43,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0 uniform 4 float4 5.0 6.0 7.0 8.0 uniform 8 float4 9.0 10.0 11.0 12.0 uniform 12 float4 13.0 14.0 15.0 16.0 -todo draw quad +draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) [pixel shader] @@ -58,5 +58,5 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 2.0 3.0 0.0 uniform 4 float4 5.0 6.0 7.0 0.0 -todo draw quad +draw quad probe all rgba (1.0, 3.0, 6.0, 7.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse matrix constructors.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: vkd3d Branch: master Commit: cf7cf05cb7c73a4ebfba958c025fe8051fce7fb5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf7cf05cb7c73a4ebfba958… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 27 10:56:26 2022 +0200 vkd3d-shader/hlsl: Parse matrix constructors. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 25 ++-------------------- tests/hlsl-matrix-indexing.shader_test | 16 ++++++++++++++ ...hlsl-numeric-constructor-truncation.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 8 +++---- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9eb007a3..905dbfc5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2024,16 +2024,12 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type, struct parse_initializer *params, struct vkd3d_shader_location loc) { - unsigned int i, writemask_offset = 0; - struct hlsl_ir_store *store; static unsigned int counter; struct hlsl_ir_load *load; struct hlsl_ir_var *var; + unsigned int i, idx = 0; char name[23]; - if (type->type == HLSL_CLASS_MATRIX) - hlsl_fixme(ctx, &loc, "Matrix constructor."); - sprintf(name, "<constructor-%x>", counter++); if (!(var = hlsl_new_synthetic_var(ctx, name, type, loc))) return NULL; @@ -2041,7 +2037,6 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type for (i = 0; i < params->args_count; ++i) { struct hlsl_ir_node *arg = params->args[i]; - unsigned int width; if (arg->data_type->type == HLSL_CLASS_OBJECT) { @@ -2053,24 +2048,8 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type hlsl_release_string_buffer(ctx, string); continue; } - width = hlsl_type_component_count(arg->data_type); - - if (width > 4) - { - FIXME("Constructor argument with %u components.\n", width); - continue; - } - - if (!(arg = add_implicit_conversion(ctx, params->instrs, arg, - hlsl_get_vector_type(ctx, type->base_type, width), &arg->loc))) - continue; - - if (!(store = hlsl_new_store(ctx, var, NULL, arg, - ((1u << width) - 1) << writemask_offset, arg->loc))) - return NULL; - list_add_tail(params->instrs, &store->node.entry); - writemask_offset += width; + initialize_var_components(ctx, params->instrs, var, &idx, arg, &loc); } if (!(load = hlsl_new_var_load(ctx, var, loc))) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index a0a89829..9336a67a 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -60,3 +60,19 @@ uniform 0 float4 1.0 2.0 3.0 0.0 uniform 4 float4 5.0 6.0 7.0 0.0 draw quad probe all rgba (1.0, 3.0, 6.0, 7.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float2x2 a = float2x2(11.0, 12.0, 13.0, 14.0); + float4x4 m = float4x4(1.0, 2.0, 3.0, 4.0, + float3(5.0, 6.0, 7.0), 8.0, + 9.0, 10.0, + a, + 15.0, 16.0); + return float4(m[0][0], m[1][0], m[1][2], m[2][3]); +} + +[test] +todo draw quad +probe all rgba (1.0, 5.0, 7.0, 12.0) diff --git a/tests/hlsl-numeric-constructor-truncation.shader_test b/tests/hlsl-numeric-constructor-truncation.shader_test index 27768dcc..f18b34d6 100644 --- a/tests/hlsl-numeric-constructor-truncation.shader_test +++ b/tests/hlsl-numeric-constructor-truncation.shader_test @@ -29,5 +29,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 5.0) diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test index 38d21633..bf99d9cb 100644 --- a/tests/hlsl-return-implicit-conversion.shader_test +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -98,7 +98,7 @@ float4 main() : sv_target todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader fail todo] +[pixel shader fail] float3x1 func() { return float1x3(0.4, 0.3, 0.2); @@ -109,7 +109,7 @@ float4 main() : sv_target return float4(func(), 0.0); } -[pixel shader fail todo] +[pixel shader fail] float1x3 func() { return float3x1(0.4, 0.3, 0.2); @@ -191,7 +191,7 @@ float4 main() : sv_target todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader fail todo] +[pixel shader fail] float3x1 func() { return float1x4(0.4, 0.3, 0.2, 0.1); @@ -217,7 +217,7 @@ float4 main() : sv_target todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader fail todo] +[pixel shader fail] float1x3 func() { return float4x1(0.4, 0.3, 0.2, 0.1);

1 0

Zebediah Figura : configure: Allow specifying the Vulkan library path with VULKAN_LIBS.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: vkd3d Branch: master Commit: f34db84c62123f4c484a81cc0ab70aba8c55ef93 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f34db84c62123f4c484a81c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 27 11:26:06 2022 -0500 configure: Allow specifying the Vulkan library path with VULKAN_LIBS. Do not define it for the vkd3d build, but restore support for overriding it as a configure argument. This partially reverts 99a3adcc19f2a64fad630948851616f52c00d553. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52915 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 + m4/check-vulkan.m4 | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b386104a..7796ae8d 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,7 @@ case $host_os in esac AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) AS_IF([test "x$SONAME_LIBVULKAN" = "x"], [VKD3D_CHECK_VULKAN], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])]) diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 index b2c3f8a1..f651a077 100644 --- a/m4/check-vulkan.m4 +++ b/m4/check-vulkan.m4 @@ -6,7 +6,8 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],, [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])]) - ]) - ]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS]) ])

1 0

Jeremy White : Fix a bug in the new config file setup.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: tools Branch: master Commit: 9cc41efd7bcd1d3f0bc865c612befd6290d48cec URL: https://source.winehq.org/git/tools.git/?a=commit;h=9cc41efd7bcd1d3f0bc865c… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Apr 27 15:25:09 2022 -0500 Fix a bug in the new config file setup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 250f87a..dfe72e2 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -55,7 +55,7 @@ def send_email(message): with smtplib.SMTP(settings.SMTP_DOMAIN, settings.SMTP_PORT) as smtp: smtp.starttls() - if hasattr(settings, 'SMTP_USER') and hasattr(settings, 'SMTP_PASSWORD'): + if settings.SMTP_USER is not None and settings.SMTP_PASSWORD is not None: smtp.login(settings.SMTP_USER, settings.SMTP_PASSWORD) smtp.sendmail(message['From'], message['To'], encoded_message)

1 0

Jeremy White : Make the database location configurable.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: tools Branch: master Commit: 195e2f6d6f18e63b7bef4f2f9bbf88a21bf0d855 URL: https://source.winehq.org/git/tools.git/?a=commit;h=195e2f6d6f18e63b7bef4f2… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Apr 26 13:29:02 2022 -0500 Make the database location configurable. Rather than being implicity based on argv[1] Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/db.py | 7 ++++++- gitlab/gitlab-to-mail/settings_example.py | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gitlab/gitlab-to-mail/db.py b/gitlab/gitlab-to-mail/db.py index 118d3c7..472026c 100644 --- a/gitlab/gitlab-to-mail/db.py +++ b/gitlab/gitlab-to-mail/db.py @@ -1,8 +1,13 @@ from sqlalchemy import create_engine, Column, Integer, Unicode, DateTime, Date from sqlalchemy.orm import declarative_base, sessionmaker +import importlib +import os import sys +sys.path.append(os.getcwd()) +settings = importlib.import_module(f"settings_{sys.argv[1]}") + Base = declarative_base() @@ -25,7 +30,7 @@ class GlobalState(Base): integer_value = Column(Integer) -engine = create_engine(f"sqlite:///db_{sys.argv[1]}.sqlite", echo=False) +engine = create_engine(f"sqlite:///{settings.DATABASE}", echo=False) Base.metadata.create_all(engine) Session = sessionmaker(bind=engine) session = Session() diff --git a/gitlab/gitlab-to-mail/settings_example.py b/gitlab/gitlab-to-mail/settings_example.py index fca80a2..1a42216 100644 --- a/gitlab/gitlab-to-mail/settings_example.py +++ b/gitlab/gitlab-to-mail/settings_example.py @@ -1,3 +1,6 @@ +# Location of the sqlite database file, which will be auto created if not found +DATABASE= "/home/wine/example/db_example.sqlite" + # if True mails are dumped to mail_dump mbox file instead of being sent out DEBUG = False

1 0

Jeremy White : Switch to using configparser.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: tools Branch: master Commit: f34eb662ee91bf662222bee9316ed9f495cd2932 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f34eb662ee91bf662222bee… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Apr 26 15:22:17 2022 -0500 Switch to using configparser. This simply feels like a more rational way to configure these applications and will allow the runtime database to be separate from the code. NOTE: This will be a breaking change. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/README.md | 6 ++--- gitlab/gitlab-to-mail/db.py | 6 ++--- .../{settings_example.py => example.cfg} | 6 ++++- gitlab/gitlab-to-mail/gitlabtomail.py | 8 ++---- gitlab/gitlab-to-mail/gitlabtomail.service | 2 +- gitlab/gitlab-to-mail/mailtogitlab.py | 7 ++---- gitlab/gitlab-to-mail/util.py | 29 ++++++++++++++++++++++ 7 files changed, 44 insertions(+), 20 deletions(-) diff --git a/gitlab/gitlab-to-mail/README.md b/gitlab/gitlab-to-mail/README.md index 993b673..9f3f15b 100644 --- a/gitlab/gitlab-to-mail/README.md +++ b/gitlab/gitlab-to-mail/README.md @@ -1,10 +1,10 @@ # GitLab <-> Mailing List bridge ## How to use - 1. Copy `settings_example.py` and name it `setting_projectname.py`. + 1. Copy `example.cfg` and name it `projectname.cfg`. 2. Tweak the values found inside. - 3. Run `gitlabtomail.py projectname` to generate emails from gitlab changes. - 4. Run `mailtogitlab.py projectname < email` to generate gitlab changes from an email. + 3. Run `gitlabtomail.py /path/to/projectname.cfg` to generate emails from gitlab changes. + 4. Run `mailtogitlab.py /path/to/projectname.cfg < email` to generate gitlab changes from an email. ## Suggested ways to achieve that * Setup ingestion IMAP mailbox that subscribes to the mailing list. diff --git a/gitlab/gitlab-to-mail/db.py b/gitlab/gitlab-to-mail/db.py index 472026c..9794abf 100644 --- a/gitlab/gitlab-to-mail/db.py +++ b/gitlab/gitlab-to-mail/db.py @@ -1,12 +1,10 @@ from sqlalchemy import create_engine, Column, Integer, Unicode, DateTime, Date from sqlalchemy.orm import declarative_base, sessionmaker +from util import Settings -import importlib -import os import sys -sys.path.append(os.getcwd()) -settings = importlib.import_module(f"settings_{sys.argv[1]}") +settings = Settings(sys.argv[1]) Base = declarative_base() diff --git a/gitlab/gitlab-to-mail/settings_example.py b/gitlab/gitlab-to-mail/example.cfg similarity index 92% rename from gitlab/gitlab-to-mail/settings_example.py rename to gitlab/gitlab-to-mail/example.cfg index 1a42216..3cd31d9 100644 --- a/gitlab/gitlab-to-mail/settings_example.py +++ b/gitlab/gitlab-to-mail/example.cfg @@ -1,3 +1,5 @@ +[settings] + # Location of the sqlite database file, which will be auto created if not found DATABASE= "/home/wine/example/db_example.sqlite" @@ -14,7 +16,9 @@ GITLAB_PROJECT_NAME = "namespace/project" BRIDGE_FROM_EMAIL = "do.not.reply(a)example.com" BRIDGE_TO_EMAIL = "bridge-list(a)lists.example.com" -BRIDGE_TAG = None # used for [PATCH $TAG 1/1] and [$TAG] for comments + +# used for [PATCH $TAG 1/1] and [$TAG] for comments +#BRIDGE_TAG = mytag SMTP_DOMAIN = "mail.example.com" SMTP_PORT = 587 diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index c10a0ed..0a5ef4b 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -5,19 +5,15 @@ from urllib.parse import urljoin, urlparse import db import re import sys -import os import datetime import dateutil.parser import requests import mailbox import smtplib import email -import importlib -from util import fetch_all +from util import fetch_all, Settings - -sys.path.append(os.getcwd()) -settings = importlib.import_module(f"settings_{sys.argv[1]}") +settings = Settings(sys.argv[1]) GITLAB_TIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' diff --git a/gitlab/gitlab-to-mail/gitlabtomail.service b/gitlab/gitlab-to-mail/gitlabtomail.service index 0aeed78..3dcde7d 100644 --- a/gitlab/gitlab-to-mail/gitlabtomail.service +++ b/gitlab/gitlab-to-mail/gitlabtomail.service @@ -7,7 +7,7 @@ Type=simple Restart=always RestartSec=60 User=wine -ExecStart=/home/wine/gitlab-to-mail/runner.py wine +ExecStart=/home/wine/gitlab-to-mail/runner.py wine.cfg [Install] WantedBy=multi-user.target diff --git a/gitlab/gitlab-to-mail/mailtogitlab.py b/gitlab/gitlab-to-mail/mailtogitlab.py index 7e3c318..7fcb85b 100755 --- a/gitlab/gitlab-to-mail/mailtogitlab.py +++ b/gitlab/gitlab-to-mail/mailtogitlab.py @@ -5,14 +5,11 @@ from urllib.parse import urljoin import re import sys -import os -import importlib import email.utils import requests -from util import fetch_all +from util import fetch_all, Settings -sys.path.append(os.getcwd()) -settings = importlib.import_module(f"settings_{sys.argv[1]}") +settings = Settings(sys.argv[1]) MIN_PYTHON = (3, 8) # because of the walrus operator use if sys.version_info < MIN_PYTHON: diff --git a/gitlab/gitlab-to-mail/util.py b/gitlab/gitlab-to-mail/util.py index 37a2729..e37ead8 100644 --- a/gitlab/gitlab-to-mail/util.py +++ b/gitlab/gitlab-to-mail/util.py @@ -1,4 +1,6 @@ import requests +import configparser +import sys def fetch_all(url, settings): @@ -13,3 +15,30 @@ def fetch_all(url, settings): else: url = None return result + + +class Settings: + def __init__(self, fname): + self.cp = configparser.ConfigParser() + if len(self.cp.read(fname)) == 0: + print(f"Error: invalid configuration in {fname}.", file=sys.stderr) + sys.exit(1) + for s in ['DATABASE', 'GITLAB_TOKEN', 'GITLAB_URL', 'GITLAB_PROJECT_NAME', + 'BRIDGE_FROM_EMAIL', 'BRIDGE_TO_EMAIL', 'BRIDGE_TAG', + 'SMTP_DOMAIN', 'SMTP_USER', 'SMTP_PASSWORD']: + if s in self.cp['settings']: + self.__dict__[s] = self.cp['settings'][s].strip('"') + else: + self.__dict__[s] = None + + for s in ['DEBUG']: + if s in self.cp['settings']: + self.__dict__[s] = self.cp['settings'].getboolean(s) + else: + self.__dict__[s] = None + + for s in ['GITLAB_PROJECT_ID', 'SMTP_PORT', 'INITIAL_BACKLOG_DAYS', 'MAXIMUM_PATCHES']: + if s in self.cp['settings']: + self.__dict__[s] = self.cp['settings'].getint(s) + else: + self.__dict__[s] = None

1 0