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

[PATCH] vcruntime140_1: Use return address from catch block routine if not provided by catch block info.
by Daniel Lehman May 22, 2020

May 22, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- this sample runs an infinite loop of 'catch: int' built with vs2019: cl /MD /EHs simple.cpp void test_crash_simple(void) { try { throw 0x42; } catch (int x) { printf("catch: int\n"); } } ret_addr isn't set - remains zero - and the return address in the catch record is the start of the function (ExceptionInformation[8] = ci.ret_addr + BeginAddress) call_catch_block4 sees this non-null address and resumes at the start of the function where the exception happened and hits the exception again, leading to a crash this change only sets the return address if non-zero. the catch record is already zeroed by the memset. call_catch_block4 already defaults to the address returned from the handler and only uses the one from the catch_record if non-null --- dlls/vcruntime140_1/except_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 4cc6897223..e1a39c0662 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -603,7 +603,8 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, (ULONG_PTR)rva_to_ptr(ci.handler, dispatch->ImageBase); catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; - catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( + if (ci.ret_addr) + catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( ci.ret_addr + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); } -- 2.17.1

2 1

[PATCH] ntdll: NtQuerySystemInformation support SystemCodeIntegrityInformation
by Alistair Leslie-Hughes May 22, 2020

May 22, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49192 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/nt.c | 8 ++++++++ include/winternl.h | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 03bf45d0a0..d317e0dc7c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3049,6 +3049,14 @@ NTSTATUS WINAPI NtQuerySystemInformation( } } break; + case SystemCodeIntegrityInformation: + { + SYSTEM_CODEINTEGRITY_INFORMATION *info = (SYSTEM_CODEINTEGRITY_INFORMATION*)SystemInformation;; + FIXME("SystemCodeIntegrityInformation, len %u, buffer %p, stub!\n", Length, info); + + info->CodeIntegrityOptions = CODEINTEGRITY_OPTION_ENABLED; + break; + } default: FIXME("(0x%08x,%p,0x%08x,%p) stub\n", SystemInformationClass,SystemInformation,Length,ResultLength); diff --git a/include/winternl.h b/include/winternl.h index 14455946ba..f83dae3688 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -971,10 +971,32 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemSuperfetchInformation = 79, SystemMemoryListInformation = 80, SystemFileCacheInformationEx = 81, + SystemCodeIntegrityInformation = 103, SystemLogicalProcessorInformationEx = 107, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; +typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION +{ + ULONG Length; + ULONG CodeIntegrityOptions; +} SYSTEM_CODEINTEGRITY_INFORMATION, *PSYSTEM_CODEINTEGRITY_INFORMATION; + +#define CODEINTEGRITY_OPTION_ENABLED 0x0001 +#define CODEINTEGRITY_OPTION_TESTSIGN 0x0002 +#define CODEINTEGRITY_OPTION_UMCI_ENABLED 0x0004 +#define CODEINTEGRITY_OPTION_UMCI_AUDITMODE_ENABLED 0x0008 +#define CODEINTEGRITY_OPTION_UMCI_EXCLUSIONPATHS_ENABLED 0x0010 +#define CODEINTEGRITY_OPTION_TEST_BUILD 0x0020 +#define CODEINTEGRITY_OPTION_PREPRODUCTION_BUILD 0x0040 +#define CODEINTEGRITY_OPTION_DEBUGMODE_ENABLED 0x0080 +#define CODEINTEGRITY_OPTION_FLIGHT_BUILD 0x0100 +#define CODEINTEGRITY_OPTION_FLIGHTING_ENABLED 0x0200 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_ENABLED 0x0400 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_AUDITMODE_ENABLED 0x0800 +#define CODEINTEGRITY_OPTION_HVCI_KMCI_STRICTMODE_ENABLED 0x1000 +#define CODEINTEGRITY_OPTION_HVCI_IUM_ENABLED 0x2000 + typedef enum _THREADINFOCLASS { ThreadBasicInformation = 0, ThreadTimes, -- 2.26.2

1 0

[PATCH] Fix issue on showing mouse pointer on Mouse Prop Dlg
by zecarlos jesus May 22, 2020

May 22, 2020

[PATCH] Fix issue on showing mouse pointer on Mouse Prop Dlg static BOOL get_icon_size( HICON handle, SIZE *size ) { ICONINFO info; BITMAP bmp; int ret; if (!GetIconInfo(handle, &info)) return FALSE; - ret = GetObjectW(info.hbmColor, sizeof(bmp), &bmp); + ret = GetObjectW(info.hbmMask, sizeof(bmp), &bmp); if (ret) { size->cx = bmp.bmWidth; size->cy = bmp.bmHeight; + /* + If this structure defines a black and white icon, this bitmask is formatted + so that the upper half is the icon AND bitmask and the lower half is + the icon XOR bitmask. + */ + if (info.hbmColor == 0) + size->cy = (size->cy >> 1); } DeleteObject(info.hbmMask); DeleteObject(info.hbmColor); return !!ret; }

1 0

[COMCTL32] Fix issue on showing mouse pointer on Mouse Prop Dlg
by zecarlos jesus May 21, 2020

May 21, 2020

https://github.com/reactos/reactos/pull/2829 [COMCTL32] Fix issue on showing mouse pointer on Mouse Prop Dlg [https://avatars1.githubusercontent.com/u/1056157?s=400&v=4]<https://github.com/reactos/reactos/pull/2829> [COMCTL32] Fix issue on showing mouse pointer on Mouse Prop Dlg by zecarlos1957 · Pull Request #2829 · reactos/reactos<https://github.com/reactos/reactos/pull/2829> [COMCTL32] Fix issue on showing mouse pointer GetIconInfo() fill info.hbmColor with NULL HBITMAP handle on black/white bitmaps JIRA issue: CORE-17062 github.com

1 0

[PATCH] wine.inf: Install some driver libraries in the system32/drivers subdirectory.
by Zebediah Figura May 21, 2020

May 21, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e4f3d74886..0a43cc779c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2612,11 +2612,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,hidclass.sys,- 12,,http.sys,- 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,scsiport.sys,- 12,,tdi.sys,- +12,,usbd.sys,- 12,,winebus.sys,- 12,,winehid.sys,- 12,,wineusb.sys,- @@ -2665,11 +2668,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,hidclass.sys 12,,http.sys 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys +12,,scsiport.sys 12,,tdi.sys +12,,usbd.sys 12,,winebus.sys 12,,winehid.sys 12,,wineusb.sys -- 2.26.2

1 0

[COMCTL32] Fix issue on showing mouse pointer on Mouse Prop Dlg
by zecarlos jesus May 21, 2020

May 21, 2020

static BOOL get_icon_size( HICON handle, SIZE *size ) { ICONINFO info; BITMAP bmp; int ret; if (!GetIconInfo(handle, &info)) return FALSE; ret = GetObjectW(info.hbmMask, sizeof(bmp), &bmp); if (ret) { size->cx = bmp.bmWidth; size->cy = bmp.bmHeight; /* If this structure defines a black and white icon, this bitmask is formatted so that the upper half is the icon AND bitmask and the lower half is the icon XOR bitmask. */ if (!info.hbmColor) size->cy /= 2; } GetIconInfo() fill info.hbmColor with NULL HBITMAP handle on black/white bitmaps DeleteObject(info.hbmMask); DeleteObject(info.hbmColor); return !!ret; }

1 0

[PATCH 5/5] wined3d: Move the swapchain fps counter to wined3d_cs_exec_present().
by Henri Verbeet May 21, 2020

May 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 16 ++++++++++++++++ dlls/wined3d/swapchain.c | 33 --------------------------------- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 113b8ff84f6..89e59b5373a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -21,6 +21,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(fps); #define WINED3D_INITIAL_CS_SIZE 4096 @@ -529,6 +530,21 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->swap_interval, op->flags); + if (TRACE_ON(fps)) + { + DWORD time = GetTickCount(); + ++swapchain->frames; + + /* every 1.5 seconds */ + if (time - swapchain->prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps\n", + swapchain, 1000.0 * swapchain->frames / (time - swapchain->prev_time)); + swapchain->prev_time = time; + swapchain->frames = 0; + } + } + wined3d_resource_release(&swapchain->front_buffer->resource); for (i = 0; i < swapchain->state.desc.backbuffer_count; ++i) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0af6e8e41c5..9020a995209 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -25,7 +25,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(fps); void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) { @@ -565,21 +564,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, wined3d_swapchain_gl_rotate(swapchain, context); TRACE("SwapBuffers called, Starting new frame\n"); - /* FPS support */ - if (TRACE_ON(fps)) - { - DWORD time = GetTickCount(); - ++swapchain->frames; - - /* every 1.5 seconds */ - if (time - swapchain->prev_time > 1500) - { - TRACE_(fps)("%p @ approx %.2ffps\n", - swapchain, 1000.0 * swapchain->frames / (time - swapchain->prev_time)); - swapchain->prev_time = time; - swapchain->frames = 0; - } - } wined3d_texture_validate_location(swapchain->front_buffer, 0, WINED3D_LOCATION_DRAWABLE); wined3d_texture_invalidate_location(swapchain->front_buffer, 0, ~WINED3D_LOCATION_DRAWABLE); @@ -702,23 +686,6 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, back->bitmap = bitmap; swapchain->back_buffers[0]->resource.heap_memory = data; - /* FPS support */ - if (TRACE_ON(fps)) - { - static LONG prev_time, frames; - DWORD time = GetTickCount(); - - ++frames; - - /* every 1.5 seconds */ - if (time - prev_time > 1500) - { - TRACE_(fps)("@ approx %.2ffps\n", 1000.0 * frames / (time - prev_time)); - prev_time = time; - frames = 0; - } - } - SetRect(&swapchain->front_buffer_update, 0, 0, swapchain->front_buffer->resource.width, swapchain->front_buffer->resource.height); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Implement vertex attribute divisors for the Vulkan adapter.
by Henri Verbeet May 21, 2020

May 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 48 +++++++++++++++++++++++++++++----- dlls/wined3d/context_vk.c | 27 ++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ dlls/wined3d/wined3d_vk.h | 1 + 4 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0249c4c7af1..8cbd8206617 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -321,8 +321,20 @@ static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_v return E_FAIL; } -static void wined3d_disable_vulkan_features(VkPhysicalDeviceFeatures *features) +struct wined3d_physical_device_info { + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + + VkPhysicalDeviceFeatures2 features2; +}; + +static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info *info) +{ + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features = &info->vertex_divisor_features; + VkPhysicalDeviceFeatures *features = &info->features2.features; + + vertex_divisor_features->vertexAttributeInstanceRateZeroDivisor = VK_FALSE; + features->depthBounds = VK_FALSE; features->alphaToOne = VK_FALSE; features->textureCompressionETC2 = VK_FALSE; @@ -405,6 +417,7 @@ static const struct } vulkan_device_extensions[] = { + {VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME, ~0u}, {VK_KHR_MAINTENANCE1_EXTENSION_NAME, VK_API_VERSION_1_1}, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, VK_API_VERSION_1_1}, }; @@ -472,12 +485,14 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); const char *enabled_device_extensions[ARRAY_SIZE(vulkan_device_extensions)]; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + struct wined3d_physical_device_info physical_device_info; static const float priorities[] = {1.0f}; + VkPhysicalDeviceFeatures2 *features2; struct wined3d_device_vk *device_vk; VkDevice vk_device = VK_NULL_HANDLE; VkDeviceQueueCreateInfo queue_info; - VkPhysicalDeviceFeatures features; VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_index; @@ -492,8 +507,28 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi physical_device = adapter_vk->physical_device; - VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features)); - wined3d_disable_vulkan_features(&features); + memset(&physical_device_info, 0, sizeof(physical_device_info)); + + vertex_divisor_features = &physical_device_info.vertex_divisor_features; + vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + + features2 = &physical_device_info.features2; + features2->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; + features2->pNext = vertex_divisor_features; + + if (vk_info->vk_ops.vkGetPhysicalDeviceFeatures2) + VK_CALL(vkGetPhysicalDeviceFeatures2(physical_device, features2)); + else + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2->features)); + + if (!vertex_divisor_features->vertexAttributeInstanceRateDivisor) + { + WARN("Vertex attribute divisors not supported.\n"); + hr = E_FAIL; + goto fail; + } + + wined3d_disable_vulkan_features(&physical_device_info); queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queue_info.pNext = NULL; @@ -503,7 +538,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi queue_info.pQueuePriorities = priorities; device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - device_info.pNext = NULL; + device_info.pNext = features2->pNext; device_info.flags = 0; device_info.queueCreateInfoCount = 1; device_info.pQueueCreateInfos = &queue_info; @@ -516,7 +551,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi hr = E_FAIL; goto fail; } - device_info.pEnabledFeatures = &features; + device_info.pEnabledFeatures = &features2->features; if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) { @@ -1914,6 +1949,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!vk_ops->core_pfn) \ vk_ops->core_pfn = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #ext_pfn)); MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceProperties2, vkGetPhysicalDeviceProperties2KHR) + MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceFeatures2, vkGetPhysicalDeviceFeaturess2KHR) #undef MAP_INSTANCE_FUNCTION vk_info->instance = instance; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 13d3b4c5445..3a6671036e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1440,6 +1440,12 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi return a->stages[i].module - b->stages[i].module; } + if (a->divisor_desc.vertexBindingDivisorCount != b->divisor_desc.vertexBindingDivisorCount) + return a->divisor_desc.vertexBindingDivisorCount - b->divisor_desc.vertexBindingDivisorCount; + if ((ret = memcmp(a->divisors, b->divisors, + a->divisor_desc.vertexBindingDivisorCount * sizeof(*a->divisors)))) + return ret; + if (a->input_desc.vertexAttributeDescriptionCount != b->input_desc.vertexAttributeDescriptionCount) return a->input_desc.vertexAttributeDescriptionCount - b->input_desc.vertexAttributeDescriptionCount; if ((ret = memcmp(a->attributes, b->attributes, @@ -1526,6 +1532,9 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->input_desc.pVertexBindingDescriptions = key->bindings; key->input_desc.pVertexAttributeDescriptions = key->attributes; + key->divisor_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT; + key->divisor_desc.pVertexBindingDivisors = key->divisors; + key->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; key->ts_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; @@ -1706,8 +1715,8 @@ static void wined3d_context_vk_update_blend_state(const struct wined3d_context_v static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_context_vk *context_vk, const struct wined3d_state *state, VkPipelineLayout vk_pipeline_layout) { + unsigned int i, attribute_count, binding_count, divisor_count, stage_count; const struct wined3d_d3d_info *d3d_info = context_vk->c.d3d_info; - unsigned int i, attribute_count, binding_count, stage_count; struct wined3d_graphics_pipeline_key_vk *key; VkPipelineShaderStageCreateInfo *stage; struct wined3d_stream_info stream_info; @@ -1741,8 +1750,10 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) { wined3d_stream_info_from_declaration(&stream_info, state, d3d_info); + divisor_count = 0; for (i = 0, mask = 0, attribute_count = 0, binding_count = 0; i < ARRAY_SIZE(stream_info.elements); ++i) { + VkVertexInputBindingDivisorDescriptionEXT *d; struct wined3d_stream_info_element *e; VkVertexInputAttributeDescription *a; VkVertexInputBindingDescription *b; @@ -1768,11 +1779,25 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte b->binding = binding; b->stride = e->stride; b->inputRate = e->divisor ? VK_VERTEX_INPUT_RATE_INSTANCE : VK_VERTEX_INPUT_RATE_VERTEX; + + if (e->divisor > 1) + { + d = &key->divisors[divisor_count++]; + d->binding = binding; + d->divisor = e->divisor; + } } + key->input_desc.pNext = NULL; key->input_desc.vertexBindingDescriptionCount = binding_count; key->input_desc.vertexAttributeDescriptionCount = attribute_count; + if (divisor_count) + { + key->input_desc.pNext = &key->divisor_desc; + key->divisor_desc.vertexBindingDivisorCount = divisor_count; + } + update = true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab5df330e76..e9081e5d17d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2323,12 +2323,14 @@ struct wined3d_pipeline_layout_vk struct wined3d_graphics_pipeline_key_vk { VkPipelineShaderStageCreateInfo stages[WINED3D_SHADER_TYPE_GRAPHICS_COUNT]; + VkVertexInputBindingDivisorDescriptionEXT divisors[MAX_ATTRIBS]; VkVertexInputAttributeDescription attributes[MAX_ATTRIBS]; VkVertexInputBindingDescription bindings[MAX_ATTRIBS]; VkViewport viewport; VkRect2D scissor; VkPipelineColorBlendAttachmentState blend_attachments[WINED3D_MAX_RENDER_TARGETS]; + VkPipelineVertexInputDivisorStateCreateInfoEXT divisor_desc; VkPipelineVertexInputStateCreateInfo input_desc; VkPipelineInputAssemblyStateCreateInfo ia_desc; VkPipelineTessellationStateCreateInfo ts_desc; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 0c0c1e16cd2..4a872bcdaa0 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -40,6 +40,7 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) \ /* Vulkan 1.1 */ \ + VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2) \ VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2) #define VK_DEVICE_FUNCS() \ -- 2.20.1

1 0

[PATCH 3/5] wined3d: Implement alpha to coverage multisampling for the Vulkan adapter.
by Henri Verbeet May 21, 2020

May 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0157e213816..13d3b4c5445 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1833,9 +1833,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (key->ms_desc.rasterizationSamples != context_vk->sample_count) + if (key->ms_desc.rasterizationSamples != context_vk->sample_count + || isStateDirty(&context_vk->c, STATE_BLEND)) { key->ms_desc.rasterizationSamples = context_vk->sample_count; + key->ms_desc.alphaToCoverageEnable = state->blend_state && state->blend_state->desc.alpha_to_coverage; update = true; } -- 2.20.1

1 0

[PATCH 2/5] wined3d: Implement stencil tests for the Vulkan adapter.
by Henri Verbeet May 21, 2020

May 21, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 64 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 00d66ed052b..0157e213816 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -218,6 +218,35 @@ static VkPrimitiveTopology vk_topology_from_wined3d(enum wined3d_primitive_type } } +static VkStencilOp vk_stencil_op_from_wined3d(enum wined3d_stencil_op op) +{ + switch (op) + { + case WINED3D_STENCIL_OP_KEEP: + return VK_STENCIL_OP_KEEP; + case WINED3D_STENCIL_OP_ZERO: + return VK_STENCIL_OP_ZERO; + case WINED3D_STENCIL_OP_REPLACE: + return VK_STENCIL_OP_REPLACE; + case WINED3D_STENCIL_OP_INCR_SAT: + return VK_STENCIL_OP_INCREMENT_AND_CLAMP; + case WINED3D_STENCIL_OP_DECR_SAT: + return VK_STENCIL_OP_DECREMENT_AND_CLAMP; + case WINED3D_STENCIL_OP_INVERT: + return VK_STENCIL_OP_INVERT; + case WINED3D_STENCIL_OP_INCR: + return VK_STENCIL_OP_INCREMENT_AND_WRAP; + case WINED3D_STENCIL_OP_DECR: + return VK_STENCIL_OP_DECREMENT_AND_WRAP; + default: + if (!op) + WARN("Unhandled stencil operation %#x.\n", op); + else + FIXME("Unhandled stencil operation %#x.\n", op); + return VK_STENCIL_OP_KEEP; + } +} + void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, struct wined3d_context_vk *context_vk) { @@ -1811,11 +1840,44 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RENDER(WINED3D_RS_ZENABLE))) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RENDER(WINED3D_RS_ZENABLE)) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) { key->ds_desc.depthTestEnable = !!state->render_states[WINED3D_RS_ZENABLE]; key->ds_desc.depthWriteEnable = !!state->render_states[WINED3D_RS_ZWRITEENABLE]; key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(state->render_states[WINED3D_RS_ZFUNC]); + key->ds_desc.stencilTestEnable = state->fb.depth_stencil && state->render_states[WINED3D_RS_STENCILENABLE]; + if (key->ds_desc.stencilTestEnable) + { + key->ds_desc.front.failOp = vk_stencil_op_from_wined3d(state->render_states[WINED3D_RS_STENCILFAIL]); + key->ds_desc.front.passOp = vk_stencil_op_from_wined3d(state->render_states[WINED3D_RS_STENCILPASS]); + key->ds_desc.front.depthFailOp = vk_stencil_op_from_wined3d(state->render_states[WINED3D_RS_STENCILZFAIL]); + key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(state->render_states[WINED3D_RS_STENCILFUNC]); + key->ds_desc.front.compareMask = state->render_states[WINED3D_RS_STENCILMASK]; + key->ds_desc.front.writeMask = state->render_states[WINED3D_RS_STENCILWRITEMASK]; + key->ds_desc.front.reference = state->render_states[WINED3D_RS_STENCILREF] + & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + + if (state->render_states[WINED3D_RS_TWOSIDEDSTENCILMODE]) + { + key->ds_desc.back.failOp = vk_stencil_op_from_wined3d( + state->render_states[WINED3D_RS_BACK_STENCILFAIL]); + key->ds_desc.back.passOp = vk_stencil_op_from_wined3d( + state->render_states[WINED3D_RS_BACK_STENCILPASS]); + key->ds_desc.back.depthFailOp = vk_stencil_op_from_wined3d( + state->render_states[WINED3D_RS_BACK_STENCILZFAIL]); + key->ds_desc.back.compareOp = vk_compare_op_from_wined3d( + state->render_states[WINED3D_RS_BACK_STENCILFUNC]); + key->ds_desc.back.compareMask = state->render_states[WINED3D_RS_STENCILMASK]; + key->ds_desc.back.writeMask = state->render_states[WINED3D_RS_STENCILWRITEMASK]; + key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] + & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + } + else + { + key->ds_desc.back = key->ds_desc.front; + } + } update = true; } -- 2.20.1

1 0