wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Alexandre Julliard : makefiles: Use -fshort-wchar when building with msvcrt.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 945efdb6f304fde4399ccfee525816af6cfa5eb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=945efdb6f304fde4399ccfee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:39 2019 +0200 makefiles: Use -fshort-wchar when building with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 35 +++++++++++++++++++++++++++++++---- configure.ac | 4 +++- tools/winebuild/utils.c | 4 ++++ tools/winegcc/winegcc.c | 2 ++ 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 63e58d5..193ecc5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,7 @@ CPPFLAGS = @CPPFLAGS@ CROSSCFLAGS = @CROSSCFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRACROSSCFLAGS= @EXTRACROSSCFLAGS@ -MSVCRTFLAGS = @BUILTINFLAG@ +MSVCRTFLAGS = @MSVCRTFLAGS@ TARGETFLAGS = @TARGETFLAGS@ LDDLLFLAGS = @LDDLLFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ diff --git a/configure b/configure index d3253a2..69d085c 100755 --- a/configure +++ b/configure @@ -631,7 +631,8 @@ RT_LIBS POLL_LIBS DL_LIBS TOOLSEXT -BUILTINFLAG +UNWINDFLAGS +MSVCRTFLAGS EXCESS_PRECISION_CFLAGS EXTRACFLAGS VKD3D_LIBS @@ -17121,7 +17122,9 @@ fi ;; esac done - case $host_os in + MSVCRTFLAGS="" + + case $host_os in cygwin*|mingw32*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } @@ -17146,8 +17149,32 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_builtin" >&5 $as_echo "$ac_cv_cflags__fno_builtin" >&6; } if test "x$ac_cv_cflags__fno_builtin" = xyes; then : - BUILTINFLAG="-fno-builtin" - + MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fshort-wchar" >&5 +$as_echo_n "checking whether the compiler supports -fshort-wchar... " >&6; } +if ${ac_cv_cflags__fshort_wchar+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fshort-wchar" +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__fshort_wchar=yes +else + ac_cv_cflags__fshort_wchar=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__fshort_wchar" >&5 +$as_echo "$ac_cv_cflags__fshort_wchar" >&6; } +if test "x$ac_cv_cflags__fshort_wchar" = xyes; then : + MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" fi ;; esac diff --git a/configure.ac b/configure.ac index c7f5236..0490b53 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,9 +2011,11 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= done dnl Disable gcc builtins except for Mingw + AC_SUBST(MSVCRTFLAGS,"") case $host_os in cygwin*|mingw32*) ;; - *) WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) ;; + *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) + WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index b8a5125..315643c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -462,6 +462,10 @@ struct strarray get_ld_command(void) break; } } + + if (target_cpu == CPU_ARM && target_platform != PLATFORM_WINDOWS) + strarray_add( &args, "--no-wchar-size-warning", NULL ); + return args; } diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 33f838f..28dce1b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -477,6 +477,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, "-shared" ); strarray_add( flags, "-Wl,-Bsymbolic" ); + if (!opts->noshortwchar && opts->target_cpu == CPU_ARM) + strarray_add( flags, "-Wl,--no-wchar-size-warning" ); /* Try all options first - this is likely to succeed on modern compilers */ if (!try_link( opts->prefix, link_tool, "-fPIC -shared -Wl,-Bsymbolic "

1 0

Alexandre Julliard : makefiles: Don' t depend on cross import library if not necessary.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 40a76a212bf92547af8f16c0c3d5bcf83cbe7ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a76a212bf92547af8f16c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:54:45 2019 +0200 makefiles: Don't depend on cross import library if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 24def39..7ed9efd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3553,9 +3553,13 @@ static void output_subdirs( struct makefile *make ) } else { - strarray_add( &build_deps, strmake( "%s.a", importlib_path )); - if (needs_delay_lib( submake )) output( "%s.delay.a ", importlib_path ); + if (needs_delay_lib( submake )) + { + output( "%s.delay.a ", importlib_path ); + strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); + } output( "%s.a: %s", importlib_path, spec_file ); + strarray_add( &build_deps, strmake( "%s.a", importlib_path )); } output_filename( tools_path( make, "winebuild" )); output( "\n" ); @@ -3568,8 +3572,16 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); if (crosstarget && (needs_cross_lib( submake ) || needs_delay_lib( submake ))) { - if (needs_cross_lib( submake )) output_filename( strmake( "%s.cross.a", importlib_path )); - if (needs_delay_lib( submake )) output_filename( strmake( "%s.delay.a", importlib_path )); + if (needs_cross_lib( submake )) + { + output_filename( strmake( "%s.cross.a", importlib_path )); + strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); + } + if (needs_delay_lib( submake )) + { + output_filename( strmake( "%s.delay.a", importlib_path )); + strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); + } output( ": %s", spec_file ); output_filename( tools_path( make, "winebuild" )); output( "\n" ); @@ -3578,10 +3590,7 @@ static void output_subdirs( struct makefile *make ) output_filename( "--export" ); output_filename( spec_file ); output( "\n" ); - strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); } - if (needs_delay_lib( submake )) - strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path )); } strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); }

1 0

Alexandre Julliard : winebuild: Support relay debugging for PE builtin dlls.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 6c41cc61529f238fd7a7dc7eb4162d0fe8427e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c41cc61529f238fd7a7dc7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 21:33:47 2019 +0200 winebuild: Support relay debugging for PE builtin dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 ++++++++- dlls/ntdll/relay.c | 47 ++++++++++++++++++++++++++++++++++++++++------- tools/winebuild/spec32.c | 30 ++++++++++++++++++++++-------- 3 files changed, 70 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8dae813..c77f329 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2190,7 +2190,14 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam } SERVER_END_REQ; - if ((wm->ldr.Flags & LDR_IMAGE_IS_DLL) && TRACE_ON(snoop)) SNOOP_SetupDLL( module ); + if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) + { + if (TRACE_ON(relay)) RELAY_SetupDLL( module ); + } + else + { + if ((wm->ldr.Flags & LDR_IMAGE_IS_DLL) && TRACE_ON(snoop)) SNOOP_SetupDLL( module ); + } TRACE_(loaddll)( "Loaded %s at %p: %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), module, dll_type ); diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 255d0e1..1deb2b7 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); struct relay_descr /* descriptor for a module */ { - void *magic; /* signature */ + ULONG_PTR magic; /* signature */ void *relay_call; /* functions to call from relay thunks */ void *private; /* reserved for the relay code private data */ const char *entry_point_base; /* base address of entry point thunks */ @@ -50,7 +50,13 @@ struct relay_descr /* descriptor for a module */ const char *args_string; /* string describing the arguments */ }; -#define RELAY_DESCR_MAGIC ((void *)0xdeb90002) +struct relay_descr_rva /* RVA to the descriptor for PE dlls */ +{ + DWORD magic; + DWORD descr; +}; + +#define RELAY_DESCR_MAGIC 0xdeb90002 #define IS_INTARG(x) (((ULONG_PTR)(x) >> 16) == 0) /* private data built at dll load time */ @@ -837,6 +843,26 @@ __ASM_GLOBAL_FUNC( relay_call, #endif +static struct relay_descr *get_relay_descr( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, + DWORD exp_size ) +{ + struct relay_descr *descr; + struct relay_descr_rva *rva; + ULONG_PTR ptr = (ULONG_PTR)module + exports->Name; + + /* sanity checks */ + if (ptr <= (ULONG_PTR)(exports + 1)) return NULL; + if (ptr > (ULONG_PTR)exports + exp_size) return NULL; + if (ptr % sizeof(DWORD)) return NULL; + + rva = (struct relay_descr_rva *)ptr - 1; + if (rva->magic != RELAY_DESCR_MAGIC) return NULL; + if (rva->descr) descr = (struct relay_descr *)((char *)module + rva->descr); + else descr = (struct relay_descr *)((const char *)exports + exp_size); + if (descr->magic != RELAY_DESCR_MAGIC) return NULL; + return descr; +} + /*********************************************************************** * RELAY_GetProcAddress * @@ -846,9 +872,9 @@ FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *expo DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) { struct relay_private_data *data; - const struct relay_descr *descr = (const struct relay_descr *)((const char *)exports + exp_size); + const struct relay_descr *descr = get_relay_descr( module, exports, exp_size ); - if (descr->magic != RELAY_DESCR_MAGIC || !(data = descr->private)) return proc; /* no relay data */ + if (!descr || !(data = descr->private)) return proc; /* no relay data */ if (!data->entry_points[ordinal].orig_func) return proc; /* not a relayed function */ if (check_from_module( debug_from_relay_includelist, debug_from_relay_excludelist, user )) return proc; /* we want to relay it */ @@ -866,18 +892,19 @@ void RELAY_SetupDLL( HMODULE module ) IMAGE_EXPORT_DIRECTORY *exports; DWORD *funcs; unsigned int i, len; - DWORD size, entry_point_rva; + DWORD size, entry_point_rva, old_prot; struct relay_descr *descr; struct relay_private_data *data; const WORD *ordptr; + void *func_base; + SIZE_T func_size; RtlRunOnceExecuteOnce( &init_once, init_debug_lists, NULL, NULL ); exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size ); if (!exports) return; - descr = (struct relay_descr *)((char *)exports + size); - if (descr->magic != RELAY_DESCR_MAGIC) return; + if (!(descr = get_relay_descr( module, exports, size ))) return; if (!(data = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) + (exports->NumberOfFunctions-1) * sizeof(data->entry_points) ))) @@ -907,6 +934,10 @@ void RELAY_SetupDLL( HMODULE module ) funcs = (DWORD *)((char *)module + exports->AddressOfFunctions); entry_point_rva = descr->entry_point_base - (const char *)module; + + func_base = funcs; + func_size = exports->NumberOfFunctions * sizeof(*funcs); + NtProtectVirtualMemory( NtCurrentProcess(), &func_base, &func_size, PAGE_READWRITE, &old_prot ); for (i = 0; i < exports->NumberOfFunctions; i++, funcs++) { if (!descr->entry_point_offsets[i]) continue; /* not a normal function */ @@ -916,6 +947,8 @@ void RELAY_SetupDLL( HMODULE module ) data->entry_points[i].orig_func = (char *)module + *funcs; *funcs = entry_point_rva + descr->entry_point_offsets[i]; } + if (old_prot != PAGE_READWRITE) + NtProtectVirtualMemory( NtCurrentProcess(), &func_base, &func_size, old_prot, &old_prot ); } #else /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 68b50f9..a0aa017 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -379,6 +379,7 @@ static void output_relay_debug( DLLSPEC *spec ) void output_exports( DLLSPEC *spec ) { int i, fwd_size = 0; + int needs_relay = has_relays( spec ); int nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; const char *func_ptr = (target_platform == PLATFORM_WINDOWS) ? ".rva" : get_asm_ptr_keyword(); @@ -472,6 +473,13 @@ void output_exports( DLLSPEC *spec ) } } + if (needs_relay) + { + output( "\t.long 0xdeb90002\n" ); /* magic */ + if (target_platform == PLATFORM_WINDOWS) output_rva( ".L__wine_spec_relay_descr" ); + else output( "\t.long 0\n" ); + } + /* output the export name strings */ output( "\n.L__wine_spec_exp_names:\n" ); @@ -493,17 +501,23 @@ void output_exports( DLLSPEC *spec ) } } - if (target_platform == PLATFORM_WINDOWS) return; - - output( "\t.align %d\n", get_alignment(get_ptr_size()) ); - output( ".L__wine_spec_exports_end:\n" ); - /* output relays */ - if (!has_relays( spec )) + if (target_platform == PLATFORM_WINDOWS) { - output( "\t%s 0\n", get_asm_ptr_keyword() ); - return; + if (!needs_relay) return; + output( "\t.data\n" ); + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + } + else + { + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + output( ".L__wine_spec_exports_end:\n" ); + if (!needs_relay) + { + output( "\t%s 0\n", get_asm_ptr_keyword() ); + return; + } } output( ".L__wine_spec_relay_descr:\n" );

1 0

Alexandre Julliard : cabinet/tests: Remove duplicate defines.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: d38ec9e226422dc2fb2b5461400ae09858a98012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38ec9e226422dc2fb2b5461… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:12 2019 +0200 cabinet/tests: Remove duplicate defines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/tests/fdi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 80f6a3c..1f1c6e2 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -20,6 +20,8 @@ */ #include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> #include <windows.h> #include "fci.h" #include "fdi.h" @@ -31,16 +33,6 @@ static CHAR CURR_DIR[MAX_PATH]; -/* avoid including CRT headers */ -#ifndef _O_BINARY -# define _O_BINARY 0x8000 -#endif - -#ifndef _S_IREAD -# define _S_IREAD 0x0100 -# define _S_IWRITE 0x0080 -#endif - #include <pshpack1.h> struct CFHEADER

1 0

Alexandre Julliard : cabarc: Remove duplicate defines.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 92e50f57574d61a434aaff4c85163e2deec01ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e50f57574d61a434aaff4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 22:55:01 2019 +0200 cabarc: Remove duplicate defines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/cabarc.c | 40 +++------------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 7050d8c..66630db 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -20,6 +20,9 @@ #include <stdio.h> #include <stdlib.h> +#include <fcntl.h> +#include <io.h> +#include <share.h> #define WIN32_LEAN_AND_MEAN #include "windows.h" @@ -30,43 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); -/* from msvcrt */ -#ifndef _O_RDONLY -#define _O_RDONLY 0 -#define _O_WRONLY 1 -#define _O_RDWR 2 -#define _O_APPEND 0x0008 -#define _O_RANDOM 0x0010 -#define _O_SEQUENTIAL 0x0020 -#define _O_TEMPORARY 0x0040 -#define _O_NOINHERIT 0x0080 -#define _O_CREAT 0x0100 -#define _O_TRUNC 0x0200 -#define _O_EXCL 0x0400 -#define _O_SHORT_LIVED 0x1000 -#define _O_TEXT 0x4000 -#define _O_BINARY 0x8000 -#endif - -#ifndef _O_ACCMODE -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) -#endif - -#ifndef _SH_COMPAT -#define _SH_COMPAT 0x00 -#define _SH_DENYRW 0x10 -#define _SH_DENYWR 0x20 -#define _SH_DENYRD 0x30 -#define _SH_DENYNO 0x40 -#endif - -#ifndef _A_RDONLY -#define _A_RDONLY 0x01 -#define _A_HIDDEN 0x02 -#define _A_SYSTEM 0x04 -#define _A_ARCH 0x20 -#endif - /* command-line options */ static int opt_cabinet_size = CB_MAX_DISK; static int opt_cabinet_id;

1 0

Józef Kucia : vkd3d: Simplify checking for render pass compatibility.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: e7e0f4180d8f348d7f6d606eae54fbf2e731848c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e7e0f4180d8f348d7f6d606… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:17 2019 +0200 vkd3d: Simplify checking for render pass compatibility. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 21 +++++++++++++-------- libs/vkd3d/state.c | 22 ---------------------- libs/vkd3d/vkd3d_private.h | 2 -- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d528327..9187ad0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2415,6 +2415,7 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + VkRenderPass vk_render_pass; VkPipeline vk_pipeline; if (list->current_pipeline != VK_NULL_HANDLE) @@ -2427,11 +2428,20 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list } if (!(vk_pipeline = d3d12_pipeline_state_get_or_create_pipeline(list->state, - list->primitive_topology, list->strides, list->dsv_format, &list->pso_render_pass))) + list->primitive_topology, list->strides, list->dsv_format, &vk_render_pass))) return false; - if (!list->pso_render_pass) - list->pso_render_pass = list->state->u.graphics.render_pass; + if (!vk_render_pass) + vk_render_pass = list->state->u.graphics.render_pass; + + /* The render pass cache ensures that we use the same Vulkan render pass + * object for compatible render passes. */ + if (list->pso_render_pass != vk_render_pass) + { + list->pso_render_pass = vk_render_pass; + d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_render_pass(list); + } VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); list->current_pipeline = vk_pipeline; @@ -3648,11 +3658,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics } else { - if (!d3d12_pipeline_state_is_render_pass_compatible(list->state, state)) - { - d3d12_command_list_invalidate_current_framebuffer(list); - d3d12_command_list_invalidate_current_render_pass(list); - } d3d12_command_list_invalidate_current_pipeline(list); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a447eb5..c5f66b6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2027,28 +2027,6 @@ static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *forma return VKD3D_NO_SWIZZLE; } -/* - * This must return results in accordance with render passes created by - * d3d12_pipeline_state_init_graphics(). - */ -bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, - const struct d3d12_pipeline_state *state_b) -{ - const struct d3d12_graphics_pipeline_state *a = &state_a->u.graphics; - const struct d3d12_graphics_pipeline_state *b = &state_b->u.graphics; - - if (!state_a != !state_b) - return false; - if (!state_a && !state_b) - return true; - - if (state_a->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS - || state_b->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) - return false; - - return a->render_pass == b->render_pass; -} - STATIC_ASSERT(sizeof(struct vkd3d_shader_transform_feedback_element) == sizeof(D3D12_SO_DECLARATION_ENTRY)); static HRESULT d3d12_graphics_pipeline_state_create_render_pass( diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 44e61c2..0f0d77f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -743,8 +743,6 @@ HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, - const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; struct vkd3d_buffer

1 0

Józef Kucia : readme: Document build macros.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 1930e60ab38d9b11cce46a90d7a2245c478fbe3d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1930e60ab38d9b11cce46a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:16 2019 +0200 readme: Document build macros. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README b/README index b9853ba..2e42249 100644 --- a/README +++ b/README @@ -19,6 +19,11 @@ available or is not recent (>= 3.20), then you can build Wine with `make tools/widl' to avoid building all of Wine. You can then point vkd3d's configure at that widl binary with `WIDL="/path/to/widl"'. +For release builds, you may want to define NDEBUG. If you do not need debug log +messages, you may also consider VKD3D_NO_TRACE_MESSAGES and +VKD3D_NO_DEBUG_MESSAGES. For example, you can pass `CPPFLAGS="-DNDEBUG +-DVKD3D_NO_TRACE_MESSAGES"' to configure. + =========== Using vkd3d ===========

1 0

Józef Kucia : readme: Document environment variables.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 33ba9b27ed7cb8d43a655130fcbad368fa195116 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33ba9b27ed7cb8d43a65513… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:15 2019 +0200 readme: Document environment variables. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/README b/README index be329e1..b9853ba 100644 --- a/README +++ b/README @@ -28,3 +28,40 @@ at build-time with some modest source modifications. If vkd3d is available when building Wine, then Wine will use it to support Direct3D 12 applications. + +===================== +Environment variables +===================== + +Most of the environment variables used by vkd3d are for debugging purposes. The +environment variables are not considered a part of API and might be changed or +removed in the future versions of vkd3d. + +Some of debug variables are lists of elements. Elements must be separated by +commas or semicolons. + + * VKD3D_CONFIG - a list of options that change the behavior of libvkd3d. + * vk_debug - enables Vulkan debug extensions. + + * VKD3D_DEBUG - controls the debug level for log messages produced by + libvkd3d. Accepts the following values: none, err, fixme, warn, trace. + + * VKD3D_VULKAN_DEVICE - a zero-based device index. Use to force the selected + Vulkan device. + + * VKD3D_DISABLE_EXTENSIONS - a list of Vulkan extensions that libvkd3d should + not use even if available. + + * VKD3D_SHADER_DEBUG - controls the debug level for log messages produced by + libvkd3d-shader. See VKD3D_DEBUG for accepted values. + + * VKD3D_SHADER_DUMP_PATH - path where shader bytecode is dumped. + + * VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1 + or 2. + + * VKD3D_TEST_PLATFORM - can be set to "wine", "windows" or "other". The test + platform controls the behavior of todo(), todo_if(), bug_if() and broken() + conditions in tests. + + * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests.

1 0

Józef Kucia : vkd3d: Handle lists in debug env vars consistently.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 51b930192a58b0856546d15191fc2be13cfafeb2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=51b930192a58b0856546d15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:14 2019 +0200 vkd3d: Handle lists in debug env vars consistently. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 42 ++++++++++++++++++++++++------------------ libs/vkd3d/device.c | 7 +------ 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 80c5781..2ef8a00 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -22,6 +22,7 @@ #include "vkd3d_common.h" #include <stdarg.h> +#include <stdbool.h> #include <stdint.h> #ifdef VKD3D_NO_TRACE_MESSAGES @@ -100,6 +101,7 @@ struct vkd3d_debug_option uint64_t flag; }; +bool vkd3d_debug_list_has_member(const char *string, const char *member) DECLSPEC_HIDDEN; uint64_t vkd3d_parse_debug_options(const char *string, const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 9a27c22..33deed6 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -323,34 +323,40 @@ static bool is_option_separator(char c) return c == ',' || c == ';' || c == '\0'; } +bool vkd3d_debug_list_has_member(const char *string, const char *member) +{ + char prev_char, next_char; + const char *p; + + p = string; + while (p) + { + if ((p = strstr(p, member))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(member); + next_char = *p; + + if (is_option_separator(prev_char) && is_option_separator(next_char)) + return true; + } + } + + return false; +} + uint64_t vkd3d_parse_debug_options(const char *string, const struct vkd3d_debug_option *options, unsigned int option_count) { - char prev_char, next_char; uint64_t flags = 0; unsigned int i; - const char *p; for (i = 0; i < option_count; ++i) { const struct vkd3d_debug_option *opt = &options[i]; - p = string; - while (p) - { - if ((p = strstr(p, opt->name))) - { - prev_char = p > string ? p[-1] : 0; - p += strlen(opt->name); - next_char = *p; - - if (is_option_separator(prev_char) && is_option_separator(next_char)) - { - flags |= opt->flag; - break; - } - } - } + if (vkd3d_debug_list_has_member(string, opt->name)) + flags |= opt->flag; } return flags; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5c15808..5239911 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -180,16 +180,11 @@ static unsigned int get_spec_version(const VkExtensionProperties *extensions, static bool is_extension_disabled(const char *extension_name) { const char *disabled_extensions; - const char *s; - size_t len; if (!(disabled_extensions = getenv("VKD3D_DISABLE_EXTENSIONS"))) return false; - if (!(s = strstr(disabled_extensions, extension_name))) - return false; - len = strlen(extension_name); - return s[len] == ';' || s[len] == '\0'; + return vkd3d_debug_list_has_member(disabled_extensions, extension_name); } static bool has_extension(const VkExtensionProperties *extensions,

1 0

Józef Kucia : vkd3d: Defer creating render pass only when depth-stencil tests are enabled.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: ee1b8cc511edede748ec5c67097bf56fab59136f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee1b8cc511edede748ec5c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:13 2019 +0200 vkd3d: Defer creating render pass only when depth-stencil tests are enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7bce614..a447eb5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2110,12 +2110,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; + bool have_attachment, is_dsv_format_unknown; VkShaderStageFlagBits xfb_stage = 0; VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; unsigned int instance_divisor; VkVertexInputRate input_rate; - bool have_attachment; unsigned int i, j; size_t rt_count; uint32_t mask; @@ -2527,8 +2527,10 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + is_dsv_format_unknown = graphics->null_attachment_mask & (1u << graphics->rt_count); + rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); - have_attachment = graphics->rt_count || graphics->dsv_format || (graphics->null_attachment_mask & (1u << graphics->rt_count)); + have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; @@ -2554,7 +2556,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE; - if (graphics->dsv_format == VK_FORMAT_UNDEFINED) + /* We defer creating the render pass for pipelines wth DSVFormat equal to + * DXGI_FORMAT_UNKNOWN. We take the actual DSV format from the bound DSV. */ + if (is_dsv_format_unknown) graphics->render_pass = VK_NULL_HANDLE; else if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, device, 0, &graphics->render_pass)))

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 May 2019