May 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : amstream: Reimplement IBaseFilter methods in the media stream filter.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 7ef5f3be5aaf6317414826a5b979a6c288b13697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef5f3be5aaf6317414826a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:31:06 2019 -0500 amstream: Reimplement IBaseFilter methods in the media stream filter. In the long (or even short) term we probably want to decouple amstream from strmbase entirely. The fact that pins and filters belong to separate objects (and either one can even be provided by the application) prevents us from performing some helpful restructuring. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 225 ++++++++++++++++++++++++-------------- 1 file changed, 144 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef5f3be5aaf63174148…

1 0

Zebediah Figura : qedit/samplegrabber: Correctly delegate IUnknown methods on the IMemInputPin interface.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 5351870ea10a20abfda9755a4a888013d9d80847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5351870ea10a20abfda9755a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:31:04 2019 -0500 qedit/samplegrabber: Correctly delegate IUnknown methods on the IMemInputPin interface. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9474a58..56947a1 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -672,31 +672,22 @@ SampleGrabber_ISampleGrabber_SetCallback(ISampleGrabber *iface, ISampleGrabberCB return S_OK; } - -/* SampleGrabber implementation of IMemInputPin interface */ - -/* IUnknown */ -static HRESULT WINAPI -SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID riid, void **ppv) +static HRESULT WINAPI SampleGrabber_IMemInputPin_QueryInterface(IMemInputPin *iface, REFIID iid, void **out) { - SG_Impl *This = impl_from_IMemInputPin(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); + SG_Impl *filter = impl_from_IMemInputPin(iface); + return IPin_QueryInterface(&filter->pin_in.IPin_iface, iid, out); } -/* IUnknown */ -static ULONG WINAPI -SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface) +static ULONG WINAPI SampleGrabber_IMemInputPin_AddRef(IMemInputPin *iface) { - SG_Impl *This = impl_from_IMemInputPin(iface); - return IUnknown_AddRef(This->outer_unk); + SG_Impl *filter = impl_from_IMemInputPin(iface); + return IPin_AddRef(&filter->pin_in.IPin_iface); } -/* IUnknown */ -static ULONG WINAPI -SampleGrabber_IMemInputPin_Release(IMemInputPin *iface) +static ULONG WINAPI SampleGrabber_IMemInputPin_Release(IMemInputPin *iface) { - SG_Impl *This = impl_from_IMemInputPin(iface); - return IUnknown_Release(This->outer_unk); + SG_Impl *filter = impl_from_IMemInputPin(iface); + return IPin_Release(&filter->pin_in.IPin_iface); } /* IMemInputPin */

1 0

Alistair Leslie-Hughes : wineqtdecoder: Fix compile on MacOS.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 6d0f7b4b7571bb587ebf2b71c2369facb04bb958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d0f7b4b7571bb587ebf2b71… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 17 03:17:23 2019 +0000 wineqtdecoder: Fix compile on MacOS. Regression of 0f9e4cd6600713628c92e3ceb40bd8aa38084f30 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 4e8278b..4ad73d8 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -533,7 +533,7 @@ IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) return NULL; } - hr = TransformFilter_Construct(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder, + hr = strmbase_transform_create(sizeof(QTVDecoderImpl), &CLSID_QTVDecoder, &QTVDecoder_FuncsTable, (IBaseFilter **)&This); if (FAILED(hr))

1 0

Alexandre Julliard : winebuild: Support relay debugging for PE builtin dlls.
by Alexandre Julliard May 17, 2019

May 17, 2019

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 : cabarc: Remove duplicate defines.
by Alexandre Julliard May 17, 2019

May 17, 2019

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: Handle lists in debug env vars consistently.
by Alexandre Julliard May 17, 2019

May 17, 2019

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: Simplify checking for render pass compatibility.
by Alexandre Julliard May 17, 2019

May 17, 2019

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

May 17, 2019

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 : vkd3d: Disable unncessary depth tests.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: vkd3d Branch: master Commit: f629cdecc1b41e2d7bd38e76e05270530acfdfcb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f629cdecc1b41e2d7bd38e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:12 2019 +0200 vkd3d: Disable unncessary depth tests. Allows us to create the render pass while creating the pipeline state. 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 | 13 ++++++++++--- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b3348d6..7bce614 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2228,8 +2228,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->rtv_formats[i] = VK_FORMAT_UNDEFINED; graphics->rt_count = rt_count; + ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN + && graphics->ds_desc.depthTestEnable && !graphics->ds_desc.depthWriteEnable + && graphics->ds_desc.depthCompareOp == VK_COMPARE_OP_ALWAYS && !graphics->ds_desc.stencilTestEnable) + { + TRACE("Disabling depth test.\n"); + graphics->ds_desc.depthTestEnable = VK_FALSE; + } + graphics->dsv_format = VK_FORMAT_UNDEFINED; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + if (graphics->ds_desc.depthTestEnable || graphics->ds_desc.stencilTestEnable) { if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN) { @@ -2545,8 +2554,6 @@ 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; - ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); - if (graphics->dsv_format == VK_FORMAT_UNDEFINED) graphics->render_pass = VK_NULL_HANDLE; else if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, diff --git a/tests/d3d12.c b/tests/d3d12.c index 36bc41c..c7dfd8a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4963,6 +4963,39 @@ static void test_unknown_dsv_format(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + /* DSVFormat = DXGI_FORMAT_UNKNOWN and D3D12_COMPARISON_FUNC_ALWAYS */ + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.6f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + destroy_depth_stencil(&ds); destroy_test_context(&context); }

1 0

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

May 17, 2019

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