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

Alexandre Julliard : ntdll: Move the wineserver exec support to the Unix library.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: dec38ffb075314629f2f1d3b86c752415181736a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec38ffb075314629f2f1d3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 17:37:08 2020 +0200 ntdll: Move the wineserver exec support to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/server.c | 163 +---------------------------------------------- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 81 +++++++++++++++++++++++ dlls/ntdll/unixlib.h | 3 +- 5 files changed, 87 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dec38ffb075314629f2f…

1 0

Piotr Caban : ucrtbase: Add remaining _o_* functions forwards.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 17355c0566b7e82d5ec3d1d4768ffe8bc7e81c74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17355c0566b7e82d5ec3d1d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 19 14:09:29 2020 +0200 ucrtbase: Add remaining _o_* functions forwards. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 1290 +++++++++---------- dlls/ucrtbase/ucrtbase.spec | 1292 ++++++++++---------- 3 files changed, 1292 insertions(+), 1292 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17355c0566b7e82d5ec3…

1 0

Martin Storsjo : ucrtbase: Add tests and fix more zero length __stdio_common_vs[w]printf cases.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 2819fea3529062c614fd50533b3e41f6d92636f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2819fea3529062c614fd5053… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 18 15:15:34 2020 +0300 ucrtbase: Add tests and fix more zero length __stdio_common_vs[w]printf cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 8 ++++++-- dlls/ucrtbase/tests/printf.c | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 17d06eed3c..f751d658ef 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -744,7 +744,9 @@ int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_s return ret>len ? -1 : ret; if(ret>=len) { if(len) str[len-1] = 0; - return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + if(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + return ret; + return len > 0 ? -2 : -1; } return ret; } @@ -1284,7 +1286,9 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, return ret>len ? -1 : ret; if(ret>=len) { if(len) str[len-1] = 0; - return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + if(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + return ret; + return len > 0 ? -2 : -1; } return ret; } diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 8cacbbb79a..3b48e08b10 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -144,6 +144,18 @@ static void test_snprintf (void) "Failure to snprintf to NULL\n"); ok (vsprintf_wrapper (0, NULL, 0, "abcd") == 4, "Failure to snprintf to NULL\n"); + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, 0, "abcd") == 4, + "Failure to snprintf to zero length buffer\n"); + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, 0, "abcd") == -1, + "Failure to snprintf to zero length buffer\n"); + ok (vsprintf_wrapper (0, buffer, 0, "abcd") == -1, + "Failure to snprintf to zero length buffer\n"); + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, 0, "") == 0, + "Failure to snprintf a zero length string to a zero length buffer\n"); + ok (vsprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, 0, "") == 0, + "Failure to snprintf a zero length string to a zero length buffer\n"); + ok (vsprintf_wrapper (0, buffer, 0, "") == -1, + "Failure to snprintf a zero length string to a zero length buffer\n"); } static int WINAPIV vswprintf_wrapper(unsigned __int64 options, wchar_t *str, @@ -163,6 +175,7 @@ static void test_swprintf (void) const wchar_t str_justfit[] = {'j','u','s','t','f','i','t',0}; const wchar_t str_justfits[] = {'j','u','s','t','f','i','t','s',0}; const wchar_t str_muchlonger[] = {'m','u','c','h','l','o','n','g','e','r',0}; + const wchar_t str_empty[] = {0}; const wchar_t *tests[] = {str_short, str_justfit, str_justfits, str_muchlonger}; wchar_t buffer[8]; @@ -225,6 +238,18 @@ static void test_swprintf (void) "Failure to swprintf to NULL\n"); ok (vswprintf_wrapper (0, NULL, 0, str_short) == 5, "Failure to swprintf to NULL\n"); + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, 0, str_short) == 5, + "Failure to swprintf to a zero length buffer\n"); + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, 0, str_short) == -1, + "Failure to swprintf to a zero length buffer\n"); + ok (vswprintf_wrapper (0, buffer, 0, str_short) == -1, + "Failure to swprintf to a zero length buffer\n"); + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, buffer, 0, str_empty) == 0, + "Failure to swprintf a zero length string to a zero length buffer\n"); + ok (vswprintf_wrapper (_CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, 0, str_empty) == 0, + "Failure to swprintf a zero length string to a zero length buffer\n"); + ok (vswprintf_wrapper (0, buffer, 0, str_empty) == -1, + "Failure to swprintf a zero length string to a zero length buffer\n"); } static int WINAPIV vfprintf_wrapper(FILE *file,

1 0

Jacek Caban : configure: Use cross compiler for EXCESS_PRECISION_CFLAGS check when available.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 69bc1fe4bc8b74690d0aa94de8c0849085fdb575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69bc1fe4bc8b74690d0aa94d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 19 15:46:12 2020 +0200 configure: Use cross compiler for EXCESS_PRECISION_CFLAGS check when available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 124 +++++++++++++++++++++++++++++++++++++++++++++-------------- configure.ac | 9 ++++- 2 files changed, 104 insertions(+), 29 deletions(-) diff --git a/configure b/configure index a6c4384dda..f695e0fb00 100755 --- a/configure +++ b/configure @@ -631,7 +631,6 @@ RT_LIBS POLL_LIBS TOOLSEXT MSVCRTFLAGS -EXCESS_PRECISION_CFLAGS EXTRACFLAGS VKD3D_LIBS VKD3D_CFLAGS @@ -705,6 +704,7 @@ X_PRE_LIBS X_CFLAGS XMKMF PTHREAD_LIBS +EXCESS_PRECISION_CFLAGS CROSSDEBUG DELAYLOADFLAG CROSSLDFLAGS @@ -9982,6 +9982,37 @@ fi $as_echo "$ac_cv_crosscflags__Werror_unknown_warning_option" >&6; } if test "x$ac_cv_crosscflags__Werror_unknown_warning_option" = xyes; then : CFLAGS="$CFLAGS -Werror=unknown-warning-option" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror=ignored-optimization-argument" >&5 +$as_echo_n "checking whether the cross-compiler supports -Werror=ignored-optimization-argument... " >&6; } +if ${ac_cv_crosscflags__Werror_ignored_optimization_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -Werror=ignored-optimization-argument" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Werror_ignored_optimization_argument=yes +else + ac_cv_crosscflags__Werror_ignored_optimization_argument=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Werror_ignored_optimization_argument" >&5 +$as_echo "$ac_cv_crosscflags__Werror_ignored_optimization_argument" >&6; } +if test "x$ac_cv_crosscflags__Werror_ignored_optimization_argument" = xyes; then : + CFLAGS="$CFLAGS -Werror=ignored-optimization-argument" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wdeclaration-after-statement" >&5 $as_echo_n "checking whether the cross-compiler supports -Wdeclaration-after-statement... " >&6; } @@ -10652,6 +10683,39 @@ if test "x$ac_cv_crosscflags__gcodeview" = xyes; then : fi ;; esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fexcess-precision=standard" >&5 +$as_echo_n "checking whether the cross-compiler supports -fexcess-precision=standard... " >&6; } +if ${ac_cv_crosscflags__fexcess_precision_standard+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -fexcess-precision=standard" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__fexcess_precision_standard=yes +else + ac_cv_crosscflags__fexcess_precision_standard=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__fexcess_precision_standard" >&5 +$as_echo "$ac_cv_crosscflags__fexcess_precision_standard" >&6; } +if test "x$ac_cv_crosscflags__fexcess_precision_standard" = xyes; then : + EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" + +fi + if test "x$enable_werror" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 @@ -17177,32 +17241,6 @@ fi $as_echo "$ac_cv_cflags__fno_strict_aliasing" >&6; } if test "x$ac_cv_cflags__fno_strict_aliasing" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fexcess-precision=standard" >&5 -$as_echo_n "checking whether the compiler supports -fexcess-precision=standard... " >&6; } -if ${ac_cv_cflags__fexcess_precision_standard+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fexcess-precision=standard" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__fexcess_precision_standard=yes -else - ac_cv_cflags__fexcess_precision_standard=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fexcess_precision_standard" >&5 -$as_echo "$ac_cv_cflags__fexcess_precision_standard" >&6; } -if test "x$ac_cv_cflags__fexcess_precision_standard" = xyes; then : - EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5 $as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; } @@ -17480,6 +17518,36 @@ if test "x$ac_cv_cflags__Wwrite_strings" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi + if test -z "$CROSSTARGET" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fexcess-precision=standard" >&5 +$as_echo_n "checking whether the compiler supports -fexcess-precision=standard... " >&6; } +if ${ac_cv_cflags__fexcess_precision_standard+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fexcess-precision=standard" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fexcess_precision_standard=yes +else + ac_cv_cflags__fexcess_precision_standard=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fexcess_precision_standard" >&5 +$as_echo "$ac_cv_cflags__fexcess_precision_standard" >&6; } +if test "x$ac_cv_cflags__fexcess_precision_standard" = xyes; then : + EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" + +fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpointer-arith" >&5 $as_echo_n "checking whether the compiler supports -Wpointer-arith... " >&6; } if ${ac_cv_cflags__Wpointer_arith+:} false; then : @@ -20061,6 +20129,7 @@ OPENCL_LIBS = $OPENCL_LIBS QUICKTIME_LIBS = $QUICKTIME_LIBS CARBON_LIBS = $CARBON_LIBS METAL_LIBS = $METAL_LIBS +EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS PTHREAD_LIBS = $PTHREAD_LIBS X_CFLAGS = $X_CFLAGS X_PRE_LIBS = $X_PRE_LIBS @@ -20132,7 +20201,6 @@ NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS VKD3D_CFLAGS = $VKD3D_CFLAGS VKD3D_LIBS = $VKD3D_LIBS -EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS POLL_LIBS = $POLL_LIBS RT_LIBS = $RT_LIBS LDAP_CFLAGS = $LDAP_CFLAGS diff --git a/configure.ac b/configure.ac index 8ddeb0710a..4c3f1b9de5 100644 --- a/configure.ac +++ b/configure.ac @@ -1078,6 +1078,7 @@ then WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) + WINE_TRY_CROSSCFLAGS([-Werror=ignored-optimization-argument],[CFLAGS="$CFLAGS -Werror=ignored-optimization-argument"]) WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers]) @@ -1119,6 +1120,8 @@ then pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;; esac + WINE_TRY_CROSSCFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) + if test "x$enable_werror" = "xyes" then WINE_TRY_CROSSCFLAGS([-Werror]) @@ -2049,7 +2052,6 @@ then WINE_TRY_CFLAGS([-fcf-protection=none]) WINE_TRY_CFLAGS([-fno-stack-protector]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) - WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) @@ -2062,6 +2064,11 @@ then WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings]) + if test -z "$CROSSTARGET" + then + WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) + fi + dnl Check for noisy string.h WINE_TRY_CFLAGS([-Wpointer-arith], [saved_string_h_CFLAGS=$CFLAGS

1 0

Zebediah Figura : d3dcompiler: Synthesize a variable when subscripting a non-deref node.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 749e6be4d6a3c0d1f63dcb741c649ed0c05073f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749e6be4d6a3c0d1f63dcb74… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 15:03:42 2020 -0500 d3dcompiler: Synthesize a variable when subscripting a non-deref node. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 68 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index db30536173..01b210419c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -125,6 +125,11 @@ static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_locati } } +static BOOL type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) { BOOL ret; @@ -507,6 +512,41 @@ static struct hlsl_ir_jump *new_return(struct hlsl_ir_node *value, struct source return jump; } +static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, + const struct source_location loc) +{ + struct hlsl_ir_var *var; + + if (!(var = d3dcompiler_alloc(sizeof(*var)))) + { + hlsl_ctx.status = PARSE_ERR; + return NULL; + } + + var->name = strdup(name); + var->data_type = type; + var->loc = loc; + list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); + return var; +} + +static struct hlsl_ir_assignment *make_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +{ + struct hlsl_ir_assignment *assign; + + if (!(assign = d3dcompiler_alloc(sizeof(*assign)))) + return NULL; + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, rhs->data_type, rhs->loc); + assign->lhs.type = HLSL_IR_DEREF_VAR; + assign->lhs.v.var = lhs; + assign->rhs = rhs; + if (type_is_single_reg(lhs->data_type)) + assign->writemask = (1 << lhs->data_type->dimx) - 1; + + return assign; +} + static struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var, const struct source_location loc) { struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); @@ -525,13 +565,33 @@ static struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var, const struct static struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, struct hlsl_struct_field *field, const struct source_location loc) { - struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); + struct hlsl_ir_deref *deref; - if (!deref) + if (record->type != HLSL_IR_DEREF) { - ERR("Out of memory.\n"); - return NULL; + struct hlsl_ir_assignment *assign; + struct hlsl_ir_var *var; + char name[27]; + + sprintf(name, "<deref-%p>", record); + if (!(var = new_synthetic_var(name, record->data_type, record->loc))) + return NULL; + + TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(record->type)); + + if (!(assign = make_simple_assignment(var, record))) + return NULL; + list_add_after(&record->entry, &assign->node.entry); + + if (!(deref = new_var_deref(var, var->loc))) + return NULL; + list_add_after(&assign->node.entry, &deref->node.entry); + record = &deref->node; } + + if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) + return NULL; + init_node(&deref->node, HLSL_IR_DEREF, field->type, loc); deref->src.type = HLSL_IR_DEREF_RECORD; deref->src.v.record.record = record;

1 0

Zebediah Figura : d3dcompiler: Synthesize a variable when indexing a non-deref node.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 0d9ddc437206673e1da36ef9515ed109e651e9c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d9ddc437206673e1da36ef9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 15:03:43 2020 -0500 d3dcompiler: Synthesize a variable when indexing a non-deref node. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 122 ++++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 52 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 01b210419c..5875705cf1 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -562,32 +562,39 @@ static struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var, const struct return deref; } -static struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, - struct hlsl_struct_field *field, const struct source_location loc) +static struct hlsl_ir_node *get_var_deref(struct hlsl_ir_node *node) { + struct hlsl_ir_assignment *assign; struct hlsl_ir_deref *deref; + struct hlsl_ir_var *var; + char name[27]; - if (record->type != HLSL_IR_DEREF) - { - struct hlsl_ir_assignment *assign; - struct hlsl_ir_var *var; - char name[27]; + if (node->type == HLSL_IR_DEREF) + return node; - sprintf(name, "<deref-%p>", record); - if (!(var = new_synthetic_var(name, record->data_type, record->loc))) - return NULL; + sprintf(name, "<deref-%p>", node); + if (!(var = new_synthetic_var(name, node->data_type, node->loc))) + return NULL; - TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(record->type)); + TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(node->type)); - if (!(assign = make_simple_assignment(var, record))) - return NULL; - list_add_after(&record->entry, &assign->node.entry); + if (!(assign = make_simple_assignment(var, node))) + return NULL; + list_add_after(&node->entry, &assign->node.entry); - if (!(deref = new_var_deref(var, var->loc))) - return NULL; - list_add_after(&assign->node.entry, &deref->node.entry); - record = &deref->node; - } + if (!(deref = new_var_deref(var, var->loc))) + return NULL; + list_add_after(&assign->node.entry, &deref->node.entry); + return &deref->node; +} + +static struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, + struct hlsl_struct_field *field, const struct source_location loc) +{ + struct hlsl_ir_deref *deref; + + if (!(record = get_var_deref(record))) + return NULL; if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) return NULL; @@ -599,6 +606,49 @@ static struct hlsl_ir_deref *new_record_deref(struct hlsl_ir_node *record, return deref; } +static struct hlsl_ir_deref *new_array_deref(struct hlsl_ir_node *array, + struct hlsl_ir_node *index, const struct source_location loc) +{ + const struct hlsl_type *expr_type = array->data_type; + struct hlsl_ir_deref *deref; + struct hlsl_type *data_type; + + TRACE("Array dereference from type %s.\n", debug_hlsl_type(expr_type)); + + if (expr_type->type == HLSL_CLASS_ARRAY) + { + data_type = expr_type->e.array.type; + } + else if (expr_type->type == HLSL_CLASS_MATRIX) + { + data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, expr_type->base_type, expr_type->dimx, 1); + } + else if (expr_type->type == HLSL_CLASS_VECTOR) + { + data_type = new_hlsl_type(NULL, HLSL_CLASS_SCALAR, expr_type->base_type, 1, 1); + } + else + { + if (expr_type->type == HLSL_CLASS_SCALAR) + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "array-indexed expression is scalar"); + else + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "expression is not array-indexable"); + return NULL; + } + + if (!(array = get_var_deref(array))) + return NULL; + + if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) + return NULL; + + init_node(&deref->node, HLSL_IR_DEREF, data_type, loc); + deref->src.type = HLSL_IR_DEREF_ARRAY; + deref->src.v.array.array = array; + deref->src.v.array.index = index; + return deref; +} + static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -2290,34 +2340,7 @@ postfix_expr: primary_expr /* This may be an array dereference or a vector/matrix * subcomponent access. * We store it as an array dereference in any case. */ - const struct hlsl_type *expr_type = node_from_list($1)->data_type; struct hlsl_ir_deref *deref; - struct hlsl_type *data_type; - - TRACE("Array dereference from type %s\n", debug_hlsl_type(expr_type)); - - if (expr_type->type == HLSL_CLASS_ARRAY) - { - data_type = expr_type->e.array.type; - } - else if (expr_type->type == HLSL_CLASS_MATRIX) - { - data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, expr_type->base_type, expr_type->dimx, 1); - } - else if (expr_type->type == HLSL_CLASS_VECTOR) - { - data_type = new_hlsl_type(NULL, HLSL_CLASS_SCALAR, expr_type->base_type, 1, 1); - } - else - { - if (expr_type->type == HLSL_CLASS_SCALAR) - hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "array-indexed expression is scalar"); - else - hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "expression is not array-indexable"); - free_instr_list($1); - free_instr_list($3); - YYABORT; - } if (node_from_list($3)->data_type->type != HLSL_CLASS_SCALAR) { @@ -2327,17 +2350,12 @@ postfix_expr: primary_expr YYABORT; } - if (!(deref = d3dcompiler_alloc(sizeof(*deref)))) + if (!(deref = new_array_deref(node_from_list($1), node_from_list($3), get_location(&@2)))) { free_instr_list($1); free_instr_list($3); YYABORT; } - init_node(&deref->node, HLSL_IR_DEREF, data_type, get_location(&@2)); - deref->src.type = HLSL_IR_DEREF_ARRAY; - deref->src.v.array.array = node_from_list($1); - deref->src.v.array.index = node_from_list($3); - $$ = append_binop($1, $3, &deref->node); } /* "var_modifiers" doesn't make sense in this case, but it's needed

1 0

Zebediah Figura : d3dcompiler: Do not store matrix and vector indexes as deref instructions.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: d46065d1f36d5f9feab653d3844099ae02f7d8f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d46065d1f36d5f9feab653d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 15:03:44 2020 -0500 d3dcompiler: Do not store matrix and vector indexes as deref instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5875705cf1..cc868757a2 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -619,13 +619,10 @@ static struct hlsl_ir_deref *new_array_deref(struct hlsl_ir_node *array, { data_type = expr_type->e.array.type; } - else if (expr_type->type == HLSL_CLASS_MATRIX) + else if (expr_type->type == HLSL_CLASS_MATRIX || expr_type->type == HLSL_CLASS_VECTOR) { - data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, expr_type->base_type, expr_type->dimx, 1); - } - else if (expr_type->type == HLSL_CLASS_VECTOR) - { - data_type = new_hlsl_type(NULL, HLSL_CLASS_SCALAR, expr_type->base_type, 1, 1); + FIXME("Index of matrix or vector type.\n"); + return NULL; } else { @@ -2337,9 +2334,6 @@ postfix_expr: primary_expr } | postfix_expr '[' expr ']' { - /* This may be an array dereference or a vector/matrix - * subcomponent access. - * We store it as an array dereference in any case. */ struct hlsl_ir_deref *deref; if (node_from_list($3)->data_type->type != HLSL_CLASS_SCALAR)

1 0

Józef Kucia : wined3d: Implement shader_spirv_select().
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: f4e0ca21992db6cb40bad8120e258c05c6072e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e0ca21992db6cb40bad812… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 20 00:20:26 2020 +0430 wined3d: Implement shader_spirv_select(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 16 +++ dlls/wined3d/shader_spirv.c | 226 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 237 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4e0ca21992db6cb40ba…

1 0

Henri Verbeet : wined3d: Create Vulkan pipeline objects.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: b55228694fdf343fd0c52010d544ad93b684dae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b55228694fdf343fd0c52010… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 20 00:20:27 2020 +0430 wined3d: Create Vulkan pipeline objects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 77 +++++++++- dlls/wined3d/context_vk.c | 320 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 31 ++++ 3 files changed, 418 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b55228694fdf343fd0c5…

1 0

Henri Verbeet : wined3d: Bind Vulkan vertex buffers.
by Alexandre Julliard 19 May '20

19 May '20

Module: wine Branch: master Commit: 299eb1f52a68550270b1191de2ba51c341a8af54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=299eb1f52a68550270b1191d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 20 00:20:28 2020 +0430 wined3d: Bind Vulkan vertex buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index d13bb5d82e..19351d4b95 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1142,6 +1142,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->c.update_compute_shader_resource_bindings = 1; context_vk->c.update_unordered_access_view_bindings = 1; context_vk->c.update_compute_unordered_access_view_bindings = 1; + context_invalidate_state(&context_vk->c, STATE_STREAMSRC); context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); @@ -1618,6 +1619,42 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont return true; } +static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, const struct wined3d_vk_info *vk_info) +{ + VkDeviceSize offsets[ARRAY_SIZE(state->streams)] = {0}; + VkBuffer buffers[ARRAY_SIZE(state->streams)]; + const struct wined3d_stream_state *stream; + struct wined3d_buffer *buffer; + unsigned int i, first, count; + struct wined3d_bo_vk *bo; + + first = 0; + count = 0; + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + stream = &state->streams[i]; + + if ((buffer = stream->buffer)) + { + bo = &wined3d_buffer_vk(buffer)->bo; + wined3d_context_vk_reference_bo(context_vk, bo); + buffers[count] = bo->vk_buffer; + offsets[count] = bo->buffer_offset + stream->offset; + ++count; + continue; + } + + if (count) + VK_CALL(vkCmdBindVertexBuffers(vk_command_buffer, first, count, buffers, offsets)); + first = i + 1; + count = 0; + } + + if (count) + VK_CALL(vkCmdBindVertexBuffers(vk_command_buffer, first, count, buffers, offsets)); +} + static VkResult wined3d_context_vk_create_descriptor_pool(struct wined3d_device_vk *device_vk, const struct wined3d_vk_info *vk_info, VkDescriptorPool *vk_pool) { @@ -2190,6 +2227,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c struct wined3d_rendertarget_view *dsv; VkSampleCountFlagBits sample_count; VkCommandBuffer vk_command_buffer; + struct wined3d_buffer *buffer; unsigned int i; if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)) @@ -2261,6 +2299,16 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c wined3d_context_vk_load_shader_resources(context_vk, state, WINED3D_PIPELINE_GRAPHICS); + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (!(buffer = state->streams[i].buffer)) + continue; + + wined3d_buffer_load(buffer, &context_vk->c, state); + if (!wined3d_buffer_vk(buffer)->bo_user.valid) + context_invalidate_state(&context_vk->c, STATE_STREAMSRC); + } + if (indexed) { wined3d_buffer_load(state->index_buffer, &context_vk->c, state); @@ -2298,6 +2346,9 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c VK_PIPELINE_BIND_POINT_GRAPHICS, context_vk->graphics.vk_pipeline)); } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC)) + wined3d_context_vk_bind_vertex_buffers(context_vk, vk_command_buffer, state, vk_info); + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer) { struct wined3d_bo_vk *bo = &wined3d_buffer_vk(state->index_buffer)->bo;

1 0