November 2022 - Wine-commits

Alexandre Julliard : lcms2: Import upstream release 2.14.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: fd3017ff5be7bdbc3d116cdf250b30f168509771 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd3017ff5be7bdbc3d116cdf250b30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 10:56:27 2022 +0100 lcms2: Import upstream release 2.14. --- libs/lcms2/include/lcms2.h | 22 ++++- libs/lcms2/include/lcms2_plugin.h | 22 ++++- libs/lcms2/src/cmscnvrt.c | 4 +- libs/lcms2/src/cmserr.c | 44 ++++++++- libs/lcms2/src/cmsgamma.c | 13 ++- libs/lcms2/src/cmsgmt.c | 11 ++- libs/lcms2/src/cmshalf.c | 2 +- libs/lcms2/src/cmsio0.c | 153 ++++++++++++++++++++++++++---- libs/lcms2/src/cmsio1.c | 5 +- libs/lcms2/src/cmslut.c | 2 +- libs/lcms2/src/cmsnamed.c | 6 +- libs/lcms2/src/cmsopt.c | 4 +- libs/lcms2/src/cmspack.c | 27 +++++- libs/lcms2/src/cmspcs.c | 14 ++- libs/lcms2/src/cmsplugin.c | 76 +++++++++------ libs/lcms2/src/cmssamp.c | 8 +- libs/lcms2/src/cmstypes.c | 193 +++++++++++++++++++++++++++----------- libs/lcms2/src/cmsvirt.c | 31 +++--- libs/lcms2/src/cmsxform.c | 79 +++++++++++++++- libs/lcms2/src/lcms2_internal.h | 81 ++++++++++------ 20 files changed, 617 insertions(+), 180 deletions(-)

1 0

Alexandre Julliard : xml2: Import upstream release 2.10.3.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: d0b03aa202ae620bbaa57b04198b89474fe7affc URL: https://gitlab.winehq.org/wine/wine/-/commit/d0b03aa202ae620bbaa57b04198b89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 11:02:46 2022 +0100 xml2: Import upstream release 2.10.3. --- libs/xml2/HTMLparser.c | 27 +---- libs/xml2/SAX2.c | 24 ++-- libs/xml2/entities.c | 55 +++------ libs/xml2/include/win32config.h | 8 +- libs/xml2/parser.c | 249 ++++++++++++++++++++-------------------- libs/xml2/tree.c | 3 +- libs/xml2/xpath.c | 3 +- 7 files changed, 164 insertions(+), 205 deletions(-)

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.37.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 162acdaed08a869e11ee284b641a789c3c83f098 URL: https://gitlab.winehq.org/wine/wine/-/commit/162acdaed08a869e11ee284b641a78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 11:05:50 2022 +0100 xslt: Import upstream release 1.1.37. --- libs/xslt/libxslt/functions.c | 12 ++++++++---- libs/xslt/libxslt/keys.c | 2 +- libs/xslt/libxslt/numbers.c | 14 ++++++++++---- libs/xslt/libxslt/pattern.c | 22 +++++++++++----------- libs/xslt/libxslt/transform.c | 4 ++-- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/libs/xslt/libxslt/functions.c b/libs/xslt/libxslt/functions.c index fa8b6d93b20..ed2b002362d 100644 --- a/libs/xslt/libxslt/functions.c +++ b/libs/xslt/libxslt/functions.c @@ -608,7 +608,8 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) switch (nargs) { case 3: - CAST_TO_STRING; + if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING)) + xmlXPathStringFunction(ctxt, 1); decimalObj = valuePop(ctxt); ncname = xsltSplitQName(sheet->dict, decimalObj->stringval, &prefix); if (prefix != NULL) { @@ -634,13 +635,16 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) } /* Intentional fall-through */ case 2: - CAST_TO_STRING; + if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING)) + xmlXPathStringFunction(ctxt, 1); formatObj = valuePop(ctxt); - CAST_TO_NUMBER; + if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_NUMBER)) + xmlXPathNumberFunction(ctxt, 1); numberObj = valuePop(ctxt); break; default: - XP_ERROR(XPATH_INVALID_ARITY); + xmlXPathErr(ctxt, XPATH_INVALID_ARITY); + return; } if (formatValues != NULL) { diff --git a/libs/xslt/libxslt/keys.c b/libs/xslt/libxslt/keys.c index ecef5382638..ca0779c5be2 100644 --- a/libs/xslt/libxslt/keys.c +++ b/libs/xslt/libxslt/keys.c @@ -310,7 +310,7 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name, current = end = 0; while (match[current] != 0) { start = current; - while (IS_BLANK_CH(match[current])) + while (xmlIsBlank_ch(match[current])) current++; end = current; while ((match[end] != 0) && (match[end] != '|')) { diff --git a/libs/xslt/libxslt/numbers.c b/libs/xslt/libxslt/numbers.c index 4cb21254f4f..9c74f0d48d5 100644 --- a/libs/xslt/libxslt/numbers.c +++ b/libs/xslt/libxslt/numbers.c @@ -92,6 +92,12 @@ xsltUTF8Charcmp(xmlChar *utf1, xmlChar *utf2) { return xmlStrncmp(utf1, utf2, len); } +static int +xsltIsLetterDigit(int val) { + return xmlIsBaseCharQ(val) || xmlIsIdeographicQ(val) || + xmlIsDigitQ(val); +} + /***** Stop temp insert *****/ /************************************************************************ * * @@ -347,8 +353,8 @@ xsltNumberFormatTokenize(const xmlChar *format, * Insert initial non-alphanumeric token. * There is always such a token in the list, even if NULL */ - while (! (IS_LETTER(val=xmlStringCurrentChar(NULL, format+ix, &len)) || - IS_DIGIT(val)) ) { + while (!xsltIsLetterDigit(val = xmlStringCurrentChar(NULL, format+ix, + &len))) { if (format[ix] == 0) /* if end of format string */ break; /* while */ ix += len; @@ -414,7 +420,7 @@ xsltNumberFormatTokenize(const xmlChar *format, * to correspond to the Letter and Digit classes from XML (and * one wonders why XSLT doesn't refer to these instead). */ - while (IS_LETTER(val) || IS_DIGIT(val)) { + while (xsltIsLetterDigit(val)) { ix += len; val = xmlStringCurrentChar(NULL, format+ix, &len); } @@ -423,7 +429,7 @@ xsltNumberFormatTokenize(const xmlChar *format, * Insert temporary non-alphanumeric final tooken. */ j = ix; - while (! (IS_LETTER(val) || IS_DIGIT(val))) { + while (!xsltIsLetterDigit(val)) { if (val == 0) break; /* while */ ix += len; diff --git a/libs/xslt/libxslt/pattern.c b/libs/xslt/libxslt/pattern.c index 1944661c7f3..da3444f230e 100644 --- a/libs/xslt/libxslt/pattern.c +++ b/libs/xslt/libxslt/pattern.c @@ -1192,7 +1192,7 @@ xsltCompMatchClearCache(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp) { #define CUR_PTR ctxt->cur #define SKIP_BLANKS \ - while (IS_BLANK_CH(CUR)) NEXT + while (xmlIsBlank_ch(CUR)) NEXT #define CURRENT (*ctxt->cur) #define NEXT ((*ctxt->cur) ? ctxt->cur++: ctxt->cur) @@ -1235,11 +1235,11 @@ xsltScanLiteral(xsltParserContextPtr ctxt) { NEXT; cur = q = CUR_PTR; val = xmlStringCurrentChar(NULL, cur, &len); - while ((IS_CHAR(val)) && (val != '"')) { + while ((xmlIsCharQ(val)) && (val != '"')) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } - if (!IS_CHAR(val)) { + if (!xmlIsCharQ(val)) { ctxt->error = 1; return(NULL); } else { @@ -1251,11 +1251,11 @@ xsltScanLiteral(xsltParserContextPtr ctxt) { NEXT; cur = q = CUR_PTR; val = xmlStringCurrentChar(NULL, cur, &len); - while ((IS_CHAR(val)) && (val != '\'')) { + while ((xmlIsCharQ(val)) && (val != '\'')) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } - if (!IS_CHAR(val)) { + if (!xmlIsCharQ(val)) { ctxt->error = 1; return(NULL); } else { @@ -1264,7 +1264,6 @@ xsltScanLiteral(xsltParserContextPtr ctxt) { cur += len; CUR_PTR = cur; } else { - /* XP_ERROR(XPATH_START_LITERAL_ERROR); */ ctxt->error = 1; return(NULL); } @@ -1290,14 +1289,15 @@ xsltScanNCName(xsltParserContextPtr ctxt) { cur = q = CUR_PTR; val = xmlStringCurrentChar(NULL, cur, &len); - if (!IS_LETTER(val) && (val != '_')) + if (!xmlIsBaseCharQ(val) && !xmlIsIdeographicQ(val) && (val != '_')) return(NULL); - while ((IS_LETTER(val)) || (IS_DIGIT(val)) || + while (xmlIsBaseCharQ(val) || xmlIsIdeographicQ(val) || + xmlIsDigitQ(val) || (val == '.') || (val == '-') || (val == '_') || - (IS_COMBINING(val)) || - (IS_EXTENDER(val))) { + xmlIsCombiningQ(val) || + xmlIsExtenderQ(val)) { cur += len; val = xmlStringCurrentChar(NULL, cur, &len); } @@ -1853,7 +1853,7 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc, current = end = 0; while (pattern[current] != 0) { start = current; - while (IS_BLANK_CH(pattern[current])) + while (xmlIsBlank_ch(pattern[current])) current++; end = current; level = 0; diff --git a/libs/xslt/libxslt/transform.c b/libs/xslt/libxslt/transform.c index 2d8fd7f9abd..cb43bb47d99 100644 --- a/libs/xslt/libxslt/transform.c +++ b/libs/xslt/libxslt/transform.c @@ -3637,12 +3637,12 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node, element = elements; while (*element != 0) { - while (IS_BLANK_CH(*element)) + while (xmlIsBlank_ch(*element)) element++; if (*element == 0) break; end = element; - while ((*end != 0) && (!IS_BLANK_CH(*end))) + while ((*end != 0) && (!xmlIsBlank_ch(*end))) end++; element = xmlStrndup(element, end - element); if (element) {

1 0

Alexandre Julliard : nls: Update locale data to CLDR version 42.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 198de0dcb8a4268d555452382e8c15c558e6d2cf URL: https://gitlab.winehq.org/wine/wine/-/commit/198de0dcb8a4268d555452382e8c15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 11:48:36 2022 +0100 nls: Update locale data to CLDR version 42. --- nls/locale.nls | Bin 738786 -> 742598 bytes tools/make_unicode | 17 +++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 9ad47b1872e..22f96a93b24 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 165afe53b62..d651c850c95 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,7 +26,7 @@ use Encode; use Time::Local qw(timegm_modern); my $UNIVERSION = "15.0.0"; -my $CLDRVERSION = "41"; +my $CLDRVERSION = "42"; my $ISO639VERSION = "20220120"; my $TZVERSION = "2022a"; @@ -39,7 +39,7 @@ my %data_files = idna => { url => "https://www.unicode.org/Public/idna/$UNIVERSION/IdnaMappingTable.txt", name => "IdnaMappingTable-$UNIVERSION.txt", sha => "cc8522199541d60326a42a8f91f8748fd15630a42502dd2cf4878e81e2066ead" }, cldr => { url => "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.…", - sha => "a2b7aee281ad2f497d47995808cf5e8f24123b0814ca47f7a824556aec8a0d91" }, + sha => "275c37b1373a1c8461c14d2fe9e3b7b47ba24ea89e3fdd2dedfe0547ab2f07dc" }, cldr33 => { url => "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip", sha => "fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9" }, sorting => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6… 10 Sorting Weight Table.txt", @@ -1156,8 +1156,8 @@ my @locales = { name => "nus-SS" }, { name => "nyn", sopentypelang => "NKL" }, { name => "nyn-UG" }, - { name => "oc", lcid => 0x00000082, oemcp => 850, ebcdiccp => 20297, dir => "seed" }, - { name => "oc-FR", lcid => 0x00000482, dir => "seed" }, + { name => "oc", lcid => 0x00000082, oemcp => 850, ebcdiccp => 20297 }, + { name => "oc-FR", lcid => 0x00000482 }, { name => "oc-Latn", alias => "oc" }, { name => "oc-Latn-FR", alias => "oc-FR" }, { name => "om", lcid => 0x00000072, sopentypelang => "ORO" }, @@ -1309,8 +1309,8 @@ my @locales = { name => "smn-FI", lcid => 0x0000243b }, { name => "smn-Latn", alias => "smn" }, { name => "smn-Latn-FI", alias => "smn-FI" }, - { name => "sms", lcid => 0x0000743b, sparent => "se", ebcdiccp => 20278, dir => "seed", sopentypelang => "SKS" }, - { name => "sms-FI", lcid => 0x0000203b, dir => "seed" }, + { name => "sms", lcid => 0x0000743b, sparent => "se", ebcdiccp => 20278, sopentypelang => "SKS" }, + { name => "sms-FI", lcid => 0x0000203b }, { name => "sms-Latn", alias => "sms" }, { name => "sms-Latn-FI", alias => "sms-FI" }, { name => "sn", sopentypelang => "SNA0" }, @@ -4404,6 +4404,7 @@ sub convert_time_format($) my $fmt = shift; $fmt =~ s/a+/tt/; $fmt =~ s/B+/tt/; + $fmt =~ s/\x{202f}/ /; return $fmt; } @@ -4720,8 +4721,8 @@ sub build_locale_data() my $sneginfinity = $sposinfinity ? "-$sposinfinity" : ""; my $sgrouping = format_to_grouping( loc_query( $loc, "/ldml/numbers/decimalFormats[\@numberSystem='latn']/decimalFormatLength[not(\@type)]/decimalFormat/pattern" )); my $percentformat = loc_query( $loc, "/ldml/numbers/percentFormats[\@numberSystem='latn']/percentFormatLength[not(\@type)]/percentFormat/pattern" ); - my $currencyformat = loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='accounting']/pattern" ) || - loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='standard']/pattern" ); + my $currencyformat = loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='accounting']/pattern[not(\@alt)]" ) || + loc_query( $loc, "/ldml/numbers/currencyFormats[\@numberSystem='latn']/currencyFormatLength[not(\@type)]/currencyFormat[\@type='standard']/pattern[not(\@alt)]" ); my $smongrouping = format_to_grouping( $currencyformat ); my ($icurrency, $inegcurr) = parse_currency_format( $sname, $currencyformat ); my ($ipospercent, $inegpercent) = parse_percent_format( $percentformat );

1 0

Alexandre Julliard : kernelbase: Update timezone data to version 2022f.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 8f8127390423b65b5861122ec4a9d8136ba796b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f8127390423b65b5861122ec4a9d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 12:25:32 2022 +0100 kernelbase: Update timezone data to version 2022f. --- dlls/kernelbase/kernelbase.rgs | 134 ++++++++++++++++++++++++++++------------- tools/make_unicode | 4 +- 2 files changed, 93 insertions(+), 45 deletions(-)

1 0

Zebediah Figura : tests: Always compile HLSL shaders.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 4d1775865711c414bc39fa0a5f6fb66c8d95d243 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4d1775865711c414bc39fa0a5f6fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 30 17:21:12 2022 -0500 tests: Always compile HLSL shaders. Do not rely on a draw or dispatch command to do this. This allows more efficiently testing syntax, in cases where testing the actual shader functionality is not interesting. --- tests/cast-componentwise-equal.shader_test | 2 +- tests/cast-to-half.shader_test | 2 +- tests/compute.shader_test | 2 +- tests/hlsl-array-dimension.shader_test | 2 +- tests/hlsl-for.shader_test | 2 +- tests/hlsl-function-cast.shader_test | 8 +-- tests/hlsl-function-overload.shader_test | 2 +- tests/hlsl-function.shader_test | 6 +- tests/hlsl-gather.shader_test | 2 +- tests/hlsl-initializer-objects.shader_test | 4 +- tests/hlsl-intrinsic-override.shader_test | 4 +- tests/hlsl-return-implicit-conversion.shader_test | 20 +++--- tests/hlsl-static-initializer.shader_test | 2 +- tests/hlsl-storage-qualifiers.shader_test | 2 +- tests/hlsl-vector-indexing-uniform.shader_test | 2 +- tests/object-references.shader_test | 2 +- tests/sampler-offset.shader_test | 6 +- tests/shader_runner.c | 82 ++++++++++++++++------- tests/trigonometry.shader_test | 2 +- tests/uav-load.shader_test | 2 +- tests/uav.shader_test | 2 +- 21 files changed, 96 insertions(+), 62 deletions(-)

1 0

Zebediah Figura : tests: Add some tests for HLSL attribute syntax.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: c0782a902966a645a7e6e48f6986383f5864326c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c0782a902966a645a7e6e48f69863… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 12:25:41 2021 -0500 tests: Add some tests for HLSL attribute syntax. --- Makefile.am | 2 + tests/hlsl-attributes.shader_test | 120 ++++++++++++++++++++++++ tests/hlsl-numthreads.shader_test | 192 ++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 19 ++++ 4 files changed, 333 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3787389b..0db71d67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/floor.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-attributes.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ @@ -104,6 +105,7 @@ vkd3d_shader_tests = \ tests/hlsl-normalize.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ 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 \ diff --git a/tests/hlsl-attributes.shader_test b/tests/hlsl-attributes.shader_test new file mode 100644 index 00000000..db011873 --- /dev/null +++ b/tests/hlsl-attributes.shader_test @@ -0,0 +1,120 @@ +% Test HLSL attribute syntax. The compiler ignores unrecognized attributes, so +% we need to get the parsing syntax right. Most of the following tests which +% succeed print warnings. + +[pixel shader todo] + + [numthreads] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [ numthreads ] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [numthreads(1)] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [numthreads("")] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [numthreads("one")] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + +uniform float4 f; + + [numthreads(1, "one", 3 + 9, -9.8e4, -float2(1, 2), f)] +float4 main() : sv_target { return 0; } + +[pixel shader fail] + + [numthreads()] +float4 main() : sv_target { return 0; } + +[pixel shader fail] + + [numthreads(1,)] +float4 main() : sv_target { return 0; } + +[pixel shader fail] + + [numthreads(f)] +float4 main() : sv_target { return 0; } + +[pixel shader fail] + + /* Test an invalid constructor. */ + [numthreads(float2(1))] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [not_a_real_attribute_name] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + +uniform float4 f; + + [f] +float4 main() : sv_target { return 0; } + +[pixel shader fail] +% This is valid IDL syntax, but not HLSL. + [one, two] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [one][two] +float4 main() : sv_target { return 0; } + +[pixel shader fail] + + [one][one] +float4 main() : sv_target { return 0; } + +[pixel shader fail] + + [one][one(1)] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [one][One] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + + [numthreads] +float4 main(); + + [numthreads] +float4 main() : sv_target { return 0; } + +[pixel shader todo] + +/* Expressions with side effects are forbidden in attributes—see + * hlsl-numthreads.shader_test for an example—but not if the attribute is + * ignored. */ +static int i = 1; + + [one(i++)] + [two(++i)] + [three(i = 4)] +float4 main() : sv_target { return 0; } + +[pixel shader fail] + + [one] +float4 f; + +float4 main() : sv_target { return 0; } diff --git a/tests/hlsl-numthreads.shader_test b/tests/hlsl-numthreads.shader_test new file mode 100644 index 00000000..f0ef5f62 --- /dev/null +++ b/tests/hlsl-numthreads.shader_test @@ -0,0 +1,192 @@ +% Test allowed syntax for the "numthreads" attribute. + +[require] +shader model >= 5.0 + +[compute shader todo] + + [numthreads(1, 1, 1)] +void main() {} + +[compute shader fail] + + [numthreads] +void main() {} + +[compute shader fail] + + [numthreads(1, 1)] +void main() {} + +[compute shader fail] + + [numthreads(1, 1, 1, 1)] +void main() {} + +[compute shader fail] + + [numthreads(0, 1, 1)] +void main() {} + +[compute shader fail] + + [numthreads(1, 0, 1)] +void main() {} + +[compute shader fail] + + [numthreads(1, 1, 0)] +void main() {} + +[compute shader fail] + + [numthreads(-1, 1, 1)] +void main() {} + +[compute shader fail] + + [numthreads(1, -1, 1)] +void main() {} + +[compute shader fail] + + [numthreads(1, 1, -1)] +void main() {} + +[compute shader fail] + + [numthreads(1, -1, -1)] +void main() {} + +[compute shader todo] + + [numthreads(uint(1), 1, 1)] +void main() {} + +[compute shader todo] + + [numthreads(int(1), 1, 1)] +void main() {} + +[compute shader fail] + + [numthreads(float(1), 1, 1)] +void main() {} + +[compute shader fail] + + [numthreads(uint1(1), 1, 1)] +void main() {} + +[compute shader todo] + + [numthreads(int(1), 1, 1)] +void main() {} + +[compute shader todo] + + [numthreads(1 + 1, 1, 1)] +void main() {} + +[compute shader fail] + + [numthreads("1", 1, 1)] +void main() {} + +[compute shader todo] +static int x = 1; + + [numthreads(x, 1, 1)] +void main() {} + +[compute shader fail todo] + +void main() {} + +[compute shader fail] + + [NumThreads(1, 1, 1)] +void main() {} + +[compute shader todo] + + [numthreads(1, 1, 1)] +void main(); + +void main() {} + +[compute shader fail] + +void main() {} + + [numthreads(1, 1, 1)] +void main(); + +[compute shader fail] + +void main(); + + [numthreads(1, 1, 1)] +void main() {} + +[compute shader fail] + +/* Expressions with side effects are forbidden in attributes (but not if the + * attribute is ignored). */ + +static int x = 1; + + [numthreads(x++, 1, 1)] +void main() {} + +[compute shader fail] + +static int x = 1; + + [numthreads(++x, 1, 1)] +void main() {} + +[compute shader fail] + +static int x = 1; + + [numthreads((x = 2), 1, 1)] +void main() {} + +[compute shader todo] + +static int x = 1; + + [numthreads(++x, 1, 1)] +void func() {} + + [bogus(++x)] + [numthreads(1, 1, 1)] +void main() { func(); } + +[uav 0] +format r32 float +size (2, 2) + +1.0 1.0 +1.0 1.0 + +[compute shader todo] +/* Attributes are taken from the first function, and dropped from the second. */ +RWTexture2D<float> u; + + [numthreads(2, 1, 1)] +void main(uint2 id); + + [numthreads(1, 2, 1)] +void main(uint2 id : sv_dispatchthreadid) +{ + u[id] = 2.0; +} + +[test] +todo dispatch 1 1 1 +probe uav 0 (0, 0) r (2.0) +probe uav 0 (0, 1) r (1.0) +probe uav 0 (1, 0) r (2.0) +probe uav 0 (1, 1) r (1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index fb4ece26..4750b946 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -82,6 +82,8 @@ enum parse_state STATE_SAMPLER, STATE_SHADER_COMPUTE, STATE_SHADER_COMPUTE_TODO, + STATE_SHADER_INVALID_COMPUTE, + STATE_SHADER_INVALID_COMPUTE_TODO, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_INVALID_PIXEL_TODO, STATE_SHADER_PIXEL, @@ -792,6 +794,13 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const shader_source_size = 0; break; + case STATE_SHADER_INVALID_COMPUTE: + case STATE_SHADER_INVALID_COMPUTE_TODO: + todo_if (state == STATE_SHADER_INVALID_COMPUTE_TODO) + compile_shader(runner, shader_source, shader_source_len, "cs", true); + shader_source_len = 0; + break; + case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_INVALID_PIXEL_TODO: todo_if (state == STATE_SHADER_INVALID_PIXEL_TODO) @@ -868,6 +877,14 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { state = STATE_SHADER_COMPUTE_TODO; } + else if (!strcmp(line, "[compute shader fail]\n")) + { + state = STATE_SHADER_INVALID_COMPUTE; + } + else if (!strcmp(line, "[compute shader fail todo]\n")) + { + state = STATE_SHADER_INVALID_COMPUTE_TODO; + } else if (!strcmp(line, "[require]\n")) { state = STATE_REQUIRE; @@ -995,6 +1012,8 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC_INVALID: case STATE_SHADER_COMPUTE: case STATE_SHADER_COMPUTE_TODO: + case STATE_SHADER_INVALID_COMPUTE: + case STATE_SHADER_INVALID_COMPUTE_TODO: case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_INVALID_PIXEL_TODO: case STATE_SHADER_PIXEL:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Add a hlsl_fixme() for compute shader thread counts.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: 1019bbead607491fa86b674cd3d96355ba214411 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1019bbead607491fa86b674cd3d96… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 14:37:52 2021 -0500 vkd3d-shader/hlsl: Add a hlsl_fixme() for compute shader thread counts. In particular so that we don't cause test crashes by outputting invalid compute shaders. --- libs/vkd3d-shader/hlsl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1f35b1ac..3f80fcf2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2565,6 +2565,13 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } + if (profile->type == VKD3D_SHADER_TYPE_COMPUTE) + { + const struct vkd3d_shader_location loc = {.source_name = compile_info->source_name}; + + hlsl_fixme(&ctx, &loc, "Compute shader thread count.\n"); + } + ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); hlsl_ctx_cleanup(&ctx);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use hlsl_new_synthetic_var() in hlsl_new_func_decl().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: da56f41cebb2a8476bde085670c306d6e1fa10aa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da56f41cebb2a8476bde085670c30… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 30 17:46:38 2022 -0500 vkd3d-shader/hlsl: Use hlsl_new_synthetic_var() in hlsl_new_func_decl(). --- libs/vkd3d-shader/hlsl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3f80fcf2..11cb2e7e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1193,17 +1193,12 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl if (!hlsl_types_are_equal(return_type, ctx->builtin_types.Void)) { - struct hlsl_ir_var *return_var; - char name[28]; - - sprintf(name, "<retval-%p>", decl); - if (!(return_var = hlsl_new_var(ctx, hlsl_strdup(ctx, name), return_type, loc, semantic, 0, NULL))) + if (!(decl->return_var = hlsl_new_synthetic_var(ctx, "retval", return_type, &loc))) { vkd3d_free(decl); return NULL; } - list_add_tail(&ctx->globals->vars, &return_var->scope_entry); - decl->return_var = return_var; + decl->return_var->semantic = *semantic; } return decl;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse function attributes.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: vkd3d Branch: master Commit: d6799bd5d3dd356def6a514253c3db5de413e3bb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6799bd5d3dd356def6a514253c3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 14:52:10 2021 -0500 vkd3d-shader/hlsl: Parse function attributes. --- libs/vkd3d-shader/hlsl.c | 33 ++++++++++-- libs/vkd3d-shader/hlsl.h | 14 ++++- libs/vkd3d-shader/hlsl.y | 88 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/hlsl_codegen.c | 5 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl-attributes.shader_test | 22 ++++---- tests/hlsl-numthreads.shader_test | 36 ++++++------- 7 files changed, 164 insertions(+), 35 deletions(-)

1 0