September 2020 - Wine-commits

Akihiro Sagawa : kernelbase: Fix copy and paste error.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 80acf7e4ae399ecbfc372e23a18a45fd3885997b URL: https://source.winehq.org/git/wine.git/?a=commit;h=80acf7e4ae399ecbfc372e23… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 30 23:18:13 2020 +0900 kernelbase: Fix copy and paste error. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 83dd76e3c0..2cec5f7637 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4125,7 +4125,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetCalendarInfoEx( const WCHAR *locale, CALID calen static CRITICAL_SECTION tzname_section; static CRITICAL_SECTION_DEBUG tzname_section_debug = { - 0, 0, &locale_section, + 0, 0, &tzname_section, { &tzname_section_debug.ProcessLocksList, &tzname_section_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": tzname_section") } };

1 0

Akihiro Sagawa : configure: Fix a typo in comparison.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: e16018f621e93de37f5b85b29bafe44cfa6c1b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e16018f621e93de37f5b85b2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 30 23:18:15 2020 +0900 configure: Fix a typo in comparison. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 296e476779..a3fc757c7e 100755 --- a/configure +++ b/configure @@ -17439,7 +17439,7 @@ else *arm*) wine_cv_64bit_compare_swap="-march=armv7-a" ;; *) wine_cv_64bit_compare_swap="unknown" ;; esac - if test "x$wine_cv_64bit_compare_swap" != unknown + if test "x$wine_cv_64bit_compare_swap" != xunknown then CFLAGS="$CFLAGS $wine_cv_64bit_compare_swap" cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 1072f16f09..865aa924d0 100644 --- a/configure.ac +++ b/configure.ac @@ -2063,7 +2063,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= *arm*) wine_cv_64bit_compare_swap="-march=armv7-a" ;; *) wine_cv_64bit_compare_swap="unknown" ;; esac - if test "x$wine_cv_64bit_compare_swap" != unknown + if test "x$wine_cv_64bit_compare_swap" != xunknown then dnl try with the new flags CFLAGS="$CFLAGS $wine_cv_64bit_compare_swap"

1 0

Matteo Bruni : winex11: Fix monitor_id_fmtW variable name typo.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 830f2191896e6d453da9417706386cba282cad13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=830f2191896e6d453da94177… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 30 12:56:00 2020 +0200 winex11: Fix monitor_id_fmtW variable name typo. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 3e9e4474d4..47e4733dba 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -57,7 +57,7 @@ static const WCHAR pciW[] = {'P','C','I',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; -static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR monitor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { @@ -547,7 +547,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, /* Write all monitor instances paths under this adapter */ for (i = 0; i < monitor_count; i++) { - sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(key_nameW, monitor_id_fmtW, i); sprintfW(bufferW, monitor_instance_fmtW, video_index, i); if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done;

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.155.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: a8ddba3576f93529c04c5b9d8d65d45b9cdd6761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ddba3576f93529c04c5b9d… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Sep 29 15:45:33 2020 -0700 winevulkan: Update to VK spec version 1.2.155. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 18 ++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 63 ++++++++++++++++++++++++----------------- 4 files changed, 57 insertions(+), 28 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 23897b7185..7f89cfdaba 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.154" +VK_XML_VERSION = "1.2.155" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index bb5414c229..368d29c4ef 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2960,6 +2960,23 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT: + { + const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *in = (const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *)in_header; + VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->shaderImageInt64Atomics = in->shaderImageInt64Atomics; + out->sparseImageInt64Atomics = in->sparseImageInt64Atomics; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + default: FIXME("Application requested a linked structure of type %u.\n", in_header->sType); } @@ -6105,6 +6122,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_separate_stencil_usage", "VK_EXT_shader_atomic_float", "VK_EXT_shader_demote_to_helper_invocation", + "VK_EXT_shader_image_atomic_int64", "VK_EXT_shader_stencil_export", "VK_EXT_shader_subgroup_ballot", "VK_EXT_shader_subgroup_vote", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 84d7ce1834..7b39e7de26 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.154" + "api_version": "1.2.155" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 4b4512e448..f7225f01e8 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -311,6 +311,8 @@ #define VK_AMD_SHADER_CORE_PROPERTIES_2_EXTENSION_NAME "VK_AMD_shader_core_properties2" #define VK_AMD_DEVICE_COHERENT_MEMORY_SPEC_VERSION 1 #define VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME "VK_AMD_device_coherent_memory" +#define VK_EXT_SHADER_IMAGE_ATOMIC_INT64_SPEC_VERSION 1 +#define VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME "VK_EXT_shader_image_atomic_int64" #define VK_KHR_SPIRV_1_4_SPEC_VERSION 1 #define VK_KHR_SPIRV_1_4_EXTENSION_NAME "VK_KHR_spirv_1_4" #define VK_EXT_MEMORY_BUDGET_SPEC_VERSION 1 @@ -394,7 +396,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 154 +#define VK_HEADER_VERSION 155 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -2823,6 +2825,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT = 1000225002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_2_AMD = 1000227000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD = 1000229000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT = 1000234000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, @@ -4460,20 +4463,35 @@ typedef struct VkPhysicalDeviceShaderDrawParametersFeatures } VkPhysicalDeviceShaderDrawParametersFeatures; typedef VkPhysicalDeviceShaderDrawParametersFeatures VkPhysicalDeviceShaderDrawParameterFeatures; -typedef struct VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL +typedef struct VkPhysicalDeviceShaderImageFootprintFeaturesNV { VkStructureType sType; void *pNext; - VkBool32 shaderIntegerFunctions2; -} VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL; + VkBool32 imageFootprint; +} VkPhysicalDeviceShaderImageFootprintFeaturesNV; -typedef struct VkPhysicalDeviceShaderSMBuiltinsPropertiesNV +typedef struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV { VkStructureType sType; void *pNext; - uint32_t shaderSMCount; - uint32_t shaderWarpsPerSM; -} VkPhysicalDeviceShaderSMBuiltinsPropertiesNV; + VkBool32 shaderSMBuiltins; +} VkPhysicalDeviceShaderSMBuiltinsFeaturesNV; + +typedef struct VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures +{ + VkStructureType sType; + void *pNext; + VkBool32 shaderSubgroupExtendedTypes; +} VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures; +typedef VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR; + +typedef struct VkPhysicalDeviceShadingRateImageFeaturesNV +{ + VkStructureType sType; + void *pNext; + VkBool32 shadingRateImage; + VkBool32 shadingRateCoarseSampleOrder; +} VkPhysicalDeviceShadingRateImageFeaturesNV; typedef struct VkPhysicalDeviceSparseImageFormatInfo2 { @@ -5578,20 +5596,12 @@ typedef struct VkPhysicalDeviceShaderFloat16Int8Features typedef VkPhysicalDeviceShaderFloat16Int8Features VkPhysicalDeviceShaderFloat16Int8FeaturesKHR; typedef VkPhysicalDeviceShaderFloat16Int8Features VkPhysicalDeviceFloat16Int8FeaturesKHR; -typedef struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV -{ - VkStructureType sType; - void *pNext; - VkBool32 shaderSMBuiltins; -} VkPhysicalDeviceShaderSMBuiltinsFeaturesNV; - -typedef struct VkPhysicalDeviceShadingRateImageFeaturesNV +typedef struct VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL { VkStructureType sType; void *pNext; - VkBool32 shadingRateImage; - VkBool32 shadingRateCoarseSampleOrder; -} VkPhysicalDeviceShadingRateImageFeaturesNV; + VkBool32 shaderIntegerFunctions2; +} VkPhysicalDeviceShaderIntegerFunctions2FeaturesINTEL; typedef struct VkPhysicalDeviceSubgroupSizeControlPropertiesEXT { @@ -6305,13 +6315,13 @@ typedef struct VkPhysicalDeviceSampleLocationsPropertiesEXT VkBool32 variableSampleLocations; } VkPhysicalDeviceSampleLocationsPropertiesEXT; -typedef struct VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures +typedef struct VkPhysicalDeviceShaderSMBuiltinsPropertiesNV { VkStructureType sType; void *pNext; - VkBool32 shaderSubgroupExtendedTypes; -} VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures; -typedef VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR; + uint32_t shaderSMCount; + uint32_t shaderWarpsPerSM; +} VkPhysicalDeviceShaderSMBuiltinsPropertiesNV; typedef struct VkPhysicalDeviceSubgroupProperties { @@ -6755,12 +6765,13 @@ typedef struct VkPhysicalDeviceProperties2 } VkPhysicalDeviceProperties2; typedef VkPhysicalDeviceProperties2 VkPhysicalDeviceProperties2KHR; -typedef struct VkPhysicalDeviceShaderImageFootprintFeaturesNV +typedef struct VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT { VkStructureType sType; void *pNext; - VkBool32 imageFootprint; -} VkPhysicalDeviceShaderImageFootprintFeaturesNV; + VkBool32 shaderImageInt64Atomics; + VkBool32 sparseImageInt64Atomics; +} VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT; typedef struct VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT {

1 0

Michael Stefaniuc : atl80/tests:Use wide-char string literals.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 3ce68396c20b2f1e180f7c89934b82d738fbcdaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ce68396c20b2f1e180f7c89… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 29 23:29:34 2020 +0200 atl80/tests:Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl80/tests/atl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/atl80/tests/atl.c b/dlls/atl80/tests/atl.c index b88177d9e0..7ad11ce5c9 100644 --- a/dlls/atl80/tests/atl.c +++ b/dlls/atl80/tests/atl.c @@ -35,8 +35,6 @@ static void test_ax_win(void) { BOOL ret; WNDCLASSEXW wcex; - static const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; - static const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; static HMODULE hinstance = 0; ret = AtlAxWinInit(); @@ -46,13 +44,13 @@ static void test_ax_win(void) memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWin80, &wcex); + ret = GetClassInfoExW(hinstance, L"AtlAxWin80", &wcex); ok(ret, "AtlAxWin80 has not registered\n"); ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); - ret = GetClassInfoExW(hinstance, AtlAxWinLic80, &wcex); + ret = GetClassInfoExW(hinstance, L"AtlAxWinLic80", &wcex); ok(ret, "AtlAxWinLic80 has not registered\n"); ok(wcex.style == (CS_GLOBALCLASS | CS_DBLCLKS), "wcex.style %08x\n", wcex.style); }

1 0

Michael Stefaniuc : browseui: Use wide-char string literals.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: fd21557bd1871c93af96f4cb38f684aa3b858014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd21557bd1871c93af96f4cb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 29 23:29:35 2020 +0200 browseui: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/progressdlg.c | 8 +++----- dlls/browseui/tests/autocomplete.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index bca61f5482..89e70e9020 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -86,15 +86,13 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); } -static const WCHAR empty_string[] = {0}; - static void set_buffer(LPWSTR *buffer, LPCWSTR string) { IMalloc *malloc; ULONG cb; if (string == NULL) - string = empty_string; + string = L""; CoGetMalloc(MEMCTX_TASK, &malloc); cb = (lstrlenW(string) + 1)*sizeof(WCHAR); @@ -134,9 +132,9 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate) SetWindowTextW(This->hwnd, This->title); if (dwUpdate & UPDATE_LINE1) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty_string : This->lines[0])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? L"" : This->lines[0])); if (dwUpdate & UPDATE_LINE2) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty_string : This->lines[1])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? L"" : This->lines[1])); if (dwUpdate & UPDATE_LINE3) SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+2, (This->isCancelled ? This->cancelMsg : This->lines[2])); diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 0b04ab2d96..5ff274da72 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -227,7 +227,7 @@ static void test_ACLMulti(void) { const char *strings1[] = {"a", "c", "e"}; const char *strings2[] = {"a", "b", "d"}; - WCHAR exp[] = {'A','B','C',0}; + const WCHAR exp[] = L"ABC"; IEnumString *obj; IEnumACString *unk; HRESULT hr;

1 0

Liam Middlebrook : winevulkan: Add --xml argument to make_vulkan.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 844dbbffb302c364f387b8c2a66ce820d7d4fa9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=844dbbffb302c364f387b8c2… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Sep 29 15:45:49 2020 -0700 winevulkan: Add --xml argument to make_vulkan. This eases development and of Vulkan extensions by allowing developers to locally override the specification XML file used by winevulkan. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2cddb161d6..23897b7185 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3137,6 +3137,7 @@ def download_vk_xml(filename): def main(): parser = argparse.ArgumentParser() parser.add_argument("-v", "--verbose", action="count", default=0, help="increase output verbosity") + parser.add_argument("-x", "--xml", default=None, type=str, help="path to specification XML file") args = parser.parse_args() if args.verbose == 0: @@ -3148,8 +3149,12 @@ def main(): set_working_directory() - vk_xml = "vk-{0}.xml".format(VK_XML_VERSION) - download_vk_xml(vk_xml) + if args.xml: + vk_xml = args.xml + else: + vk_xml = "vk-{0}.xml".format(VK_XML_VERSION) + download_vk_xml(vk_xml) + registry = VkRegistry(vk_xml) generator = VkGenerator(registry)

1 0

Zebediah Figura : vkd3d-utils: Introduce D3DCompile() and D3DCompile2().
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: vkd3d Branch: master Commit: 0df589369e9153aff07e8a79ad7c6313f3434f01 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0df589369e9153aff07e8a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 29 16:14:51 2020 -0500 vkd3d-utils: Introduce D3DCompile() and D3DCompile2(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- include/vkd3d_d3dcommon.idl | 26 +++++++ include/vkd3d_d3dcompiler.h | 46 ++++++++++++ include/vkd3d_utils.h | 8 +++ include/vkd3d_windows.h | 2 + libs/vkd3d-utils/vkd3d_utils.map | 2 + libs/vkd3d-utils/vkd3d_utils_main.c | 125 +++++++++++++++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_private.h | 1 + 8 files changed, 211 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0df589369e9153aff07…

1 0

Zebediah Figura : vkd3d-utils: Introduce D3DPreprocess().
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: vkd3d Branch: master Commit: 0cd7f472636696cb928fa55b60552ae9b2327030 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0cd7f472636696cb928fa55… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 29 16:14:52 2020 -0500 vkd3d-utils: Introduce D3DPreprocess(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3dcompiler.h | 2 ++ include/vkd3d_utils.h | 3 ++ libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 66 +++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index 7137294..c70a7d7 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -67,6 +67,8 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3D10Blob **blob); +HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *macros, + ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); #endif /* __D3DCOMPILER_H__ */ #endif /* __VKD3D_D3DCOMPILER_H */ diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index c005d4e..a694de6 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -64,6 +64,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); +HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, + ID3DBlob **shader, ID3DBlob **error_messages); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 337409e..1e46cd8 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -11,6 +11,7 @@ global: D3DCompile; D3DCompile2; D3DCreateBlob; + D3DPreprocess; vkd3d_create_event; vkd3d_destroy_event; vkd3d_signal_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 8f54ac8..f5cb5b5 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -250,6 +250,72 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena effect_flags, 0, NULL, 0, shader, error_messages); } +HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, + ID3DBlob **preprocessed_blob, ID3DBlob **messages_blob) +{ + struct vkd3d_shader_preprocess_info preprocess_info; + struct vkd3d_shader_compile_info compile_info; + struct vkd3d_shader_code preprocessed_code; + const D3D_SHADER_MACRO *macro; + char *messages; + HRESULT hr; + int ret; + + TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", + data, size, debugstr_a(filename), macros, include, preprocessed_blob, messages_blob); + + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = &preprocess_info; + compile_info.source.code = data; + compile_info.source.size = size; + compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; + compile_info.target_type = VKD3D_SHADER_TARGET_NONE; + compile_info.options = NULL; + compile_info.option_count = 0; + compile_info.log_level = VKD3D_SHADER_LOG_INFO; + compile_info.source_name = filename; + + preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; + preprocess_info.next = NULL; + preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; + preprocess_info.macro_count = 0; + if (macros) + { + for (macro = macros; macro->Name; ++macro) + ++preprocess_info.macro_count; + } + preprocess_info.pfn_open_include = open_include; + preprocess_info.pfn_close_include = close_include; + preprocess_info.include_context = include; + + ret = vkd3d_shader_preprocess(&compile_info, &preprocessed_code, &messages); + if (messages) + { + if (messages_blob) + { + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) + { + vkd3d_shader_free_shader_code(&preprocessed_code); + return hr; + } + } + else + vkd3d_shader_free_messages(messages); + } + + if (!ret) + { + if (FAILED(hr = vkd3d_blob_create((void *)preprocessed_code.code, preprocessed_code.size, preprocessed_blob))) + { + vkd3d_shader_free_shader_code(&preprocessed_code); + return hr; + } + } + + return hresult_from_vkd3d_result(ret); +} + /* Events */ HANDLE vkd3d_create_event(void) {

1 0

Biswapriyo Nath : include: Set D3D_COMPILER_VERSION to 47, if not defined.
by Alexandre Julliard 29 Sep '20

29 Sep '20

Module: wine Branch: master Commit: 23c6dd55b8c983ec88cada0a6d6c75ee9cd93976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23c6dd55b8c983ec88cada0a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sun Sep 27 20:19:16 2020 +0530 include: Set D3D_COMPILER_VERSION to 47, if not defined. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11shader.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 501d01ee84..a744150814 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -21,6 +21,11 @@ #include "d3dcommon.h" +/* If not defined set d3dcompiler_47 by default. */ +#ifndef D3D_COMPILER_VERSION +#define D3D_COMPILER_VERSION 47 +#endif + /* These are defined as version-neutral in d3dcommon.h */ typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE;

1 0