- Wine-Devel - list.winehq.org

[PATCH v2] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString
by Kacper Raczy June 23, 2022

June 23, 2022

APIs introduced in Windows 10 (NT10.0). Device form and family is fixed to Desktop configuration. Unit tests included in dlls/ntdll/tests/version.c Signed-off-by: Kacper Raczy <gfw.kra(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/rtl.c | 2 +- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/version.c | 71 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/version.c | 48 +++++++++++++++++++++++- include/winnt.h | 10 +++++ 6 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 dlls/ntdll/tests/version.c diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..4539a9bd0ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -712,6 +712,8 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) +@ stdcall RtlConvertDeviceFamilyInfoToString(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f44941..421cf377d32 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2211,4 +2211,4 @@ char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) { FIXME("stub\n"); return PHCM_APPLICATION_DEFAULT; -} +} \ No newline at end of file diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 90deb5865f8..e64b70b15e4 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -25,5 +25,6 @@ C_SRCS = \ thread.c \ threadpool.c \ time.c \ + version.c \ virtual.c \ - wow64.c + wow64.c \ No newline at end of file diff --git a/dlls/ntdll/tests/version.c b/dlls/ntdll/tests/version.c new file mode 100644 index 00000000000..6b2d86e3464 --- /dev/null +++ b/dlls/ntdll/tests/version.c @@ -0,0 +1,71 @@ +/* + * Unit test suite for Rtl* Version API functions + * + * Copyright 2022 Kacper Rączy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ntdll_test.h" +#include "wine/test.h" + +static void test_RtlGetDeviceFamilyInfoEnum(void) +{ + DWORD family, form; + ULONGLONG uap; + RTL_OSVERSIONINFOEXW version; + + RtlGetVersion(&version); + RtlGetDeviceFamilyInfoEnum(&uap, &family, &form); + ok( ((uap >> 48) & 0xffff) == version.dwMajorVersion, + "First 16-bit chunk of UAP does not match major system version %llx\n", uap ); + ok( ((uap >> 32) & 0xffff) == version.dwMinorVersion, + "Second 16-bit chunk of UAP does not match minor system version %llx\n", uap ); + ok( ((uap >> 16) & 0xffff) == version.dwBuildNumber, + "Third 16-bit chunk of UAP does not match build number %llx\n", uap ); + ok( form == DEVICEFAMILYDEVICEFORM_DESKTOP, + "Device form does not match Desktop value: %lx\n", form ); + ok( family == DEVICEFAMILYINFOENUM_DESKTOP, + "Device family does not match Windows.Desktop value: %lx\n", family ); +} + +static void test_RtlConvertDeviceFamilyInfoToString(void) +{ + DWORD family_bufsize = 0, form_bufsize = 0; + WCHAR *family, *form; + + RtlConvertDeviceFamilyInfoToString(&family_bufsize, &form_bufsize, NULL, NULL); + ok( family_bufsize == sizeof(WCHAR) * 16, /* Windows.Desktop length */ + "Device family bufsize does not match: %u\n", family_bufsize ); + ok( form_bufsize == sizeof(WCHAR) * 8, /* Desktop length */ + "Device family bufsize does not match: %u\n", form_bufsize ); + + family = (WCHAR*)malloc(family_bufsize); + form = (WCHAR*)malloc(form_bufsize); + RtlConvertDeviceFamilyInfoToString(&family_bufsize, &form_bufsize, family, form); + ok( wcscmp(family, L"Windows.Desktop") == 0, + "Device family string is not equal to Windows.Desktop: %ls", family ); + ok( wcscmp(form, L"Desktop") == 0, + "Device form string is not equal to Desktop: %ls", form ); + + free(family); + free(form); +} + +START_TEST(version) +{ + test_RtlGetDeviceFamilyInfoEnum(); + test_RtlConvertDeviceFamilyInfoToString(); +} \ No newline at end of file diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 492c24cc636..e988a17311b 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -609,7 +609,6 @@ void WINAPI RtlGetNtVersionNumbers( LPDWORD major, LPDWORD minor, LPDWORD build if (build) *build = (0xF0000000 | current_version->dwBuildNumber); } - /****************************************************************************** * RtlGetNtProductType (NTDLL.@) */ @@ -760,6 +759,53 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +void WINAPI RtlGetDeviceFamilyInfoEnum( ULONGLONG *uap_info, DWORD *device_family, DWORD *device_form ) +{ + if (device_form) + *device_form = DEVICEFAMILYDEVICEFORM_DESKTOP; + if (device_family) + *device_family = DEVICEFAMILYINFOENUM_DESKTOP; + if (!uap_info) + return; + + /** + UAP info is 64 bit unsigned integer which contains four 16-bit chunks: + 1. os version major + 2. os version minor + 3. current build number + 4. UBR + */ + *uap_info = 0; + *uap_info |= (((ULONGLONG)current_version->dwMajorVersion & 0xffff) << 48); /* os version major */ + *uap_info |= (((ULONGLONG)current_version->dwMinorVersion & 0xffff) << 32); /* os version minor */ + *uap_info |= (((ULONGLONG)current_version->dwBuildNumber & 0xffff) << 16); /* current build number */ + /* UBR not available */ +} + +/********************************************************************* + * RtlConvertDeviceFamilyInfoToString (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +void WINAPI RtlConvertDeviceFamilyInfoToString( DWORD *device_family_bufsize, DWORD *device_form_bufsize, + const WCHAR *device_family, const WCHAR *device_form) +{ + DWORD device_family_len = (wcslen( DEVICEFAMILYINFOENUM_DESKTOP_STR ) + 1) * sizeof(WCHAR); + DWORD device_form_len = (wcslen( DEVICEFAMILYDEVICEFORM_DESKTOP_STR ) + 1) * sizeof(WCHAR); + if (*device_family_bufsize >= device_family_len) + wcscpy( device_family, DEVICEFAMILYINFOENUM_DESKTOP_STR ); + if (*device_form_bufsize >= device_form_len) + wcscpy( device_form, DEVICEFAMILYDEVICEFORM_DESKTOP_STR ); + *device_family_bufsize = device_family_len; + *device_form_bufsize = device_form_len; +} /****************************************************************************** * VerSetConditionMask (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..eeb4e1cb494 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6224,6 +6224,16 @@ typedef struct _SYSTEM_CPU_SET_INFORMATION } DUMMYUNIONNAME; } SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; +/* Windows 10 Rtl apis */ + +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYDEVICEFORM_DESKTOP_STR L"Desktop" +#define DEVICEFAMILYINFOENUM_DESKTOP_STR L"Windows.Desktop" + +NTSYSAPI VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*, DWORD*, DWORD*); +NTSYSAPI VOID WINAPI RtlConvertDeviceFamilyInfoToString(DWORD*, DWORD*, const WCHAR*, const WCHAR*); + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; -- 2.36.1

2 2

[PATCH 0/6] MR299: uxtheme: Support parsing more tab parts.
by Zhiyi Zhang (＠zhiyi) June 23, 2022

June 23, 2022

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/299

2 6

Re: [PATCH v2 0/2] MR270: include: Add interface declarations in dxgidebug.idl - approved
by Alexandre Julliard (＠julliard) June 22, 2022

June 22, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/270

1 0

Re: [PATCH v3 0/2] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil. - approved
by Alexandre Julliard (＠julliard) June 22, 2022

June 22, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/132

1 0

Re: [PATCH v2 0/5] MR297: uxtheme: Support parsing more listview parts and states. - approved
by Alexandre Julliard (＠julliard) June 22, 2022

June 22, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/297

1 0

[PATCH resend] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlGetDeviceFamilyInfoEnum
by Kacper Raczy June 22, 2022

June 22, 2022

APIs introduced in Windows 10 (NT10.0). DeviceForm and Family is fixed to Desktop configuration. Signed-off-by: Kacper Raczy <gfw.kra(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/rtl.c | 2 +- dlls/ntdll/version.c | 54 ++++++++++++++++++++++++++++++++++++++++++- include/winnt.h | 10 ++++++++ 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..4539a9bd0ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -712,6 +712,8 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) +@ stdcall RtlConvertDeviceFamilyInfoToString(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f44941..421cf377d32 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2211,4 +2211,4 @@ char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) { FIXME("stub\n"); return PHCM_APPLICATION_DEFAULT; -} +} \ No newline at end of file diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 492c24cc636..b9af53452a2 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -609,7 +609,6 @@ void WINAPI RtlGetNtVersionNumbers( LPDWORD major, LPDWORD minor, LPDWORD build if (build) *build = (0xF0000000 | current_version->dwBuildNumber); } - /****************************************************************************** * RtlGetNtProductType (NTDLL.@) */ @@ -760,6 +759,59 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG *uap_info, DWORD *device_family, DWORD *device_form) +{ + ULONGLONG uap_info_temp; + + if (device_form != NULL) + *device_form = DEVICEFAMILYDEVICEFORM_DESKTOP; + if (device_family != NULL) + *device_family = DEVICEFAMILYINFOENUM_DESKTOP; + if (uap_info == NULL) + return; + + /** + UAP info is 64 bit unsigned integer which contains four 16-bit chunks: + 1. os version major + 2. os version minor + 3. current build number + 4. UBR + */ + uap_info_temp = 0; + uap_info_temp |= (((ULONGLONG) current_version->dwMajorVersion & 0xffff) << 48); /* os version major */ + uap_info_temp |= (((ULONGLONG) current_version->dwMinorVersion & 0xffff) << 32); /* os version minor */ + uap_info_temp |= (((ULONGLONG) current_version->dwBuildNumber & 0xffff) << 16); /* current build number */ + /* UBR not available */ + *uap_info = uap_info_temp; +} + +/********************************************************************* + * RtlConvertDeviceFamilyInfoToString (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +VOID WINAPI RtlConvertDeviceFamilyInfoToString( + DWORD *device_family_bufsize, + DWORD *device_form_bufsize, + const LPWSTR device_family, + const LPWSTR device_form +) { + if (device_family_bufsize != NULL) + *device_family_bufsize = (DWORD)wcslen(DEVICEFAMILYDEVICEFORM_DESKTOP_STR) + 1; + if (device_family != NULL) + wcscpy(device_family, DEVICEFAMILYDEVICEFORM_DESKTOP_STR); + if (device_form_bufsize != NULL) + *device_form_bufsize = (DWORD)wcslen(DEVICEFAMILYINFOENUM_DESKTOP_STR) + 1; + if (device_form != NULL) + wcscpy(device_form, DEVICEFAMILYINFOENUM_DESKTOP_STR); +} /****************************************************************************** * VerSetConditionMask (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..b07df911c69 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6224,6 +6224,16 @@ typedef struct _SYSTEM_CPU_SET_INFORMATION } DUMMYUNIONNAME; } SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; +/* Windows 10 Rtl apis */ + +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYDEVICEFORM_DESKTOP_STR L"Desktop" +#define DEVICEFAMILYINFOENUM_DESKTOP_STR L"Windows.Desktop" + +NTSYSAPI VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*, DWORD*, DWORD*); +NTSYSAPI VOID WINAPI RtlConvertDeviceFamilyInfoToString(DWORD*, DWORD*, const LPWSTR, const LPWSTR); + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; -- 2.36.1

2 2

[PATCH 0/6] MR298: Improve support for types out of PDB files
by eric pouech (＠epo) June 22, 2022

June 22, 2022

Current dbghelp support for reading C/C++ types out of PDB files suffer from some defaults: - several records for the same type (ie struct/class/union/enum with same name) can be present in a PDB file. This can happen when recompiling a compilation unit after modifying the definition of such type (eg adding a field a struct). The PDB file seems to be incrementally modified, and ends up with the old and new definition of such type inside the PDB file. - this of course can lead to erroneous information out of dbghelp. When looking for a type by name, dbghelp must return the new definition. - such errors have been experienced in two situations: + some type definition are stored in two different records in PDB file. A simple example is 'struct list { struct list* next; };' where the circular reference is broken by first generating a forward record for struct list, followed by the full definition of struct list (using the forward record as the type for the 'next' field. Resolution from forward record to find implementation record is done by name lookup. + finding a type by its name (SymGetTypeFromName) - PDB uses the order of elements in its hash table to pick up the "newest" one. - the incremental linker can also modify the hash table order (but I didn't find out yet what triggers it), using specific entries (ie like patching the hash table order). This series: - improve winedump to dump information stored in stream of types' hash - cleans up some type handling related code - modifies type loader out of PDB files to handle correctly the defaults listed above. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/298

2 6

[PATCH] wined3d: Restore the vkd3d-shader version TRACE.
by Henri Verbeet June 22, 2022

June 22, 2022

This was lost in commit 24432a24d5e922cbd824b0af8f7b0c66ff2b66e8, but is useful, particularly when using external vkd3d-shader. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index cf07b81711e..14665dee0f2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1089,6 +1089,8 @@ static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void) { + TRACE("Using %s.\n", vkd3d_shader_get_version(NULL, NULL)); + return &spirv_shader_backend_vk; } -- 2.30.2

1 0

[PATCH vkd3d 4/4] Release 1.4.
by Henri Verbeet June 22, 2022

June 22, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- ANNOUNCE | 170 +++++++++------------------- AUTHORS | 2 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 70 insertions(+), 126 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 163e24d9..8a80ea4e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,16 +1,17 @@ -The Wine team is proud to announce that release 1.3 of vkd3d, the Direct3D to +The Wine team is proud to announce that release 1.4 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 HLSL compilation support. - - Shader model 5.1 descriptor array support. - - Support for disassembling Direct3D shaders. + - Many improvements to the HLSL compiler. + - A new descriptor heap implementation using the VK_EXT_descriptor_indexing + extension. + - A new fence implementation using the VK_KHR_timeline_semaphore extension. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.3.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.4.tar.xz The current source can also be pulled directly from the git repository: @@ -21,136 +22,75 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.3 +What's new in vkd3d 1.4 ======================= *** libvkd3d -- Newly implemented Direct3D 12 features: - - Root signature support for unbounded descriptor tables. - - Unordered-access view counters in pixel shaders. These were previously - only supported in compute shaders. - - Output merger logical operations. - - Retrieving CPU/GPU timestamp calibration values. This requires support for - the VK_EXT_calibrated_timestamps extension. - - The `mirror_once' texture addressing mode. This requires support for the - VK_KHR_sampler_mirror_clamp_to_edge extension. +- A new descriptor heap implementation using the VK_EXT_descriptor_indexing + extension. In particular, the new implementation is more efficient when + large descriptor heaps are used by multiple command lists. The new + `virtual_heaps' configuration option can be used to select the original + implementation even when the VK_EXT_descriptor_indexing extension is + available. -- New interfaces: - - The vkd3d_host_time_domain_info structure extends the - vkd3d_instance_create_info structure, and can be used to specify how to - convert between timestamps and tick counts. If left unspecified, a tick - is assumed to take 100 nanoseconds. +- A new fence implementation using the VK_KHR_timeline_semaphore extension. + The new implementation addresses a number of edge cases the original + implementation was unable to, as well as being somewhat more efficient. + +- When the VK_EXT_robustness2 extension is available, it is used to implement + null views. This more accurately matches Direct3D 12 behaviour. For example, + all reads from such a null view return zeroes, while that isn't necessarily + the case for out-of-bounds reads with the original implementation. -- Various bug fixes. +- New interfaces: + - vkd3d_set_log_callback() allows writing log output via a custom callback. + This can be used to integrate vkd3d's log output with other logging + systems. *** libvkd3d-shader -- New features: - - Initial support for HLSL compilation and preprocessing. This is an ongoing - effort; although support for many features is already implemented, support - for many more isn't yet. - - Support for disassembling Direct3D byte-code shaders to Direct3D assembly. - - Support for parsing the legacy Direct3D byte-code format used by Direct3D - shader model 1, 2, and 3 shaders. In the current vkd3d-shader release, - only Direct3D assembly is supported as a target for these; we intend to - support SPIR-V as a target in a future release. - -- New features for the SPIR-V target: - - Support for various aspects of Direct3D shader model 5.1 descriptor - arrays, including unbounded descriptor arrays, UAV counter arrays, dynamic - indexing of descriptor arrays, and non-uniform indexing of descriptor - arrays. With the exception of some special cases, this requires support - for the SPV_EXT_descriptor_indexing extension in the target environment. - - Support for double precision floating-point operations. - - Support for indirect addressing of tessellation control shader inputs. - - Stencil export. I.e., writing stencil values from shaders. This requires - support for the SPV_EXT_shader_stencil_export extension in the target - environment. - - Support for the Direct3D shader model 4+ `precise' modifier. - - Support for Direct3D shader model 4+ global resource memory barriers. - -New interfaces: - - vkd3d_shader_preprocess() provides support for preprocessing shaders. - - The vkd3d_shader_preprocess_info structure extends the - vkd3d_shader_compile_info structure, and can be used to specify - preprocessing parameters like preprocessor macro definitions. - - The vkd3d_shader_hlsl_source_info structure extends the - vkd3d_shader_compile_info structure, and can be used to specify HLSL - compilation parameters like the target profile and entry point. - - The vkd3d_shader_descriptor_offset_info structure extends the - vkd3d_shader_interface_info structure, and can be used to specify offsets - into descriptor arrays referenced by shader interface bindings. This - allows mapping multiple descriptor arrays in a shader to a single binding - point in the target environment, and helps with mapping between the - Direct3D 12 and Vulkan binding models. - - The VKD3D_SHADER_COMPILE_OPTION_API_VERSION compile option can - be used to specify the version of the libvkd3d-shader API the - application is targeting. If left unspecified, - VKD3D_SHADER_API_VERSION_1_2 will be used. - -- Various shader translation fixes, for tessellation shaders in particular. - - -*** vkd3d-compiler - -- New source and target types: - - The `hlsl' source type specifies High Level Shader Language source code. - - The `d3d-asm' target type specifies Direct3D assembly shaders. - - The `d3dbc' format specifies legacy Direct3D byte-code, which is used for - Direct3D shader model 1, 2, and 3 shaders. - - The existing `dxbc-tpf' format can now also be used as a target format. - -- New command line options: - - `-E' can be used to specify the input should only be preprocessed. - - `-e'/`--entry' can be used to specify the entry point for HLSL and/or - SPIR-V shaders. - - `-p'/`--profile' can be used to specify the target profile for HLSL - shaders. - -- When no source type is explicitly specified, vkd3d-compiler will attempt to - determine the source type from the provided input. Note that this is - intended as a convenience for interactive usage only, and the heuristics - used are subject to future change. Non-interactive usage of vkd3d-compiler, - for example in build scripts, should always explicitly specify source and - target types. - -- When no target type is explicitly specified, a default will be chosen based - on the source type. Like the earlier mentioned source type detection, this - is intended for interactive usage only. - -- vkd3d-compiler will default to colour output if it can determine that the - output is a colour-capable teleprinter. - -- New environment variables: - - NO_COLOUR/NO_COLOR can be used to disable default colour output. - See the README for more detailed descriptions and how to use these. +- New features for the HLSL source type: + - Support for integer arithmetic, bitwise and shift operations. + - Support for matrix and vector subscripting. + - Support for the mul() intrinsic function. + - Support for matrix copying, casting, and entry-wise operations. + - Support for complex initialisers. + - Support for the `nointerpolation' modifier. This modifier is applied by + default to integer variables. + - Support for the SV_VertexID semantic. + - Support for matrix-typed varyings. + - Constant folding for a number of operators. + - Copy propagation across branches and loops. This allows use of non-numeric + variables anywhere in a program, as well as more optimised code for + accessing numeric variables within branches and loops. + +- The disassembler supports the shader model 5 `msad' instruction. + +- New interfaces: + - vkd3d_shader_set_log_callback() allows writing log output via a custom + callback. *** libvkd3d-utils - New interfaces: - - D3DCreateBlob() provides support for creating ID3DBlob objects. - - D3DPreprocess() provides support for preprocessing HLSL source code. - - D3DCompile() and D3DCompile2() provide support for compiling HLSL source - code. + - vkd3d_utils_set_log_callback() allows writing log output via a custom + callback. *** build -- The `gears' and `triangle' demo applications are installed as `vkd3d-gears' - and `vkd3d-triangle'. These were originally intended more as documentation - than as end-user executables, but there's some value in using them for - diagnostic purposes, much like e.g. `glxgears'. - -- The VULKAN_LIBS configure variable is used when detecting the Vulkan - library. +- The minimum required version of Vulkan-Headers and SPIRV-Headers for this + release is version 1.2.139. -- Builds for the Microsoft Windows target platform no longer require support - for POSIX threads. Windows synchronisation primitives are used instead. +- The SONAME_LIBVULKAN configure variable can be used to specify the shared + object name of the Vulkan library. Because vkd3d loads the Vulkan library + dynamically, specifying this removes the need for a Vulkan import library at + build time. -- If ncurses is available, it will be use by vkd3d-compiler to determine the - capabilities of the connected teleprinter, if any. +- The `crosstests' target no longer builds Win32/PE demos or tests when these + were not enabled at configure time. diff --git a/AUTHORS b/AUTHORS index bc2e08f6..18a8b207 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,8 +5,10 @@ Atharva Nimbalkar Biswapriyo Nath Chip Davis Conor McCarthy +David Gow Derek Lesho Francisco Casas +Francois Gouget Giovanni Mascellani Hans-Kristian Arntzen Henri Verbeet diff --git a/Makefile.am b/Makefile.am index fe8133a5..ad6a0a41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -237,7 +237,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -271,7 +271,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vulkan_procs.h libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE -libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:4 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 @@ -283,7 +283,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE -libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.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 7796ae8d..423b3e76 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.3]) +AC_INIT([vkd3d],[1.4]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index bb43d8a4..e4d6145c 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -19,7 +19,7 @@ #define VK_NO_PROTOTYPES #define VK_USE_PLATFORM_XCB_KHR -#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3 +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_4 #include "config.h" #include <vkd3d.h> #include <vkd3d_utils.h> diff --git a/include/vkd3d.h b/include/vkd3d.h index f3c3fdc6..8aeb4c18 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -60,6 +60,7 @@ enum vkd3d_api_version VKD3D_API_VERSION_1_1, VKD3D_API_VERSION_1_2, VKD3D_API_VERSION_1_3, + VKD3D_API_VERSION_1_4, }; typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1e5a332e..ebddbba7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -45,6 +45,7 @@ enum vkd3d_shader_api_version VKD3D_SHADER_API_VERSION_1_1, VKD3D_SHADER_API_VERSION_1_2, VKD3D_SHADER_API_VERSION_1_3, + VKD3D_SHADER_API_VERSION_1_4, }; /** The type of a chained structure. */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d361b8a6..776533cb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -206,7 +206,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 3 +#define VKD3D_SPIRV_GENERATOR_VERSION 4 #define VKD3D_SPIRV_GENERATOR_MAGIC vkd3d_make_u32(VKD3D_SPIRV_GENERATOR_VERSION, VKD3D_SPIRV_GENERATOR_ID) struct vkd3d_spirv_stream diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 64418893..f5e1e0e7 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -210,7 +210,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option = &options[0]; option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; - option->value = VKD3D_SHADER_API_VERSION_1_3; + option->value = VKD3D_SHADER_API_VERSION_1_4; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; @@ -315,7 +315,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 97e2856d..7a29ade8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1957,7 +1957,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; @@ -2008,7 +2008,7 @@ static int vkd3d_scan_dxbc(const D3D12_SHADER_BYTECODE *code, static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9cb90cd5..2347bee0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -726,7 +726,7 @@ int main(int argc, char **argv) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); - add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3); + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info; -- 2.20.1

2 1

[PATCH vkd3d 1/4] vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t.
by Henri Verbeet June 22, 2022

June 22, 2022

For example, when the input is an empty file. Leaving the source type as VKD3D_SHADER_SOURCE_NONE would cause (potential) subsequent get_source_type_info() calls to return NULL, resulting in a segmentation fault. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ab475617..9cb90cd5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -663,11 +663,11 @@ int main(int argc, char **argv) { uint32_t token; - if (options.preprocess_only) + if (options.preprocess_only || info.source.size < sizeof(token)) { options.source_type = VKD3D_SHADER_SOURCE_HLSL; } - else if (info.source.size >= sizeof(token)) + else { memcpy(&token, info.source.code, sizeof(token)); if (token == TAG_DXBC) -- 2.20.1

2 1