December 2022 - Wine-Commits

Eric Pouech : wined3d: Reduce usage of long integral types in palette.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 0030023710d9f4e4595080b6f3b63a122175291c URL: https://gitlab.winehq.org/wine/wine/-/commit/0030023710d9f4e4595080b6f3b63a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:12:16 2022 +0100 wined3d: Reduce usage of long integral types in palette.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/palette.c | 4 ++-- include/wine/wined3d.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 40e2b6c7941..1c18ca4dbbc 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -57,7 +57,7 @@ ULONG CDECL wined3d_palette_decref(struct wined3d_palette *palette) } HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, - uint32_t flags, DWORD start, DWORD count, PALETTEENTRY *entries) + uint32_t flags, unsigned int start, unsigned int count, PALETTEENTRY *entries) { unsigned int i; TRACE("palette %p, flags %#x, start %u, count %u, entries %p.\n", @@ -96,7 +96,7 @@ void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HD } HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, - uint32_t flags, DWORD start, DWORD count, const PALETTEENTRY *entries) + uint32_t flags, unsigned int start, unsigned int count, const PALETTEENTRY *entries) { unsigned int i; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 70ab06209d5..1660b424441 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2567,11 +2567,11 @@ HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, uint32_t f unsigned int entry_count, const PALETTEENTRY *entries, struct wined3d_palette **palette); ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, - uint32_t flags, DWORD start, DWORD count, PALETTEENTRY *entries); + uint32_t flags, unsigned int start, unsigned int count, PALETTEENTRY *entries); void __cdecl wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, - uint32_t flags, DWORD start, DWORD count, const PALETTEENTRY *entries); + uint32_t flags, unsigned int start, unsigned int count, const PALETTEENTRY *entries); HRESULT __cdecl wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query);

1 0

Eric Pouech : wined3d: Enable long types in directx.c.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: ac85d652375bc53218d1a9179ffe1b7274def39b URL: https://gitlab.winehq.org/wine/wine/-/commit/ac85d652375bc53218d1a9179ffe1b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 6 14:12:19 2022 +0100 wined3d: Enable long types in directx.c. --- dlls/wined3d/directx.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0f8cca2845..9d7c4769cb8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -20,7 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include "wined3d_private.h" #include "winternl.h" @@ -110,7 +109,7 @@ HRESULT CDECL wined3d_output_take_ownership(const struct wined3d_output *output, case STATUS_SUCCESS: return S_OK; default: - FIXME("Unhandled error %#x.\n", status); + FIXME("Unhandled error %#lx.\n", status); return E_FAIL; } } @@ -725,7 +724,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, } else { - TRACE("OS version %u.%u.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); + TRACE("OS version %lu.%lu.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); switch (os_version.dwMajorVersion) { case 2: @@ -763,7 +762,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, { if (os_version.dwMinorVersion > 3) { - FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n", + FIXME("Unhandled OS version %lu.%lu, reporting Windows 8.1.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } driver_os_version = 10; @@ -777,7 +776,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, break; default: - FIXME("Unhandled OS version %u.%u, reporting Windows 7.\n", + FIXME("Unhandled OS version %lu.%lu, reporting Windows 7.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); driver_os_version = 8; driver_model = DRIVER_MODEL_NT6X; @@ -1532,7 +1531,7 @@ HRESULT CDECL wined3d_output_get_display_mode(const struct wined3d_output *outpu *rotation = WINED3D_DISPLAY_ROTATION_270; break; default: - FIXME("Unhandled display rotation %#x.\n", m.u1.s2.dmDisplayOrientation); + FIXME("Unhandled display rotation %#lx.\n", m.u1.s2.dmDisplayOrientation); *rotation = WINED3D_DISPLAY_ROTATION_UNSPECIFIED; break; } @@ -1623,7 +1622,7 @@ HRESULT CDECL wined3d_restore_display_modes(struct wined3d *wined3d) ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) { - ERR("Failed to restore all outputs to their registry display settings, error %d.\n", ret); + ERR("Failed to restore all outputs to their registry display settings, error %ld.\n", ret); return WINED3DERR_NOTAVAILABLE; } } @@ -2911,7 +2910,7 @@ static HRESULT adapter_no3d_create_device(struct wined3d *wined3d, const struct if (FAILED(hr = wined3d_device_init(&device_no3d->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, adapter->gl_info.supported, device_parent))) { - WARN("Failed to initialize device, hr %#x.\n", hr); + WARN("Failed to initialize device, hr %#lx.\n", hr); heap_free(device_no3d); return hr; } @@ -3071,7 +3070,7 @@ static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, if (FAILED(hr = wined3d_swapchain_no3d_init(swapchain_no3d, device, desc, state_parent, parent, parent_ops))) { - WARN("Failed to initialise swapchain, hr %#x.\n", hr); + WARN("Failed to initialise swapchain, hr %#lx.\n", hr); heap_free(swapchain_no3d); return hr; } @@ -3103,7 +3102,7 @@ static HRESULT adapter_no3d_create_buffer(struct wined3d_device *device, if (FAILED(hr = wined3d_buffer_no3d_init(buffer_no3d, device, desc, data, parent, parent_ops))) { - WARN("Failed to initialise buffer, hr %#x.\n", hr); + WARN("Failed to initialise buffer, hr %#lx.\n", hr); heap_free(buffer_no3d); return hr; } @@ -3149,7 +3148,7 @@ static HRESULT adapter_no3d_create_texture(struct wined3d_device *device, if (FAILED(hr = wined3d_texture_no3d_init(texture_no3d, device, desc, layer_count, level_count, flags, parent, parent_ops))) { - WARN("Failed to initialise texture, hr %#x.\n", hr); + WARN("Failed to initialise texture, hr %#lx.\n", hr); heap_free(texture_no3d); return hr; } @@ -3199,7 +3198,7 @@ static HRESULT adapter_no3d_create_rendertarget_view(const struct wined3d_view_d if (FAILED(hr = wined3d_rendertarget_view_no3d_init(view_no3d, desc, resource, parent, parent_ops))) { - WARN("Failed to initialise view, hr %#x.\n", hr); + WARN("Failed to initialise view, hr %#lx.\n", hr); heap_free(view_no3d); return hr; } @@ -3421,7 +3420,7 @@ static BOOL wined3d_adapter_create_output(struct wined3d_adapter *adapter, const if (FAILED(hr = wined3d_output_init(&adapter->outputs[adapter->output_count], adapter->output_count, adapter, output_name))) { - ERR("Failed to initialise output %s, hr %#x.\n", wine_dbgstr_w(output_name), hr); + ERR("Failed to initialise output %s, hr %#lx.\n", wine_dbgstr_w(output_name), hr); return FALSE; } @@ -3452,11 +3451,11 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, WARN("Allocating a random LUID.\n"); if (!AllocateLocallyUniqueId(&adapter->luid)) { - ERR("Failed to allocate a LUID, error %#x.\n", GetLastError()); + ERR("Failed to allocate a LUID, error %#lx.\n", GetLastError()); return FALSE; } } - TRACE("adapter %p LUID %08x:%08x.\n", adapter, adapter->luid.HighPart, adapter->luid.LowPart); + TRACE("adapter %p LUID %08lx:%08lx.\n", adapter, adapter->luid.HighPart, adapter->luid.LowPart); open_adapter_desc.AdapterLuid = adapter->luid; if (D3DKMTOpenAdapterFromLuid(&open_adapter_desc))

1 0

Zebediah Figura : wined3d: Require geometry shaders to create a feature level 10.0 device.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: e5b6dce90f095de2d67820338a4db8f994e6e613 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5b6dce90f095de2d67820338a4db8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 13 19:00:48 2022 -0500 wined3d: Require geometry shaders to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 85c077dc74d..45b29e8dd97 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2256,6 +2256,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info { return shader_model >= 4 && info->features2.features.multiViewport + && info->features2.features.geometryShader && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Bartosz Kosiorek : gdiplus: Improve performance of GdipScaleMatrix.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: a97911fdfe77dac2996d9bb3c1a56acc47bd3fa3 URL: https://gitlab.winehq.org/wine/wine/-/commit/a97911fdfe77dac2996d9bb3c1a56a… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Dec 1 01:22:07 2022 +0100 gdiplus: Improve performance of GdipScaleMatrix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53947 --- dlls/gdiplus/matrix.c | 25 ++++++++++++++----------- dlls/gdiplus/tests/matrix.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 40abbc93e21..13e7aa05e11 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -287,24 +287,27 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix *matrix, REAL angle, GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, GpMatrixOrder order) { - REAL scale[6]; - TRACE("(%p, %.2f, %.2f, %d)\n", matrix, scaleX, scaleY, order); if(!matrix) return InvalidParameter; - scale[0] = scaleX; - scale[1] = 0.0; - scale[2] = 0.0; - scale[3] = scaleY; - scale[4] = 0.0; - scale[5] = 0.0; - if(order == MatrixOrderAppend) - matrix_multiply(matrix->matrix, scale, matrix->matrix); + { + matrix->matrix[0] *= scaleX; + matrix->matrix[1] *= scaleY; + matrix->matrix[2] *= scaleX; + matrix->matrix[3] *= scaleY; + matrix->matrix[4] *= scaleX; + matrix->matrix[5] *= scaleY; + } else if (order == MatrixOrderPrepend) - matrix_multiply(scale, matrix->matrix, matrix->matrix); + { + matrix->matrix[0] *= scaleX; + matrix->matrix[1] *= scaleX; + matrix->matrix[2] *= scaleY; + matrix->matrix[3] *= scaleY; + } else return InvalidParameter; diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 5ca0209f6a9..53a57089bbc 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -110,6 +110,46 @@ static void test_transform(void) GdipDeleteMatrix(matrix); } +static void test_scale(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + REAL elems[6]; + int i; + + static const REAL expected_elem[] = {3.0, -4.0, 90.0, 80.0, -1500.0, 1200.0}; + static const REAL expected_elem2[] = {3.0, -6.0, 60.0, 80.0, -500.0, 600.0}; + + GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + + status = GdipScaleMatrix(NULL, 3, 2, MatrixOrderAppend); + expect(InvalidParameter, status); + status = GdipScaleMatrix(matrix, 3, 2, MatrixOrderAppend); + expect(Ok, status); + + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + GdipDeleteMatrix(matrix); + + for(i = 0; i < 6; i++) + ok(expected_elem[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i, + expected_elem[i], elems[i]); + + GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + + status = GdipScaleMatrix(matrix, 3, 2, MatrixOrderPrepend); + expect(Ok, status); + + status = GdipGetMatrixElements(matrix, elems); + expect(Ok, status); + GdipDeleteMatrix(matrix); + + for(i = 0; i < 6; i++) + ok(expected_elem2[i] == elems[i], "Expected #%d to be (%.1f) but got (%.1f)\n", i, + expected_elem2[i], elems[i]); + +} + static void test_isinvertible(void) { GpStatus status; @@ -390,6 +430,7 @@ START_TEST(matrix) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_scale(); test_transform(); test_isinvertible(); test_invert();

1 0

Bartosz Kosiorek : gdiplus: Improve performance of matrix multiplication by unrolling loop.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 13b16116bfdebf5e198827ad02661db7cffadbcd URL: https://gitlab.winehq.org/wine/wine/-/commit/13b16116bfdebf5e198827ad02661d… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Dec 1 18:16:02 2022 +0100 gdiplus: Improve performance of matrix multiplication by unrolling loop. --- dlls/gdiplus/matrix.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 13e7aa05e11..d790daab2af 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -39,17 +39,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); * * and puts the output in out. * */ -static void matrix_multiply(GDIPCONST REAL * left, GDIPCONST REAL * right, REAL * out) +static inline void matrix_multiply(GDIPCONST REAL * left, GDIPCONST REAL * right, REAL * out) { REAL temp[6]; - int i, odd; - - for(i = 0; i < 6; i++){ - odd = i % 2; - temp[i] = left[i - odd] * right[odd] + left[i - odd + 1] * right[odd + 2] + - (i >= 4 ? right[odd + 4] : 0.0); - } - + temp[0] = left[0] * right[0] + left[1] * right[2]; + temp[1] = left[0] * right[1] + left[1] * right[3]; + temp[2] = left[2] * right[0] + left[3] * right[2]; + temp[3] = left[2] * right[1] + left[3] * right[3]; + temp[4] = left[4] * right[0] + left[5] * right[2] + right[4]; + temp[5] = left[4] * right[1] + left[5] * right[3] + right[5]; memcpy(out, temp, 6 * sizeof(REAL)); }

1 0

Zebediah Figura : wined3d: Implement multiple viewports for the Vulkan adapter.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: d89ff7123999eadab9afacd2765664c71f2e3dc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d89ff7123999eadab9afacd2765664… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 21:02:50 2022 -0500 wined3d: Implement multiple viewports for the Vulkan adapter. --- dlls/wined3d/adapter_vk.c | 4 ++ dlls/wined3d/context_vk.c | 92 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 +- dlls/wined3d/wined3d_vk.h | 2 + 4 files changed, 67 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index bb5e548ede1..85c077dc74d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2255,6 +2255,7 @@ static bool feature_level_9_3_supported(const struct wined3d_physical_device_inf static bool feature_level_10_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 4 + && info->features2.features.multiViewport && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; } @@ -2290,6 +2291,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_vk, uint32_t wined3d_creation_flags) { struct wined3d_d3d_info *d3d_info = &adapter_vk->a.d3d_info; + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; struct wined3d_physical_device_info device_info; struct wined3d_vertex_caps vertex_caps; struct fragment_caps fragment_caps; @@ -2356,6 +2358,8 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->filling_convention_offset = 0.0f; d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; + + vk_info->multiple_viewports = device_info.features2.features.multiViewport; } static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 13700c6dfb9..769e5347cc5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1985,10 +1985,9 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if ((ret = wined3d_uint32_compare(a->ts_desc.patchControlPoints, b->ts_desc.patchControlPoints))) return ret; - if ((ret = memcmp(&a->viewport, &b->viewport, sizeof(a->viewport)))) + if ((ret = memcmp(a->viewports, b->viewports, sizeof(a->viewports)))) return ret; - - if ((ret = memcmp(&a->scissor, &b->scissor, sizeof(a->scissor)))) + if ((ret = memcmp(a->scissors, b->scissors, sizeof(a->scissors)))) return ret; if ((ret = memcmp(&a->rs_desc, &b->rs_desc, sizeof(a->rs_desc)))) @@ -2066,10 +2065,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->ts_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; - key->vp_desc.viewportCount = 1; - key->vp_desc.pViewports = &key->viewport; - key->vp_desc.scissorCount = 1; - key->vp_desc.pScissors = &key->scissor; + key->vp_desc.pViewports = key->viewports; + key->vp_desc.pScissors = key->scissors; key->rs_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; key->rs_desc.lineWidth = 1.0f; @@ -2418,36 +2415,65 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) { - key->viewport.x = state->viewports[0].x; - key->viewport.y = state->viewports[0].y; - key->viewport.width = state->viewports[0].width; - key->viewport.height = state->viewports[0].height; - key->viewport.minDepth = state->viewports[0].min_z; - key->viewport.maxDepth = state->viewports[0].max_z; + key->vp_desc.viewportCount = (context_vk->vk_info->multiple_viewports ? WINED3D_MAX_VIEWPORTS : 1); + key->vp_desc.scissorCount = key->vp_desc.viewportCount; - if (state->rasterizer_state && state->rasterizer_state->desc.scissor) + for (i = 0; i < key->vp_desc.viewportCount; ++i) { - const RECT *r = &state->scissor_rects[0]; + const struct wined3d_viewport *src_viewport = &state->viewports[i]; + VkViewport *viewport = &key->viewports[i]; + VkRect2D *scissor = &key->scissors[i]; - key->scissor.offset.x = r->left; - key->scissor.offset.y = r->top; - key->scissor.extent.width = r->right - r->left; - key->scissor.extent.height = r->bottom - r->top; - } - else - { - key->scissor.offset.x = key->viewport.x; - key->scissor.offset.y = key->viewport.y; - key->scissor.extent.width = key->viewport.width; - key->scissor.extent.height = key->viewport.height; + if (i >= state->viewport_count) + { + viewport->x = 0.0f; + viewport->y = 0.0f; + viewport->width = 1.0f; + viewport->height = 1.0f; + viewport->minDepth = 0.0f; + viewport->maxDepth = 0.0f; + + memset(scissor, 0, sizeof(*scissor)); + continue; + } + + viewport->x = src_viewport->x; + viewport->y = src_viewport->y; + viewport->width = src_viewport->width; + viewport->height = src_viewport->height; + viewport->minDepth = src_viewport->min_z; + viewport->maxDepth = src_viewport->max_z; + + if (state->rasterizer_state && state->rasterizer_state->desc.scissor) + { + const RECT *r = &state->scissor_rects[i]; + + if (i >= state->scissor_rect_count) + { + memset(scissor, 0, sizeof(*scissor)); + continue; + } + + scissor->offset.x = r->left; + scissor->offset.y = r->top; + scissor->extent.width = r->right - r->left; + scissor->extent.height = r->bottom - r->top; + } + else + { + scissor->offset.x = viewport->x; + scissor->offset.y = viewport->y; + scissor->extent.width = viewport->width; + scissor->extent.height = viewport->height; + } + /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ + if (scissor->offset.x < 0) + scissor->offset.x = 0; + if (scissor->offset.y < 0) + scissor->offset.y = 0; + viewport->y += viewport->height; + viewport->height = -viewport->height; } - /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ - if (key->scissor.offset.x < 0) - key->scissor.offset.x = 0; - if (key->scissor.offset.y < 0) - key->scissor.offset.y = 0; - key->viewport.y += key->viewport.height; - key->viewport.height = -key->viewport.height; update = true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a76dc7407cc..12dc08da352 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2608,8 +2608,8 @@ struct wined3d_graphics_pipeline_key_vk VkVertexInputBindingDivisorDescriptionEXT divisors[MAX_ATTRIBS]; VkVertexInputAttributeDescription attributes[MAX_ATTRIBS]; VkVertexInputBindingDescription bindings[MAX_ATTRIBS]; - VkViewport viewport; - VkRect2D scissor; + VkViewport viewports[WINED3D_MAX_VIEWPORTS]; + VkRect2D scissors[WINED3D_MAX_VIEWPORTS]; VkSampleMask sample_mask; VkPipelineColorBlendAttachmentState blend_attachments[WINED3D_MAX_RENDER_TARGETS]; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 00818f98b81..9135cff9143 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -223,6 +223,8 @@ struct wined3d_vk_info BOOL supported[WINED3D_VK_EXT_COUNT]; HMODULE vulkan_lib; + + unsigned int multiple_viewports : 1; }; #define VK_CALL(f) (vk_info->vk_ops.f)

1 0

Zebediah Figura : wined3d: Allow exposing lower d3d feature levels from the Vulkan adapter.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 15460d237b3741ac6ca4e37129d4f4f340e014bb URL: https://gitlab.winehq.org/wine/wine/-/commit/15460d237b3741ac6ca4e37129d4f4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 6 20:05:08 2022 -0500 wined3d: Allow exposing lower d3d feature levels from the Vulkan adapter. --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f7902dfb498..552a89075f0 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2260,13 +2260,22 @@ static enum wined3d_feature_level feature_level_from_caps(const struct shader_ca shader_model = min(shader_model, max(shader_caps->hs_version, 4)); shader_model = min(shader_model, max(shader_caps->ds_version, 4)); - if (shader_model >= 5) - return WINED3D_FEATURE_LEVEL_11_1; + if (!shader_model) + return WINED3D_FEATURE_LEVEL_7; - if (shader_model >= 4) + if (shader_model <= 1) + return WINED3D_FEATURE_LEVEL_8; + + if (shader_model <= 2) + return WINED3D_FEATURE_LEVEL_9_2; + + if (shader_model <= 3) + return WINED3D_FEATURE_LEVEL_9_3; + + if (shader_model <= 4) return WINED3D_FEATURE_LEVEL_10_1; - return WINED3D_FEATURE_LEVEL_NONE; + return WINED3D_FEATURE_LEVEL_11_1; } static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_vk, uint32_t wined3d_creation_flags)

1 0

Zebediah Figura : wined3d: Allow creating a feature level 9.3 device even if custom vertex attribute divisors are not supported.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: b875d395d1974c7defdb445ce88d67b61c00c4f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b875d395d1974c7defdb445ce88d67… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 6 20:17:29 2022 -0500 wined3d: Allow creating a feature level 9.3 device even if custom vertex attribute divisors are not supported. --- dlls/wined3d/adapter_vk.c | 84 +++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 552a89075f0..c76b5b1e503 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -376,19 +376,43 @@ static const struct wined3d_allocator_ops wined3d_allocator_vk_ops = .allocator_destroy_chunk = wined3d_allocator_vk_destroy_chunk, }; +static void get_physical_device_info(const struct wined3d_adapter_vk *adapter_vk, struct wined3d_physical_device_info *info) +{ + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features = &info->vertex_divisor_features; + VkPhysicalDeviceHostQueryResetFeatures *host_query_reset_features = &info->host_query_reset_features; + VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features = &info->xfb_features; + VkPhysicalDevice physical_device = adapter_vk->physical_device; + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + VkPhysicalDeviceFeatures2 *features2 = &info->features2; + + memset(info, 0, sizeof(*info)); + + xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; + + vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + vertex_divisor_features->pNext = xfb_features; + + host_query_reset_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES; + host_query_reset_features->pNext = vertex_divisor_features; + + features2->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; + features2->pNext = host_query_reset_features; + + if (vk_info->vk_ops.vkGetPhysicalDeviceFeatures2) + VK_CALL(vkGetPhysicalDeviceFeatures2(physical_device, features2)); + else + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2->features)); +} + static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); - VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; - VkPhysicalDeviceHostQueryResetFeatures *host_query_reset_features; const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; 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; @@ -407,36 +431,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi physical_device = adapter_vk->physical_device; - memset(&physical_device_info, 0, sizeof(physical_device_info)); - - xfb_features = &physical_device_info.xfb_features; - xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; - - vertex_divisor_features = &physical_device_info.vertex_divisor_features; - vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; - vertex_divisor_features->pNext = xfb_features; - - host_query_reset_features = &physical_device_info.host_query_reset_features; - host_query_reset_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES; - host_query_reset_features->pNext = vertex_divisor_features; - - features2 = &physical_device_info.features2; - features2->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; - features2->pNext = host_query_reset_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 - || !vertex_divisor_features->vertexAttributeInstanceRateZeroDivisor) - { - WARN("Vertex attribute divisors not supported.\n"); - hr = E_FAIL; - goto fail; - } - + get_physical_device_info(adapter_vk, &physical_device_info); wined3d_disable_vulkan_features(&physical_device_info); queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; @@ -447,7 +442,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 = features2->pNext; + device_info.pNext = physical_device_info.features2.pNext; device_info.flags = 0; device_info.queueCreateInfoCount = 1; device_info.pQueueCreateInfos = &queue_info; @@ -455,7 +450,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_info.ppEnabledLayerNames = NULL; device_info.enabledExtensionCount = adapter_vk->device_extension_count; device_info.ppEnabledExtensionNames = adapter_vk->device_extensions; - device_info.pEnabledFeatures = &features2->features; + device_info.pEnabledFeatures = &physical_device_info.features2.features; if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) { @@ -2251,7 +2246,15 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, adapter_vk->a.d3d_info.feature_level, vram_bytes, sysmem_bytes); } -static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps) +static bool feature_level_10_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) +{ + return shader_model >= 4 + && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor + && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; +} + +static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info, + const struct shader_caps *shader_caps) { unsigned int shader_model; @@ -2269,7 +2272,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct shader_ca if (shader_model <= 2) return WINED3D_FEATURE_LEVEL_9_2; - if (shader_model <= 3) + if (!feature_level_10_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_3; if (shader_model <= 4) @@ -2281,10 +2284,13 @@ static enum wined3d_feature_level feature_level_from_caps(const struct shader_ca static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_vk, uint32_t wined3d_creation_flags) { struct wined3d_d3d_info *d3d_info = &adapter_vk->a.d3d_info; + struct wined3d_physical_device_info device_info; struct wined3d_vertex_caps vertex_caps; struct fragment_caps fragment_caps; struct shader_caps shader_caps; + get_physical_device_info(adapter_vk, &device_info); + adapter_vk->a.shader_backend->shader_get_caps(&adapter_vk->a, &shader_caps); adapter_vk->a.vertex_pipe->vp_get_caps(&adapter_vk->a, &vertex_caps); adapter_vk->a.fragment_pipe->get_caps(&adapter_vk->a, &fragment_caps); @@ -2330,7 +2336,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); d3d_info->scaled_resolve = false; d3d_info->pbo = true; - d3d_info->feature_level = feature_level_from_caps(&shader_caps); + d3d_info->feature_level = feature_level_from_caps(&device_info, &shader_caps); d3d_info->subpixel_viewport = true; d3d_info->fences = true; d3d_info->persistent_map = true;

1 0

Zebediah Figura : wined3d: Require independent blending to create a feature level 9.3 device.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 347c83033791beae22ec1209792e8b3e8dbd914f URL: https://gitlab.winehq.org/wine/wine/-/commit/347c83033791beae22ec1209792e8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 6 20:24:07 2022 -0500 wined3d: Require independent blending to create a feature level 9.3 device. --- dlls/wined3d/adapter_vk.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index c76b5b1e503..bb5e548ede1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2246,6 +2246,12 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, adapter_vk->a.d3d_info.feature_level, vram_bytes, sysmem_bytes); } +static bool feature_level_9_3_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) +{ + return shader_model >= 3 + && info->features2.features.independentBlend; +} + static bool feature_level_10_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 4 @@ -2269,7 +2275,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (shader_model <= 1) return WINED3D_FEATURE_LEVEL_8; - if (shader_model <= 2) + if (!feature_level_9_3_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_2; if (!feature_level_10_supported(info, shader_model))

1 0

Hans Leidekker : bcrypt: Support duplicating public keys without access to the private key.
by Alexandre Julliard Dec. 6, 2022

Dec. 6, 2022

Module: wine Branch: master Commit: 5308911a82e5858f419354bcc6d9e35807134bc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5308911a82e5858f419354bcc6d9e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 11:43:56 2022 +0100 bcrypt: Support duplicating public keys without access to the private key. --- dlls/bcrypt/gnutls.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 15 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index aeef64fd642..d5ffe88e2b4 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1877,17 +1877,11 @@ static NTSTATUS key_asymmetric_destroy( void *args ) return STATUS_SUCCESS; } -static NTSTATUS key_asymmetric_duplicate( void *args ) +static NTSTATUS dup_privkey( struct key *key_orig, struct key *key_copy ) { - const struct key_asymmetric_duplicate_params *params = args; - struct key *key_orig = params->key_orig; - struct key *key_copy = params->key_copy; gnutls_privkey_t privkey; - gnutls_pubkey_t pubkey; int ret; - if (!key_data(key_orig)->a.privkey) return STATUS_SUCCESS; - if ((ret = pgnutls_privkey_init( &privkey ))) { pgnutls_perror( ret ); @@ -1959,25 +1953,100 @@ static NTSTATUS key_asymmetric_duplicate( void *args ) return STATUS_INTERNAL_ERROR; } - if (key_data(key_orig)->a.pubkey) + key_data(key_copy)->a.privkey = privkey; + return STATUS_SUCCESS; +} + +static NTSTATUS dup_pubkey( struct key *key_orig, struct key *key_copy ) +{ + gnutls_pubkey_t pubkey; + int ret; + + if ((ret = pgnutls_pubkey_init( &pubkey ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + switch (key_orig->alg_id) { - if ((ret = pgnutls_pubkey_init( &pubkey ))) + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + { + gnutls_datum_t m, e; + if ((ret = pgnutls_pubkey_export_rsa_raw( key_data(key_orig)->a.pubkey, &m, &e ))) { pgnutls_perror( ret ); - pgnutls_privkey_deinit( privkey ); return STATUS_INTERNAL_ERROR; } - if ((ret = pgnutls_pubkey_import_privkey( pubkey, key_data(key_orig)->a.privkey, 0, 0 ))) + ret = pgnutls_pubkey_import_rsa_raw( pubkey, &m, &e ); + free( m.data ); free( e.data ); + if (ret) { pgnutls_perror( ret ); - pgnutls_pubkey_deinit( pubkey ); - pgnutls_privkey_deinit( privkey ); return STATUS_INTERNAL_ERROR; } - key_data(key_copy)->a.pubkey = pubkey; + break; + } + case ALG_ID_DSA: + { + gnutls_datum_t p, q, g, y; + if ((ret = pgnutls_pubkey_export_dsa_raw( key_data(key_orig)->a.pubkey, &p, &q, &g, &y ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + ret = pgnutls_pubkey_import_dsa_raw( pubkey, &p, &q, &g, &y ); + free( p.data ); free( q.data ); free( g.data ); free( y.data ); + if (ret) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + key_copy->u.a.dss_seed = key_orig->u.a.dss_seed; + break; + } + case ALG_ID_ECDH_P256: + case ALG_ID_ECDH_P384: + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + { + gnutls_ecc_curve_t curve; + gnutls_datum_t x, y; + if ((ret = pgnutls_pubkey_export_ecc_raw( key_data(key_orig)->a.pubkey, &curve, &x, &y ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + ret = pgnutls_pubkey_import_ecc_raw( pubkey, curve, &x, &y ); + free( x.data ); free( y.data ); + if (ret) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + break; + } + default: + ERR( "unhandled algorithm %u\n", key_orig->alg_id ); + return STATUS_INTERNAL_ERROR; } - key_data(key_copy)->a.privkey = privkey; + key_data(key_copy)->a.pubkey = pubkey; + return STATUS_SUCCESS; +} + +static NTSTATUS key_asymmetric_duplicate( void *args ) +{ + const struct key_asymmetric_duplicate_params *params = args; + NTSTATUS status; + + if (key_data(params->key_orig)->a.privkey && (status = dup_privkey( params->key_orig, params->key_copy ))) + return status; + + if (key_data(params->key_orig)->a.pubkey && (status = dup_pubkey( params->key_orig, params->key_copy ))) + return status; + return STATUS_SUCCESS; }

1 0