wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Alexandre Julliard : kernelbase: Reimplement GetCalendarInfoEx/W using the locale.nls data.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: a074d0c3a8bd06bfbab4c98e4f8b244bfaef62ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a074d0c3a8bd06bfbab4c98e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 16:59:09 2022 +0200 kernelbase: Reimplement GetCalendarInfoEx/W using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 10 +- dlls/kernelbase/locale.c | 394 ++++++++++++++++++++++++++--------------------- include/winnls.h | 1 + 3 files changed, 226 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a074d0c3a8bd06bfbab4…

1 0

Alexandre Julliard : make_unicode: Generate the calendar table in locale.nls.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: 65fc470dfe93b5355152edb6a1b78047537a714c URL: https://source.winehq.org/git/wine.git/?a=commit;h=65fc470dfe93b5355152edb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 16:54:02 2022 +0200 make_unicode: Generate the calendar table in locale.nls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 660088 -> 663852 bytes tools/make_unicode | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 187 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65fc470dfe93b5355152…

1 0

Esme Povirk : mscoree/tests: Create csc.exe process as detached.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: c943f924cb10fe522b0b932137a2cd9f74349e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c943f924cb10fe522b0b9321… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 4 14:26:43 2022 -0500 mscoree/tests: Create csc.exe process as detached. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index a2bb3449839..7da40d92887 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -580,7 +580,7 @@ static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *ty swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s /t:%s %s /out:\"%s\" \"%s\"", csc, type, args, target, source); si.cb = sizeof(si); - ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %lu\n", GetLastError()); wait_child_process(pi.hProcess);

1 0

Esme Povirk : mscoree/tests: Build loadpaths.exe as GUI instead of CUI.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: d971600cae1b898d4d31df1f1b0cad79c3ed2c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d971600cae1b898d4d31df1f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 4 14:26:42 2022 -0500 mscoree/tests: Build loadpaths.exe as GUI instead of CUI. This prevents unnecessary console windows from being created for it if mscoree_test.exe does not have a console. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index b49465fb16f..a2bb3449839 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -709,7 +709,7 @@ static void test_loadpaths(BOOL neutral) ret = write_resource(exe_source, exe_source); ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(exe_name); - ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + ret = compile_cs(exe_source, exe_name, L"winexe", L"/reference:libloadpaths.dll"); if (!ret) return; ret = DeleteFileW(exe_source); ok(ret, "DeleteFileW failed: %lu\n", GetLastError());

1 0

Dmitry Timoshkov : dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: wine Branch: master Commit: a90d976bb45e26cc64bcb1a4304a6dc7a1ad0571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90d976bb45e26cc64bcb1a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 5 08:38:22 2022 +0300 dwrite/tests: Add some fallback tests for Segoe UI Symbol. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..43b6efa107b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4747,6 +4747,86 @@ if (font) { IDWriteFactory2_Release(factory2); } +static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) +{ + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index != UINT_MAX && exists, "Name was not found.\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_system_fallback(void) +{ + static const struct fallback_test + { + const WCHAR text[2]; + const WCHAR *name; + } + tests[] = + { + { { 0x25d4, 0}, L"Segoe UI Symbol" }, + }; + IDWriteFontFallback *fallback; + IDWriteFactory2 *factory; + IDWriteFont *font; + UINT32 i, length; + WCHAR name[256]; + BOOL exists; + float scale; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory2))) + { + win_skip("System font fallback API is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + g_source = tests[i].text; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; + ok(length == 1, "Unexpected length %u\n", length); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); + todo_wine + ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFactory2_Release(factory); +} + static void test_FontFallbackBuilder(void) { IDWriteFontFallback *fallback, *fallback2; @@ -6529,6 +6609,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_system_fallback(); test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping();

1 0

Zebediah Figura : build: Do not cross-compile tests if tests are not enabled.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: vkd3d Branch: master Commit: 2e4367a470ab359b342c07b26a29bd60ebd55545 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2e4367a470ab359b342c07b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:13 2022 -0500 build: Do not cross-compile tests if tests are not enabled. 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> --- Makefile.am | 22 ++++++++++++++++++---- configure.ac | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index c93b2062..f49f9642 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,11 +445,18 @@ if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) +CROSS32_EXEFILES = +if BUILD_TESTS +CROSS32_EXEFILES += $(vkd3d_cross_tests:=.cross32.exe) +endif if BUILD_DEMOS CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) endif -CROSS32_FILES = $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe + +CROSS32_FILES = $(CROSS32_EXEFILES) +if BUILD_TESTS +CROSS32_FILES += tests/shader_runner.cross32.exe +endif CLEANFILES += $(CROSS32_IMPLIBS) $(CROSS32_FILES) crosstest32: $(CROSS32_FILES) @@ -479,11 +486,18 @@ if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) +CROSS64_EXEFILES = +if BUILD_TESTS +CROSS64_EXEFILES += $(vkd3d_cross_tests:=.cross64.exe) +endif if BUILD_DEMOS CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) endif -CROSS64_FILES = $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe + +CROSS64_FILES = $(CROSS64_EXEFILES) +if BUILD_TESTS +CROSS64_FILES += tests/shader_runner.cross64.exe +endif CLEANFILES += $(CROSS64_IMPLIBS) $(CROSS64_FILES) crosstest64: $(CROSS64_FILES) diff --git a/configure.ac b/configure.ac index 97551d89..a58e453f 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], [HAVE_CROSSTARGET=yes], [HAVE_CROSSTARGET=no]) AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) +AS_IF([test "x$enable_demos" != "xyes" -a "x$enable_tests" = "xno"], [CROSSTARGET64=no CROSSTARGET32=no]) + AS_ECHO([" Configuration summary for $PACKAGE $VERSION @@ -180,7 +182,7 @@ AS_ECHO([" "]) AS_IF([test "x$enable_demos" = "xyes"], [AS_ECHO([" Cross-compiling demos: ${HAVE_CROSSTARGET}"])]) -AS_ECHO([" Cross-compiling tests: ${HAVE_CROSSTARGET}"]) +AS_IF([test "x$enable_tests" != "xno"], [AS_ECHO([" Cross-compiling tests: ${HAVE_CROSSTARGET}"])]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) AS_ECHO([])

1 0

Zebediah Figura : build: Do not make cross-compiled import libs an explicit dependency of the "crosstest" targets.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: vkd3d Branch: master Commit: 2f082de90411eb6b252352e05142e0e9d65921fe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2f082de90411eb6b252352e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:12 2022 -0500 build: Do not make cross-compiled import libs an explicit dependency of the "crosstest" targets. 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> --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3549cce5..c93b2062 100644 --- a/Makefile.am +++ b/Makefile.am @@ -449,9 +449,9 @@ CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) if BUILD_DEMOS CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) endif -CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe +CROSS32_FILES = $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe -CLEANFILES += $(CROSS32_FILES) +CLEANFILES += $(CROSS32_IMPLIBS) $(CROSS32_FILES) crosstest32: $(CROSS32_FILES) -include tests/$(DEPDIR)/*.cross32.Po @@ -483,9 +483,9 @@ CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) if BUILD_DEMOS CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) endif -CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe +CROSS64_FILES = $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe -CLEANFILES += $(CROSS64_FILES) +CLEANFILES += $(CROSS64_IMPLIBS) $(CROSS64_FILES) crosstest64: $(CROSS64_FILES) -include tests/$(DEPDIR)/*.cross64.Po

1 0

Zebediah Figura : build: Do not cross-compile demos if demos are not enabled.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: vkd3d Branch: master Commit: 113303c7307681fa661ba5b508c2bdd38178a920 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=113303c7307681fa661ba5b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:11 2022 -0500 build: Do not cross-compile demos if demos are not enabled. 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> --- Makefile.am | 12 ++++++++---- configure.ac | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6e7737be..3549cce5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,8 +445,10 @@ if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) +if BUILD_DEMOS +CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +endif CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe CLEANFILES += $(CROSS32_FILES) @@ -477,8 +479,10 @@ if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) +if BUILD_DEMOS +CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +endif CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe CLEANFILES += $(CROSS64_FILES) diff --git a/configure.ac b/configure.ac index 77fa41c8..97551d89 100644 --- a/configure.ac +++ b/configure.ac @@ -162,7 +162,7 @@ AC_OUTPUT dnl Output configuration summary AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], - [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) + [HAVE_CROSSTARGET=yes], [HAVE_CROSSTARGET=no]) AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) AS_ECHO([" @@ -177,8 +177,10 @@ AS_ECHO([" Building demos: ${enable_demos} Building tests: ${enable_tests} Building documentation: ${HAVE_DOCS} +"]) - Building crosstests: ${HAVE_CROSSTEST}"]) +AS_IF([test "x$enable_demos" = "xyes"], [AS_ECHO([" Cross-compiling demos: ${HAVE_CROSSTARGET}"])]) +AS_ECHO([" Cross-compiling tests: ${HAVE_CROSSTARGET}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) AS_ECHO([])

1 0

Zebediah Figura : configure: Check for xcb-event and xcb-icccm.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: vkd3d Branch: master Commit: d3347554a2d1a44e94289e8470beabb66c4c8bd3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d3347554a2d1a44e94289e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:10 2022 -0500 configure: Check for xcb-event and xcb-icccm. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 308bdda1..77fa41c8 100644 --- a/configure.ac +++ b/configure.ac @@ -126,7 +126,7 @@ AS_IF([test "x$with_spirv_tools" = "xyes"], HAVE_XCB=no AS_IF([test "x$with_xcb" != "xno"], - [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [PKG_CHECK_MODULES([XCB], [xcb xcb-event xcb-icccm xcb-keysyms], [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) HAVE_XCB=yes], [HAVE_XCB=no])])

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant not-equal expressions.
by Alexandre Julliard 05 Apr '22

05 Apr '22

Module: vkd3d Branch: master Commit: 1ec00d8eba67faa5404cb0efd9ef3f8a6958b7eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1ec00d8eba67faa5404cb0e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Apr 5 12:33:13 2022 +0200 vkd3d-shader/hlsl: Fold constant not-equal expressions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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_constant_ops.c | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 87b5bc90..e282dbd4 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -223,6 +223,43 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + unsigned int k; + + assert(dst->node.data_type->base_type == HLSL_TYPE_BOOL); + assert(src1->node.data_type->base_type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (src1->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->value[k].u = src1->value[k].f != src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->value[k].u = src1->value[k].d != src2->value[k].d; + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + dst->value[k].u = src1->value[k].u != src2->value[k].u; + break; + + default: + assert(0); + return false; + } + + dst->value[k].u *= ~0u; + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -272,6 +309,10 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void success = fold_mul(ctx, res, arg1, arg2); break; + case HLSL_OP2_NEQUAL: + success = fold_nequal(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022