wine-devel

wine-devel@winehq.org

7 participants
84485 discussions

[PATCH 4/4] winex11.drv: Support display orientations for XRandR 1.4 display settings handler.
by Zhiyi Zhang 22 Sep '20

22 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 2 +- dlls/winex11.drv/xrandr.c | 156 +++++++++++++++++++++++++++++--------- 2 files changed, 121 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 97db3d445cd..462037b2e01 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -621,7 +621,7 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* Check that orientation is returned correctly by GetAdapterDisplayModeEx * and EnumDisplaySettingsEx(). */ - todo_wine ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, + ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, S2(U1(devmode)).dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6c16fb29ec2..78ad98acd49 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -465,6 +465,55 @@ static unsigned int get_frequency( const XRRModeInfo *mode ) return (mode->dotClock + dots / 2) / dots; } +static DWORD get_orientation( Rotation rotation ) +{ + if (rotation & RR_Rotate_270) return DMDO_270; + if (rotation & RR_Rotate_180) return DMDO_180; + if (rotation & RR_Rotate_90) return DMDO_90; + return DMDO_DEFAULT; +} + +static DWORD get_orientation_count( Rotation rotations ) +{ + DWORD count = 0; + + if (rotations & RR_Rotate_0) ++count; + if (rotations & RR_Rotate_90) ++count; + if (rotations & RR_Rotate_180) ++count; + if (rotations & RR_Rotate_270) ++count; + return count; +} + +static Rotation get_rotation( DWORD orientation ) +{ + return (Rotation)(1 << orientation); +} + +static RRCrtc get_output_free_crtc( XRRScreenResources *resources, XRROutputInfo *output_info ) +{ + XRRCrtcInfo *crtc_info; + INT crtc_idx; + RRCrtc crtc; + + for (crtc_idx = 0; crtc_idx < output_info->ncrtc; ++crtc_idx) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, resources, output_info->crtcs[crtc_idx] ); + if (!crtc_info) + continue; + + if (!crtc_info->noutput) + { + crtc = output_info->crtcs[crtc_idx]; + pXRRFreeCrtcInfo( crtc_info ); + return crtc; + } + + pXRRFreeCrtcInfo( crtc_info ); + } + + return 0; +} + static RECT get_primary_rect( XRRScreenResources *resources ) { XRROutputInfo *output_info = NULL; @@ -1137,7 +1186,8 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) return FALSE; } -static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency ) +static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency, + DWORD orientation ) { mode->dmSize = sizeof(*mode); mode->dmDriverExtra = sizeof(RRMode); @@ -1148,24 +1198,35 @@ static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, D mode->dmFields |= DM_DISPLAYFREQUENCY; mode->dmDisplayFrequency = frequency; } - mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + if (orientation == DMDO_DEFAULT || orientation == DMDO_180) + { + mode->dmPelsWidth = info->width; + mode->dmPelsHeight = info->height; + } + else + { + mode->dmPelsWidth = info->height; + mode->dmPelsHeight = info->width; + } + mode->u1.s2.dmDisplayOrientation = orientation; mode->dmBitsPerPel = depth; - mode->dmPelsWidth = info->width; - mode->dmPelsHeight = info->height; mode->u2.dmDisplayFlags = 0; memcpy( (BYTE *)mode + sizeof(*mode), &info->id, sizeof(info->id) ); } static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count ) { + DWORD frequency, orientation, orientation_count; XRRScreenResources *screen_resources; XRROutputInfo *output_info = NULL; RROutput output = (RROutput)id; + XRRCrtcInfo *crtc_info = NULL; UINT depth_idx, mode_idx = 0; XRRModeInfo *mode_info; DEVMODEW *mode, *modes; + Rotation rotations; BOOL ret = FALSE; - DWORD frequency; + RRCrtc crtc; INT i, j; screen_resources = xrandr_get_screen_resources(); @@ -1184,9 +1245,44 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, goto done; } - /* Allocate space for display modes in different color depths. + crtc = output_info->crtc; + if (!crtc) + crtc = get_output_free_crtc( screen_resources, output_info ); + if (crtc) + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, crtc ); + + /* If the output is connected to a CRTC, use rotations reported by the CRTC */ + if (crtc_info) + { + if (flags & EDS_ROTATEDMODE) + { + rotations = crtc_info->rotations; + } + else + { + /* According to the RandR spec, RRGetCrtcInfo should set the active rotation to Rotate_0 + * when a CRTC is disabled. However, some RandR implementations report 0 in this case */ + rotations = (crtc_info->rotation & 0xf) ? crtc_info->rotation : RR_Rotate_0; + } + } + /* Not connected to CRTC, assume all rotations are supported */ + else + { + if (flags & EDS_ROTATEDMODE) + { + rotations = RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_180 | RR_Rotate_270; + } + else + { + rotations = RR_Rotate_0; + } + } + orientation_count = get_orientation_count( rotations ); + + /* Allocate space for display modes in different color depths and orientations. * Store a RRMode at the end of each DEVMODEW as private driver data */ - modes = heap_calloc( output_info->nmode * DEPTH_COUNT, sizeof(*modes) + sizeof(RRMode) ); + modes = heap_calloc( output_info->nmode * DEPTH_COUNT * orientation_count, + sizeof(*modes) + sizeof(RRMode) ); if (!modes) goto done; @@ -1202,9 +1298,15 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) { - mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + sizeof(RRMode)) * mode_idx); - add_xrandr14_mode( mode, mode_info, depths[depth_idx], frequency ); - ++mode_idx; + for (orientation = DMDO_DEFAULT; orientation <= DMDO_270; ++orientation) + { + if (!((1 << orientation) & rotations)) + continue; + + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + sizeof(RRMode)) * mode_idx); + add_xrandr14_mode( mode, mode_info, depths[depth_idx], frequency, orientation ); + ++mode_idx; + } } break; @@ -1215,6 +1317,8 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, *new_modes = modes; *mode_count = mode_idx; done: + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); if (output_info) pXRRFreeOutputInfo( output_info ); if (screen_resources) @@ -1285,10 +1389,10 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; - mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u1.s2.dmDisplayOrientation = get_orientation( crtc_info->rotation ); mode->dmBitsPerPel = screen_bpp; - mode->dmPelsWidth = mode_info->width; - mode->dmPelsHeight = mode_info->height; + mode->dmPelsWidth = crtc_info->width; + mode->dmPelsHeight = crtc_info->height; mode->u2.dmDisplayFlags = 0; mode->dmDisplayFrequency = get_frequency( mode_info ); /* Convert RandR coordinates to virtual screen coordinates */ @@ -1314,8 +1418,8 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) XRROutputInfo *output_info = NULL; XRRCrtcInfo *crtc_info = NULL; LONG ret = DISP_CHANGE_FAILED; - INT crtc_idx, output_count; Rotation rotation; + INT output_count; RRCrtc crtc = 0; Status status; RRMode rrmode; @@ -1362,26 +1466,7 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) /* Detached, need to find a free CRTC */ else { - for (crtc_idx = 0; crtc_idx < output_info->ncrtc; ++crtc_idx) - { - crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, output_info->crtcs[crtc_idx] ); - if (!crtc_info) - goto done; - - if (!crtc_info->noutput) - { - crtc = output_info->crtcs[crtc_idx]; - pXRRFreeCrtcInfo( crtc_info ); - crtc_info = NULL; - break; - } - - pXRRFreeCrtcInfo( crtc_info ); - crtc_info = NULL; - } - - /* Failed to find a free CRTC */ - if (crtc_idx == output_info->ncrtc) + if (!(crtc = get_output_free_crtc( screen_resources, output_info ))) goto done; } @@ -1396,14 +1481,13 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) { outputs = crtc_info->outputs; output_count = crtc_info->noutput; - rotation = crtc_info->rotation; } else { outputs = &output; output_count = 1; - rotation = RR_Rotate_0; } + rotation = get_rotation( mode->u1.s2.dmDisplayOrientation ); /* According to the RandR spec, the entire CRTC must fit inside the screen. * Since we use the union of all enabled CRTCs to determine the necessary -- 2.25.1

2 1

[PATCH 1/4] user32/tests: Add display orientation tests.
by Zhiyi Zhang 22 Sep '20

22 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7ae10fcf848..0ce27455a66 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -938,6 +938,70 @@ static void test_ChangeDisplaySettingsEx(void) } } + /* Test changing each adapter to every supported display orientation */ + for (device = 0; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, EDS_ROTATEDMODE); ++mode) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel || dm2.dmDisplayFrequency != dm.dmDisplayFrequency) + continue; + + if ((dm2.dmDisplayOrientation == DMDO_DEFAULT || dm2.dmDisplayOrientation == DMDO_180) + && (dm2.dmPelsWidth != dm.dmPelsWidth || dm2.dmPelsHeight != dm.dmPelsHeight)) + continue; + + if ((dm2.dmDisplayOrientation == DMDO_90 || dm2.dmDisplayOrientation == DMDO_270) + && (dm2.dmPelsWidth != dm.dmPelsHeight || dm2.dmPelsHeight != dm.dmPelsWidth)) + continue; + + res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_RESET, NULL); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change %s to mode %d.\n", devices[device].name, mode); + continue; + } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d.\n", + devices[device].name, mode, res); + flush_events(); + expect_dm(dm2, devices[device].name, mode); + + /* EnumDisplaySettingsEx without EDS_ROTATEDMODE reports modes with current orientation */ + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + for (i = 0; EnumDisplaySettingsExA(devices[device].name, i, &dm3, 0); ++i) + { + ok(dm3.dmDisplayOrientation == dm2.dmDisplayOrientation, + "Expected %s display mode %d orientation %d, got %d.\n", + devices[device].name, i, dm2.dmDisplayOrientation, dm3.dmDisplayOrientation); + } + ok(i > 0, "Expected at least one display mode found.\n"); + + if (device == 0) + { + ok(GetSystemMetrics(SM_CXSCREEN) == dm2.dmPelsWidth, "Expected %d, got %d.\n", + dm2.dmPelsWidth, GetSystemMetrics(SM_CXSCREEN)); + ok(GetSystemMetrics(SM_CYSCREEN) == dm2.dmPelsHeight, "Expected %d, got %d.\n", + dm2.dmPelsHeight, GetSystemMetrics(SM_CYSCREEN)); + } + + if (device_count == 1) + { + ok(GetSystemMetrics(SM_CXVIRTUALSCREEN) == dm2.dmPelsWidth, "Expected %d, got %d.\n", + dm2.dmPelsWidth, GetSystemMetrics(SM_CXVIRTUALSCREEN)); + ok(GetSystemMetrics(SM_CYVIRTUALSCREEN) == dm2.dmPelsHeight, "Expected %d, got %d.\n", + dm2.dmPelsHeight, GetSystemMetrics(SM_CYVIRTUALSCREEN)); + } + } + ok(mode > 0, "Expected at least one display mode found.\n"); + } + /* Restore all adapters to their original settings */ for (device = 0; device < device_count; ++device) { -- 2.25.1

2 1

[PATCH 3/4] winex11.drv: Support finding a full display mode with specified orientation.
by Zhiyi Zhang 22 Sep '20

22 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 5bbba453b95..0fa5bcf6294 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -497,7 +497,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) if (is_detached_mode(dev_mode)) return dev_mode; - if (!handler.get_modes(id, 0, &modes, &mode_count)) + if (!handler.get_modes(id, EDS_ROTATEDMODE, &modes, &mode_count)) return NULL; qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); @@ -519,6 +519,9 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) dev_mode->dmDisplayFrequency != 1 && dev_mode->dmDisplayFrequency != found_mode->dmDisplayFrequency) continue; + if (dev_mode->dmFields & DM_DISPLAYORIENTATION && + found_mode->u1.s2.dmDisplayOrientation != dev_mode->u1.s2.dmDisplayOrientation) + continue; break; } -- 2.25.1

1 0

[PATCH 2/4] winex11.drv: Sort display modes with orientation considered.
by Zhiyi Zhang 22 Sep '20

22 Sep '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 42 ++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 902f1ec15d9..5bbba453b95 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -359,18 +359,50 @@ BOOL get_primary_adapter(WCHAR *name) static int mode_compare(const void *p1, const void *p2) { + DWORD a_width, a_height, b_width, b_height; const DEVMODEW *a = p1, *b = p2; + /* Use the width and height in landscape mode for comparison */ + if (a->u1.s2.dmDisplayOrientation == DMDO_DEFAULT || a->u1.s2.dmDisplayOrientation == DMDO_180) + { + a_width = a->dmPelsWidth; + a_height = a->dmPelsHeight; + } + else + { + a_width = a->dmPelsHeight; + a_height = a->dmPelsWidth; + } + + if (b->u1.s2.dmDisplayOrientation == DMDO_DEFAULT || b->u1.s2.dmDisplayOrientation == DMDO_180) + { + b_width = b->dmPelsWidth; + b_height = b->dmPelsHeight; + } + else + { + b_width = b->dmPelsHeight; + b_height = b->dmPelsWidth; + } + + /* Depth in descending order */ if (a->dmBitsPerPel != b->dmBitsPerPel) return b->dmBitsPerPel - a->dmBitsPerPel; - if (a->dmPelsWidth != b->dmPelsWidth) - return a->dmPelsWidth - b->dmPelsWidth; + /* Width in ascending order */ + if (a_width != b_width) + return a_width - b_width; - if (a->dmPelsHeight != b->dmPelsHeight) - return a->dmPelsHeight - b->dmPelsHeight; + /* Height in ascending order */ + if (a_height != b_height) + return a_height - b_height; - return b->dmDisplayFrequency - a->dmDisplayFrequency; + /* Frequency in descending order */ + if (a->dmDisplayFrequency != b->dmDisplayFrequency) + return b->dmDisplayFrequency - a->dmDisplayFrequency; + + /* Orientation in ascending order */ + return a->u1.s2.dmDisplayOrientation - b->u1.s2.dmDisplayOrientation; } /*********************************************************************** -- 2.25.1

1 0

[PATCH] conhost: Fix a memory leak.
by Haidong Yu 22 Sep '20

22 Sep '20

2 1

[PATCH vkd3d 3/3] Release 1.2.
by Henri Verbeet 21 Sep '20

21 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- ANNOUNCE | 179 ++++++++++++++++++++++++++++++++++++---------- AUTHORS | 11 +++ Makefile.am | 4 +- configure.ac | 2 +- libs/vkd3d-shader/spirv.c | 2 +- 5 files changed, 158 insertions(+), 40 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 89a4b400..01739d2d 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,16 +1,17 @@ -The Wine team is proud to announce that release 1.1 of vkd3d, the -Direct3D 12 to Vulkan translation library, is now available. +The Wine team is proud to announce that release 1.2 of vkd3d, the Direct3D to +Vulkan translation library, is now available. This release contains improvements that are listed in the release notes below. The main highlights are: - - Initial support for placed resources. - - MoltenVK support. - - Support for geometry shaders. + - Availability of libvkd3d-shader as a public library. + - Support for tessellation shaders. + - Version 1.1 root signatures. + - Stream output support. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.1.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz The current source can also be pulled directly from the git repository: @@ -21,65 +22,171 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.1 +What's new in vkd3d 1.2 ======================= *** libvkd3d -- Initial support for memory heaps and placed resources. +- Newly implemented Direct3D 12 features: + - Multi-sampling. + - Reserved resources. + - Instance data step rates. This requires the + VK_EXT_vertex_attribute_divisor extension. + - `Private data' APIs for all interfaces. + - Shader-resource view component mappings. + - Indirect indexed draws. + - Indirect draws with a count buffer. This requires the + VK_KHR_draw_indirect_count extension. + - Stream output and stream output queries. This requires the + VK_EXT_transform_feedback extension. + - Predicated/conditional rendering. + - Primitive restart. + - Depth rendering without a pixel shader. + - Depth clipping. This requires the VK_EXT_depth_clip_enable extension. + - Rasteriser discard. + - Dual-source blending. + - Mapping placed resources. + - The ReadFromSubresource() and WriteToSubresource() ID3D12Resource methods. + - Simultaneous access to resources from multiple queues. + - Null-views. I.e., views without an underlying resource. + - Several more feature support queries. + +- New interfaces: + - vkd3d_serialize_versioned_root_signature() and + vkd3d_create_versioned_root_signature_deserializer() provide support for + versioned root signatures. + - The vkd3d_application_info structure extends the + vkd3d_instance_create_info structure, and can be used to pass information + about the application to libvkd3d. It is analogous to the + VkApplicationInfo structure in Vulkan. Its `api_version' field should be + set to the version of the libvkd3d API that the application targets. + - The vkd3d_optional_device_extensions_info structure extends the + vkd3d_device_create_info structure, and can be used to pass a list of + device extensions to enable only when available to libvkd3d. It is + analogous to the vkd3d_optional_instance_extensions_info structure for + instance extensions. + +- New environment variables: + - VKD3D_CONFIG can be used to set options that change the behaviour of + libvkd3d. + - VKD3D_TEST_BUG can be used to disable bug_if() conditions in the test + suite. + - VKD3D_TEST_FILTER can be used to control which tests are run. + - VKD3D_VULKAN_DEVICE can be used to override the Vulkan physical device + used by vkd3d. + See the README for more detailed descriptions and how to use these. + +- When the VK_KHR_dedicated_allocation extension is available, dedicated + allocations may be used for committed resources. + +- When the VK_KHR_image_format_list extension is available, it will be used to + inform the driver about the view formats that a particular mutable Vulkan + image can be used with. This improves performance on some Vulkan + implementations. + +- When the VK_EXT_debug_marker extension is available, object names set with + the ID3D12Object SetName() method will be propagated to the underlying + Vulkan objects. + +- Unordered-access view clears are supported on more formats. Previously these + were limited to integer formats for texture resources, and single component + integer formats for buffer resources. + +- When the D24_UNORM_S8_UINT format is not supported by the Vulkan + implementation, the D32_SFLOAT_S8_UINT format will be used instead to + implement the D24_UNORM_S8_UINT and related DXGI formats. This is required + because the DXGI D24_UNORM_S8_UINT format is mandatory, while the Vulkan + D24_UNORM_S8_UINT format is optional. -- Improved support for resource views. +- Various bug fixes. -- ClearUnorderedAccessViewUint() is implemented for textures. -- Blend factor is implemented. +*** libvkd3d-shader -- Performance improvements. +- libvkd3d-shader is now available as a public instead of an internal library. -- A new interface is available for enabling additional Vulkan instance - extensions. +- New features: + - Tessellation shaders. + - Root signature version 1.1 serialisation, deserialisation, and conversion. + - Multi-sample masks. + - Per-sample shading. + - Early depth/stencil test. + - Conservative depth output. + - Dual-source blending. + - Stream output. + - Viewport arrays. -- A new public function is available for mapping VkFormats to DXGI_FORMATs. +- Support for OpenGL SPIR-V target environments. This allows SPIR-V produced + by libvkd3d-shader to be used with GL_ARB_gl_spirv. This includes support + for OpenGL atomic counters and combined samplers. -- Support for more DXGI formats. +- Preliminary support for shader model 5.1 shaders. This is still a work in + progress. Notably, support for resource arrays is not yet implemented. -- Various bug fixes. +- When the SPV_EXT_demote_to_helper_invocation is available, it will be used + to implement the `discard' shader instruction instead of using SpvOpKill. In + particular, this ensures the `deriv_rtx' and `deriv_rty' instruction return + accurate results after a (conditional) `discard' instruction. +- Support for using SPIR-V specialisation constants for shader parameters. -*** libvkd3d-shader +- Support for more shader instructions: + - bufinfo, + - eval_centroid, + - eval_sample_index, + - ld2ms, + - sample_b, + - sample_d, + - sample_info, + - samplepos. + +- When built against SPIRV-Tools, libvkd3d-shader can produce SPIR-V shaders + in text form. -- Support for geometry shaders. +- libvkd3d-shader now has its own environment variable (VKD3D_SHADER_DEBUG) to + control debug output. -- Pretty printing is implemented for shader code extracted from DXBC. +- Various shader translation fixes. -- Clip and cull distances are supported. -- Support for more shader instructions: - - round_ne, - - sincos, - - ineg, - - continue, - - continuec, - - gather4_po, - - gather4_po_c, - - gather4_c. +*** vkd3d-compiler -- Texel offsets are supported. +- When supported by libvkd3d-shader, text form SPIR-V is available as a target + format, in addition to the existing binary form SPIR-V target format. -- Various shader translation fixes. +- Input from standard input, and output to standard output is supported. *** libvkd3d-utils -- Vulkan WSI extensions are detected at runtime. +- To specify the libvkd3d API version to use when creating vkd3d instances, + define VKD3D_UTILS_API_VERSION to the desired version before including + vkd3d_utils.h. If VKD3D_UTILS_API_VERSION is not explicitly defined, + VKD3D_API_VERSION_1_0 will be used. + +- Support for versioned root signatures is provided by the + D3D12SerializeVersionedRootSignature() and + D3D12CreateVersionedRootSignatureDeserializer() entry points. *** build -- Demos are not built by default. +- The minimum required version of Vulkan-Headers and SPIRV-Headers for this + release is version 1.1.113. + +- The minimum required version of widl for this release is version 3.20. + +- If doxygen is available, it will be used to build API documentation. By + default, documentation will be generated in HTML and PDF formats. -- libxcb is now an optional dependency required only for demos. +- If debug logs are not required or desired, defining VKD3D_NO_TRACE_MESSAGES + and VKD3D_NO_DEBUG_MESSAGES will prevent them from being included in the + build. For example, a release build may want to configure with + `CPPFLAGS="-DNDEBUG -DVKD3D_NO_TRACE_MESSAGES -DVKD3D_NO_DEBUG_MESSAGES"'. -- MoltenVK is supported. +- Microsoft Windows is now a supported target platform. To create a build for + Windows, either cross-compile by configuring with an appropriate --host + option like for example `--host=x86_64-w64-mingw32', or build on Windows + itself using an environment like MSYS2 or Cygwin. diff --git a/AUTHORS b/AUTHORS index c15cb6ae..8528b200 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,15 @@ +Alexandre Julliard +Andrew Eikum Chip Davis +Conor McCarthy +Derek Lesho +Hans-Kristian Arntzen Henri Verbeet +Isabella Bosia +Jactry Zeng Józef Kucia +Philip Rebohle +Rémi Bernon Sven Hesse +Zebediah Figura +Zhiyi Zhang diff --git a/Makefile.am b/Makefile.am index deea5678..05403157 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,7 +111,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vulkan_procs.h -libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -122,7 +122,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index a9db1723..62093862 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.1]) +AC_INIT([vkd3d],[1.2]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 994b5ac1..44fe35c7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -213,7 +213,7 @@ static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_ #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 -#define VKD3D_SPIRV_GENERATOR_VERSION 1 +#define VKD3D_SPIRV_GENERATOR_VERSION 2 #define VKD3D_SPIRV_GENERATOR_MAGIC ((VKD3D_SPIRV_GENERATOR_ID << 16) | VKD3D_SPIRV_GENERATOR_VERSION) struct vkd3d_spirv_stream -- 2.11.0

2 1

[PATCH vkd3d 2/3] build: Add ANNOUNCE to EXTRA_DIST.
by Henri Verbeet 21 Sep '20

21 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ca0f6166..deea5678 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,7 +129,7 @@ libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map endif -EXTRA_DIST = LICENSE +EXTRA_DIST = ANNOUNCE LICENSE pkgconfigdir = $(libdir)/pkgconfig pkginclude_HEADERS = $(vkd3d_public_headers) -- 2.11.0

1 0

[PATCH vkd3d 1/3] build: Install vkd3d-compiler.
by Henri Verbeet 21 Sep '20

21 Sep '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index dd624856..ca0f6166 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,7 +140,7 @@ EXTRA_DIST += \ libs/vkd3d-shader/libvkd3d-shader.pc.in \ libs/vkd3d-utils/libvkd3d-utils.pc.in -noinst_PROGRAMS = vkd3d-compiler +bin_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la @@ -158,7 +158,7 @@ endif if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ -noinst_PROGRAMS += $(vkd3d_demos) +noinst_PROGRAMS = $(vkd3d_demos) demos_gears_CFLAGS = $(DEMOS_CFLAGS) demos_gears_LDADD = $(DEMOS_LDADD) -lm -- 2.11.0

1 0

Easy(er) wine patch formatting with git clang-format.
by Rémi Bernon 21 Sep '20

21 Sep '20

Hi! I had enough of always having small white-space issues in my patches lately, so I've hacked clang-format a bit to make it better handle Wine specific style(s), and make it more readily usable for contributing to Wine, and I'm now sharing it as it could be useful to others. I also discovered the git clang-format helper, which formats source but only keeps the lines that a patch or a commit previously changed, making it easier to get correctly formatted patches without messing with the source code around. Now it's still not completely a perfect fit and there's a few cases where the tool doesn't give very good results, but I find that git clang-format is very well done for hand-picking good style fixes. For instance, you can just add all your changes before committing, then call `git clang-format`, which formats your changes without touching the staged changes. And you can then add the style fixes one by one with `git add -p`. Or, if you already have a commit that you want to check or fixup, run `git clang-format HEAD^` and `git add -p` then `git commit --am`. The patches for clang-format are attached (on llvm source, currently on 45344cf7ac5b848f77825ffa37b0cb3b69b9b07b HEAD), and a small explanation / usage for each one: * PATCH 1/4 adds a new SpacesInFunctionParentheses configuration option to support some Wine-specific style for function calls, where spaces are used but only within parentheses of a function call. There was already some support for spaces around paren, but not specifically for function calls. * PATCH 2/4 introduces a new way to lookup for .clang-format config files. There's already one that looks such files up a source file path, recursively, but as we don't include such files in Wine source, it was hard to maintain locally --I'm a heavy git clean -fdx user. This instead introduces a new -style-dir command-line argument, and a corresponding clangFormat.styleDir git-clang-format configuration parameter, that will replace the current working dir when looking for such files. For instance, I use clangFormat.styleDir = ~/Code/.wine-clang-format.d, which currently contains: /home/rbernon/Code/.wine-clang-format.d/ ├── dlls │ ├── gdi32 │ │ └── .clang-format │ ├── user32 │ │ └── .clang-format │ └── windowscodecs │ └── .clang-format ├── server │ └── .clang-format └── tools └── widl └── .clang-format And clang-format will use the .clang-format that best matches to the source file that is formatted in the wine source tree. For reference and illustration, I have this user32 .clang-format, which works more or less correctly: --- DisableFormat: false SortIncludes: false Language: Cpp StatementMacros: - todo_wine - todo_wine_if TypenameMacros: - MAKE_FUNCPTR - MAKELANGID - LOAD_FUNCPTR - ARRAY_SIZE - debugstr_a - debugstr_an - debugstr_w - debugstr_wn - debugstr_us - debugstr_faceid - debugstr_fontsignature IndentWidth: 4 ColumnLimit: 100 BreakBeforeBraces: Allman AlignAfterOpenBracket: Align AllowAllArgumentsOnNextLine: true AllowShortIfStatementsOnASingleLine: Always AllowShortLoopsOnASingleLine: true BinPackArguments: true BinPackParameters: true SpacesInFunctionParentheses: true PenaltyExcessCharacter: 1 ... I currently abuse StatementMacros and TypenameMacros to tweak the resulting style, as it's still not perfect and the source is also not always consistent already. Of course, this wouldn't be needed if these files could be added to Wine source tree. * PATCH 3/4 and 4/4 are small style mix-ups fixes that occurred too may times already. -- Rémi Bernon <rbernon(a)codeweavers.com>

1 0

[PATCH] winegstreamer: Drop redundant NULL check before heap_free()
by Michael Stefaniuc 21 Sep '20

21 Sep '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/media_source.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 84ecf305d4c..f365c8a1827 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -394,8 +394,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) IPropertyStore_Release(context->props); if (context->stream) IMFByteStream_Release(context->stream); - if (context->url) - heap_free(context->url); + heap_free(context->url); heap_free(context); } -- 2.26.2

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel