wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS2.
by Alexandre Julliard 22 May '20

22 May '20

Module: vkd3d Branch: master Commit: 6e0590adf6f899af2fe0c5697942050b7e124971 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e0590adf6f899af2fe0c56… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Fri May 22 16:45:16 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS2. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 13 +++++++++++++ libs/vkd3d/device.c | 23 +++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 37 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ab7ab8a..01d104f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -184,6 +184,13 @@ typedef enum D3D12_WRITEBUFFERIMMEDIATE_MODE D3D12_WRITEBUFFERIMMEDIATE_MODE_MARKER_OUT = 0x2, } D3D12_WRITEBUFFERIMMEDIATE_MODE; +typedef enum D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER +{ + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED = 0x0, + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_1 = 0x1, + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_2 = 0x2, +} D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER; + interface ID3D12Fence; interface ID3D12RootSignature; interface ID3D12Heap; @@ -1634,6 +1641,12 @@ typedef struct D3D12_FEATURE_DATA_ARCHITECTURE1 BOOL IsolatedMMU; } D3D12_FEATURE_DATA_ARCHITECTURE1; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS2 +{ + BOOL DepthBoundsTestSupported; + D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER ProgrammableSamplePositionsTier; +} D3D12_FEATURE_DATA_D3D12_OPTIONS2; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9ed112e..74b70ce 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1344,6 +1344,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options1.ExpandedComputeResourceStates = TRUE; device->feature_options1.Int64ShaderOps = features->shaderInt64; + /* Depth bounds test is enabled in D3D12_DEPTH_STENCIL_DESC1, which is not + * supported. */ + device->feature_options2.DepthBoundsTestSupported = FALSE; + /* d3d12_command_list_SetSamplePositions() is not implemented. */ + device->feature_options2.ProgrammableSamplePositionsTier = D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED; + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); @@ -2745,6 +2751,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS2: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS2 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options2; + + TRACE("Depth bounds test %#x.\n", data->DepthBoundsTestSupported); + TRACE("Programmable sample positions tier %#x.\n", data->ProgrammableSamplePositionsTier); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index add727f..2559824 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1132,6 +1132,7 @@ struct d3d12_device D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options; D3D12_FEATURE_DATA_D3D12_OPTIONS1 feature_options1; + D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2; struct vkd3d_vulkan_info vk_info;

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_ARCHITECTURE1.
by Alexandre Julliard 22 May '20

22 May '20

Module: vkd3d Branch: master Commit: fad3b127034ffb5eefc25e5504e53c27ae6cf986 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fad3b127034ffb5eefc25e5… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Fri May 22 16:45:15 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_ARCHITECTURE1. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 9 +++++++++ libs/vkd3d/device.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 73a1012..ab7ab8a 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1625,6 +1625,15 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS1 BOOL Int64ShaderOps; } D3D12_FEATURE_DATA_D3D12_OPTIONS1; +typedef struct D3D12_FEATURE_DATA_ARCHITECTURE1 +{ + UINT NodeIndex; + BOOL TileBasedRenderer; + BOOL UMA; + BOOL CacheCoherentUMA; + BOOL IsolatedMMU; +} D3D12_FEATURE_DATA_ARCHITECTURE1; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9193fc3..9ed112e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2488,7 +2488,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->TileBasedRenderer = FALSE; data->UMA = d3d12_device_is_uma(device, &coherent); - data->CacheCoherentUMA = data->UMA ? coherent : FALSE; + data->CacheCoherentUMA = data->UMA && coherent; TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x.\n", data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA); @@ -2714,6 +2714,37 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_ARCHITECTURE1: + { + D3D12_FEATURE_DATA_ARCHITECTURE1 *data = feature_data; + bool coherent; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + if (data->NodeIndex) + { + FIXME("Multi-adapter not supported.\n"); + return E_INVALIDARG; + } + + WARN("Assuming device does not support tile based rendering.\n"); + data->TileBasedRenderer = FALSE; + + data->UMA = d3d12_device_is_uma(device, &coherent); + data->CacheCoherentUMA = data->UMA && coherent; + + WARN("Assuming device does not have an isolated memory management unit.\n"); + data->IsolatedMMU = FALSE; + + TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x, isolated MMU %#x.\n", + data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA, data->IsolatedMMU); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Conor McCarthy : vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS1.
by Alexandre Julliard 22 May '20

22 May '20

Module: vkd3d Branch: master Commit: 1d46f25ea2aa312fdec9292294c09febac632d75 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1d46f25ea2aa312fdec9292… Author: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Date: Fri May 22 16:45:14 2020 +0430 vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS1. Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 10 ++++++++++ libs/vkd3d/device.c | 29 +++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 40 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 3bfe47b..73a1012 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1615,6 +1615,16 @@ typedef struct D3D12_FEATURE_DATA_SHADER_MODEL D3D_SHADER_MODEL HighestShaderModel; } D3D12_FEATURE_DATA_SHADER_MODEL; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS1 +{ + BOOL WaveOps; + UINT WaveLaneCountMin; + UINT WaveLaneCountMax; + UINT TotalLaneCount; + BOOL ExpandedComputeResourceStates; + BOOL Int64ShaderOps; +} D3D12_FEATURE_DATA_D3D12_OPTIONS1; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 757d4ac..9193fc3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1336,6 +1336,14 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation = FALSE; device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2; + /* Shader Model 6 support. */ + device->feature_options1.WaveOps = FALSE; + device->feature_options1.WaveLaneCountMin = 0; + device->feature_options1.WaveLaneCountMax = 0; + device->feature_options1.TotalLaneCount = 0; + device->feature_options1.ExpandedComputeResourceStates = TRUE; + device->feature_options1.Int64ShaderOps = features->shaderInt64; + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); @@ -2668,6 +2676,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS1: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS1 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + *data = device->feature_options1; + + TRACE("Wave ops %#x.\n", data->WaveOps); + TRACE("Min wave lane count %#x.\n", data->WaveLaneCountMin); + TRACE("Max wave lane count %#x.\n", data->WaveLaneCountMax); + TRACE("Total lane count %#x.\n", data->TotalLaneCount); + TRACE("Expanded compute resource states %#x.\n", data->ExpandedComputeResourceStates); + TRACE("Int64 shader ops %#x.\n", data->Int64ShaderOps); + return S_OK; + } + case D3D12_FEATURE_ROOT_SIGNATURE: { D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0c031d2..add727f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1131,6 +1131,7 @@ struct d3d12_device VkPhysicalDeviceMemoryProperties memory_properties; D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options; + D3D12_FEATURE_DATA_D3D12_OPTIONS1 feature_options1; struct vkd3d_vulkan_info vk_info;

1 0

Hans-Kristian Arntzen : vkd3d-shader: Increment the token pointer before reading the register space in the dcl_resource_structured handler.
by Alexandre Julliard 22 May '20

22 May '20

Module: vkd3d Branch: master Commit: f3bf1612c113614a2392718d35213e8284527c37 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f3bf1612c113614a2392718… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Fri May 22 16:45:13 2020 +0430 vkd3d-shader: Increment the token pointer before reading the register space in the dcl_resource_structured handler. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index db834fa..5e504dc 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -908,7 +908,7 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); - ins->declaration.structured_resource.byte_stride = *tokens; + ins->declaration.structured_resource.byte_stride = *tokens++; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space);

1 0

Hans-Kristian Arntzen : vkd3d-shader: Increment the token pointer before reading the register space in the dcl_uav_structured handler.
by Alexandre Julliard 22 May '20

22 May '20

Module: vkd3d Branch: master Commit: ea213e2b0da01c63be8ab40a0befc8472974ad40 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea213e2b0da01c63be8ab40… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Fri May 22 16:45:12 2020 +0430 vkd3d-shader: Increment the token pointer before reading the register space in the dcl_uav_structured handler. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 98c51e4..db834fa 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -873,7 +873,7 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.structured_resource.reg); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - ins->declaration.structured_resource.byte_stride = *tokens; + ins->declaration.structured_resource.byte_stride = *tokens++; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space);

1 0

Henri Verbeet : wined3d: Move the swapchain fps counter to wined3d_cs_exec_present().
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: b65ca133052ed9053e48c571155a764d4d711277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65ca133052ed9053e48c571… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 21 23:39:38 2020 +0430 wined3d: Move the swapchain fps counter to wined3d_cs_exec_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 113b8ff84f..89e59b5373 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 0af6e8e41c..9020a99520 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);

1 0

Henri Verbeet : wined3d: Implement vertex attribute divisors for the Vulkan adapter.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: b9638abe46befa416ba5b91e5faeb2b31f30c137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9638abe46befa416ba5b91e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 21 23:39:37 2020 +0430 wined3d: Implement vertex attribute divisors for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0249c4c7af..8cbd820661 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 13d3b4c544..3a6671036e 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 ab5df330e7..e9081e5d17 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 0c0c1e16cd..4a872bcdaa 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() \

1 0

Henri Verbeet : wined3d: Implement alpha to coverage multisampling for the Vulkan adapter.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 5e7dd9d73e2ed825c8ced80cc5127e05e3f59f22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e7dd9d73e2ed825c8ced80c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 21 23:39:36 2020 +0430 wined3d: Implement alpha to coverage multisampling for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0157e21381..13d3b4c544 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; }

1 0

Henri Verbeet : wined3d: Implement stencil tests for the Vulkan adapter.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: 939e8d25f993eedaefa362f57147f03cd425782a URL: https://source.winehq.org/git/wine.git/?a=commit;h=939e8d25f993eedaefa362f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 21 23:39:35 2020 +0430 wined3d: Implement stencil tests for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 00d66ed052..0157e21381 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; }

1 0

Henri Verbeet : wined3d: Implement depth tests and writes for the Vulkan adapter.
by Alexandre Julliard 21 May '20

21 May '20

Module: wine Branch: master Commit: ce7d1d72f333388051461575871c9506d3514f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce7d1d72f333388051461575… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 21 23:39:34 2020 +0430 wined3d: Implement depth tests and writes for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97d05f1dc8..00d66ed052 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1811,6 +1811,15 @@ 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))) + { + 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]); + + update = true; + } + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_BLEND) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) {

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
75
Older →

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 2020