April 2019 - Wine-devel - list.winehq.org

[PATCH v4 1/3] wrc: Support Asturian
by Alex Henrie 02 May '19

02 May '19

From: Enol Puente <enolp(a)softastur.org> Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winnt.rh | 1 + tools/wmc/po.c | 2 ++ tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 4 files changed, 6 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 8a8064a25f..bf10c50c63 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -82,6 +82,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" }, diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 913a918a69..3f5affd49f 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5533a531f1..a1e07b85b2 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -457,6 +457,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 }, -- 2.21.0

2 5

[PATCH vkd3d 3/6] vkd3d-shader: Use more appropriate variables for descriptor range count.
by Józef Kucia 02 May '19

02 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Helps Clang Static Analyzer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7336a7a3f4c6..520e20811cfc 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3080,7 +3080,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, } p->u.descriptor_table.descriptor_ranges = ranges; ranges1 = p1->u.descriptor_table.descriptor_ranges; - for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) + for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) { ranges[j].range_type = ranges1[j].range_type; ranges[j].descriptor_count = ranges1[j].descriptor_count; @@ -3199,7 +3199,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, } p1->u.descriptor_table.descriptor_ranges = ranges1; ranges = p->u.descriptor_table.descriptor_ranges; - for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) + for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) { ranges1[j].range_type = ranges[j].range_type; ranges1[j].descriptor_count = ranges[j].descriptor_count; -- 2.21.0

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Use locale-insensitive string comparison.
by Józef Kucia 02 May '19

02 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_common.h | 23 +++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- tests/vkd3d_shader_api.c | 6 +++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 1129f1e3001a..244209243594 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,6 +88,29 @@ static inline unsigned int vkd3d_log2i(unsigned int x) #endif } +static inline int ascii_isupper(int c) +{ + return 'A' <= c && c <= 'Z'; +} + +static inline int ascii_tolower(int c) +{ + return ascii_isupper(c) ? c - 'A' + 'a' : c; +} + +static inline int ascii_strcasecmp(const char *a, const char *b) +{ + int c_a, c_b; + + do + { + c_a = ascii_tolower(*a++); + c_b = ascii_tolower(*b++); + } while (c_a == c_b && c_a != '\0'); + + return c_a - c_b; +} + #ifndef _WIN32 # if HAVE_SYNC_ADD_AND_FETCH static inline LONG InterlockedIncrement(LONG volatile *x) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ad927b2538f4..dc51644db1d0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3709,7 +3709,7 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_transform_feedback_element *e = &xfb_info->elements[i]; if (e->stream_index == signature_element->stream_index - && !strcasecmp(e->semantic_name, signature_element->semantic_name) + && !ascii_strcasecmp(e->semantic_name, signature_element->semantic_name) && e->semantic_index == signature_element->semantic_index) { xfb_element = e; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 9848202a0c72..aa486cca609a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -401,7 +401,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( e = signature->elements; for (i = 0; i < signature->element_count; ++i) { - if (!strcasecmp(e[i].semantic_name, semantic_name) + if (!ascii_strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_index == semantic_index && e[i].stream_index == stream_index) return &e[i]; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 41067c063312..f9bec7e41a37 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -19,6 +19,8 @@ #include "vkd3d_test.h" #include <vkd3d_shader.h> +#include <locale.h> + static void test_invalid_shaders(void) { struct vkd3d_shader_code spirv; @@ -112,7 +114,7 @@ static void test_vkd3d_shader_pfns(void) rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - element = pfn_vkd3d_shader_find_signature_element(&signature, "POSITION", 0, 0); + element = pfn_vkd3d_shader_find_signature_element(&signature, "position", 0, 0); ok(element, "Could not find shader signature element.\n"); pfn_vkd3d_shader_free_shader_signature(&signature); @@ -128,6 +130,8 @@ static void test_vkd3d_shader_pfns(void) START_TEST(vkd3d_shader_api) { + setlocale(LC_ALL, ""); + run_test(test_invalid_shaders); run_test(test_vkd3d_shader_pfns); } -- 2.21.0

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Improve asserts for write mask component count.
by Józef Kucia 02 May '19

02 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Helps Clang Static Analyzer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 73ba93fe0133..54d070504d60 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -883,13 +883,14 @@ static inline unsigned int vkd3d_write_mask_get_component_idx(DWORD write_mask) static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) { - assert(write_mask); - return vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); + unsigned int count = vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); + assert(1 <= count && count <= VKD3D_VEC4_SIZE); + return count; } static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int component_count) { - assert(component_count <= 4); + assert(component_count <= VKD3D_VEC4_SIZE); return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } -- 2.21.0

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Remove dead assignment.
by Józef Kucia 02 May '19

02 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d0304e085eb6..ad927b2538f4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3822,7 +3822,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi write_mask = signature_element->mask & 0xff; - component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); if (builtin) { -- 2.21.0

2 1

[PATCH vkd3d 1/6] vkd3d: Trace returned features.
by Józef Kucia 02 May '19

02 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5364df28bbc9..064557982107 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2129,6 +2129,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * *data = device->feature_options; + TRACE("Double precision shader ops %#x.\n", data->DoublePrecisionFloatShaderOps); + TRACE("Output merger logic op %#x.\n", data->OutputMergerLogicOp); + TRACE("Shader min precision support %#x.\n", data->MinPrecisionSupport); + TRACE("Tiled resources tier %#x.\n", data->TiledResourcesTier); + TRACE("Resource binding tier %#x.\n", data->ResourceBindingTier); + TRACE("PS specified stencil ref %#x.\n", data->PSSpecifiedStencilRefSupported); + TRACE("Typed UAV load and additional formats %#x.\n", data->TypedUAVLoadAdditionalFormats); + TRACE("ROV %#x.\n", data->ROVsSupported); + TRACE("Conservative rasterization tier %#x.\n", data->ConservativeRasterizationTier); + TRACE("Max GPU virtual address bits per resource %u.\n", data->MaxGPUVirtualAddressBitsPerResource); + TRACE("Standard swizzle 64KB %#x.\n", data->StandardSwizzle64KBSupported); + TRACE("Cross-node sharing tier %#x.\n", data->CrossNodeSharingTier); + TRACE("Cross-adapter row-major texture %#x.\n", data->CrossAdapterRowMajorTextureSupported); + TRACE("VP and RT array index from any shader without GS emulation %#x.\n", + data->VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation); + TRACE("Resource heap tier %#x.\n", data->ResourceHeapTier); return S_OK; } @@ -2148,7 +2164,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - FIXME("Assuming device does not support tile based rendering.\n"); + WARN("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; data->UMA = TRUE; @@ -2160,7 +2176,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) data->CacheCoherentUMA = FALSE; } - TRACE("UMA: %#x CacheCoherentUMA: %#x.\n", data->UMA, data->CacheCoherentUMA); + + TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x.\n", + data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA); return S_OK; } @@ -2185,6 +2203,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * if (data->MaxSupportedFeatureLevel < fl && fl <= vulkan_info->max_feature_level) data->MaxSupportedFeatureLevel = fl; } + + TRACE("Max supported feature level %#x.\n", data->MaxSupportedFeatureLevel); return S_OK; } @@ -2258,6 +2278,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * vkd3d_restrict_format_support_for_feature_level(data); + TRACE("Format %#x, support1 %#x, support2 %#x.\n", data->Format, data->Support1, data->Support2); return S_OK; } @@ -2287,6 +2308,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * data->MaxGPUVirtualAddressBitsPerResource = options->MaxGPUVirtualAddressBitsPerResource; data->MaxGPUVirtualAddressBitsPerProcess = options->MaxGPUVirtualAddressBitsPerResource; + + TRACE("Max GPU virtual address bits per resource %u, Max GPU virtual address bits per process %u.\n", + data->MaxGPUVirtualAddressBitsPerResource, data->MaxGPUVirtualAddressBitsPerProcess); return S_OK; } @@ -2303,6 +2327,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * TRACE("Request shader model %#x.\n", data->HighestShaderModel); data->HighestShaderModel = D3D_SHADER_MODEL_5_1; + + TRACE("Shader model %#x.\n", data->HighestShaderModel); return S_OK; } @@ -2318,6 +2344,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * FIXME("Root signature version 1_1 not supported yet.\n"); data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + + TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; } -- 2.21.0

2 1

[PATCH vkd3d 6/6] vkd3d: Enable Vulkan debug extensions independently of debug log level.
by Józef Kucia 02 May '19

02 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_debug.h | 10 ++++++ libs/vkd3d-common/debug.c | 39 +++++++++++++++++++++++ libs/vkd3d/device.c | 58 +++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 7 +++++ 4 files changed, 97 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 418e2c4539de..7642dec5a15a 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -22,6 +22,7 @@ #include "vkd3d_common.h" #include <stdarg.h> +#include <stdint.h> #ifdef VKD3D_NO_TRACE_MESSAGES #define TRACE(args...) do { } while (0) @@ -90,4 +91,13 @@ static inline const char *debugstr_guid(const GUID *guid) unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; +struct vkd3d_debug_option +{ + const char *name; + uint64_t flag; +}; + +uint64_t vkd3d_parse_debug_options(const char *string, + const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; + #endif /* __VKD3D_DEBUG_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 6b9662bbbd19..9a27c22eda5d 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -25,6 +25,7 @@ #include <limits.h> #include <stdio.h> #include <stdlib.h> +#include <stdbool.h> #include <string.h> #define VKD3D_DEBUG_BUFFER_COUNT 64 @@ -316,3 +317,41 @@ unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) return default_value; } + +static bool is_option_separator(char c) +{ + return c == ',' || c == ';' || c == '\0'; +} + +uint64_t vkd3d_parse_debug_options(const char *string, + const struct vkd3d_debug_option *options, unsigned int option_count) +{ + char prev_char, next_char; + uint64_t flags = 0; + unsigned int i; + const char *p; + + for (i = 0; i < option_count; ++i) + { + const struct vkd3d_debug_option *opt = &options[i]; + + p = string; + while (p) + { + if ((p = strstr(p, opt->name))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(opt->name); + next_char = *p; + + if (is_option_separator(prev_char) && is_option_separator(next_char)) + { + flags |= opt->flag; + break; + } + } + } + } + + return flags; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 064557982107..052d4f6f8fdd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -172,25 +172,19 @@ static bool is_extension_disabled(const char *extension_name) } static bool has_extension(const VkExtensionProperties *extensions, - unsigned int count, const char *extension_name, bool is_debug_only) + unsigned int count, const char *extension_name) { unsigned int i; for (i = 0; i < count; ++i) { - if (strcmp(extensions[i].extensionName, extension_name)) - continue; if (is_extension_disabled(extension_name)) { WARN("Extension %s is disabled.\n", debugstr_a(extension_name)); continue; } - if (is_debug_only && vkd3d_dbg_get_level() < VKD3D_DBG_LEVEL_WARN) - { - TRACE("Skipping debug-only extension %s.\n", debugstr_a(extension_name)); - continue; - } - return true; + if (!strcmp(extensions[i].extensionName, extension_name)) + return true; } return false; } @@ -200,14 +194,15 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, const char * const *user_extensions, unsigned int user_extension_count, const char * const *optional_user_extensions, unsigned int optional_user_extension_count, - bool *user_extension_supported, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type) + bool *user_extension_supported, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type, + bool is_debug_enabled) { unsigned int extension_count = 0; unsigned int i; for (i = 0; i < required_extension_count; ++i) { - if (!has_extension(extensions, count, required_extensions[i], false)) + if (!has_extension(extensions, count, required_extensions[i])) ERR("Required %s extension %s is not supported.\n", extension_type, debugstr_a(required_extensions[i])); ++extension_count; @@ -217,10 +212,16 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio { const char *extension_name = optional_extensions[i].extension_name; ptrdiff_t offset = optional_extensions[i].vulkan_info_offset; - bool is_debug_only = optional_extensions[i].is_debug_only; bool *supported = (void *)((uintptr_t)vulkan_info + offset); - if ((*supported = has_extension(extensions, count, extension_name, is_debug_only))) + if (!is_debug_enabled && optional_extensions[i].is_debug_only) + { + *supported = false; + TRACE("Skipping debug-only extension %s.\n", debugstr_a(extension_name)); + continue; + } + + if ((*supported = has_extension(extensions, count, extension_name))) { TRACE("Found %s extension.\n", debugstr_a(extension_name)); ++extension_count; @@ -229,7 +230,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio for (i = 0; i < user_extension_count; ++i) { - if (!has_extension(extensions, count, user_extensions[i], false)) + if (!has_extension(extensions, count, user_extensions[i])) ERR("Required user %s extension %s is not supported.\n", extension_type, debugstr_a(user_extensions[i])); ++extension_count; @@ -238,7 +239,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio assert(!optional_user_extension_count || user_extension_supported); for (i = 0; i < optional_user_extension_count; ++i) { - if (has_extension(extensions, count, optional_user_extensions[i], false)) + if (has_extension(extensions, count, optional_user_extensions[i])) { user_extension_supported[i] = true; ++extension_count; @@ -360,7 +361,8 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, create_info->instance_extensions, create_info->instance_extension_count, optional_extensions ? optional_extensions->extensions : NULL, optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "instance"); + *user_extension_supported, vulkan_info, "instance", + instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); vkd3d_free(vk_extensions); return S_OK; @@ -433,6 +435,25 @@ static void vkd3d_init_debug_report(struct vkd3d_instance *instance) instance->vk_debug_callback = callback; } +static const struct vkd3d_debug_option vkd3d_config_options[] = +{ + {"vk_debug", VKD3D_CONFIG_FLAG_VULKAN_DEBUG}, /* enable Vulkan debug extensions */ +}; + +static uint64_t vkd3d_init_config_flags(void) +{ + uint64_t config_flags; + const char *config; + + config = getenv("VKD3D_CONFIG"); + config_flags = vkd3d_parse_debug_options(config, vkd3d_config_options, ARRAY_SIZE(vkd3d_config_options)); + + if (config_flags) + TRACE("VKD3D_CONFIG='%s'.\n", config); + + return config_flags; +} + static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { @@ -470,6 +491,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance->join_thread = create_info->pfn_join_thread; instance->wchar_size = create_info->wchar_size; + instance->config_flags = vkd3d_init_config_flags(); + if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) { ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); @@ -1250,7 +1273,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, create_info->device_extensions, create_info->device_extension_count, optional_extensions ? optional_extensions->extensions : NULL, optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "device"); + *user_extension_supported, vulkan_info, "device", + device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); depth_clip_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); if (depth_clip_features) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index be82851a0788..b33318264891 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -113,6 +113,11 @@ struct vkd3d_vulkan_info D3D_FEATURE_LEVEL max_feature_level; }; +enum vkd3d_config_flags +{ + VKD3D_CONFIG_FLAG_VULKAN_DEBUG = 0x00000001, +}; + struct vkd3d_instance { VkInstance vk_instance; @@ -127,6 +132,8 @@ struct vkd3d_instance struct vkd3d_vk_global_procs vk_global_procs; void *libvulkan; + uint64_t config_flags; + VkDebugReportCallbackEXT vk_debug_callback; LONG refcount; -- 2.21.0

3 2

[PATCH] include: Add dxva.h header file.
by Vijay Kiran Kamuju 01 May '19

01 May '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/Makefile.in | 1 + include/dxva.h | 215 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 include/dxva.h diff --git a/include/Makefile.in b/include/Makefile.in index 09c84d8254d..e9d7cc44ca8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -251,6 +251,7 @@ SOURCES = \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ + dxva.h \ dxva2api.idl \ dyngraph.idl \ endpointvolume.idl \ diff --git a/include/dxva.h b/include/dxva.h new file mode 100644 index 00000000000..e311488775a --- /dev/null +++ b/include/dxva.h @@ -0,0 +1,215 @@ +/* + * Copyright 2015 Michael Müller for Pipelight + * + * 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 + */ + +#ifndef __WINE_DXVA_H +#define __WINE_DXVA_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define DXVA_USUAL_BLOCK_WIDTH 8 +#define DXVA_USUAL_BLOCK_HEIGHT 8 +#define DXVA_USUAL_BLOCK_SIZE (DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT) + +#include <pshpack1.h> + +typedef struct _DXVA_PictureParameters +{ + WORD wDecodedPictureIndex; + WORD wDeblockedPictureIndex; + WORD wForwardRefPictureIndex; + WORD wBackwardRefPictureIndex; + WORD wPicWidthInMBminus1; + WORD wPicHeightInMBminus1; + BYTE bMacroblockWidthMinus1; + BYTE bMacroblockHeightMinus1; + BYTE bBlockWidthMinus1; + BYTE bBlockHeightMinus1; + BYTE bBPPminus1; + BYTE bPicStructure; + BYTE bSecondField; + BYTE bPicIntra; + BYTE bPicBackwardPrediction; + BYTE bBidirectionalAveragingMode; + BYTE bMVprecisionAndChromaRelation; + BYTE bChromaFormat; + BYTE bPicScanFixed; + BYTE bPicScanMethod; + BYTE bPicReadbackRequests; + BYTE bRcontrol; + BYTE bPicSpatialResid8; + BYTE bPicOverflowBlocks; + BYTE bPicExtrapolation; + BYTE bPicDeblocked; + BYTE bPicDeblockConfined; + BYTE bPic4MVallowed; + BYTE bPicOBMC; + BYTE bPicBinPB; + BYTE bMV_RPS; + BYTE bReservedBits; + WORD wBitstreamFcodes; + WORD wBitstreamPCEelements; + BYTE bBitstreamConcealmentNeed; + BYTE bBitstreamConcealmentMethod; +} DXVA_PictureParameters, *LPDXVA_PictureParameters; + +typedef struct _DXVA_SliceInfo +{ + WORD wHorizontalPosition; + WORD wVerticalPosition; + DWORD dwSliceBitsInBuffer; + DWORD dwSliceDataLocation; + BYTE bStartCodeBitOffset; + BYTE bReservedBits; + WORD wMBbitOffset; + WORD wNumberMBsInSlice; + WORD wQuantizerScaleCode; + WORD wBadSliceChopping; +} DXVA_SliceInfo, *LPDXVA_SliceInfo; + +typedef struct _DXVA_QmatrixData +{ + BYTE bNewQmatrix[4]; + WORD Qmatrix[4][DXVA_USUAL_BLOCK_WIDTH * DXVA_USUAL_BLOCK_HEIGHT]; +} DXVA_QmatrixData, *LPDXVA_QmatrixData; + +typedef struct +{ + union + { + struct + { + UCHAR Index7Bits : 7; + UCHAR AssociatedFlag : 1; + }; + UCHAR bPicEntry; + }; +} DXVA_PicEntry_H264; + +typedef struct +{ + USHORT wFrameWidthInMbsMinus1; + USHORT wFrameHeightInMbsMinus1; + DXVA_PicEntry_H264 CurrPic; + UCHAR num_ref_frames; + union + { + struct + { + USHORT field_pic_flag : 1; + USHORT MbaffFrameFlag : 1; + USHORT residual_colour_transform_flag : 1; + USHORT sp_for_switch_flag : 1; + USHORT chroma_format_idc : 2; + USHORT RefPicFlag : 1; + USHORT constrained_intra_pred_flag : 1; + USHORT weighted_pred_flag : 1; + USHORT weighted_bipred_idc : 2; + USHORT MbsConsecutiveFlag : 1; + USHORT frame_mbs_only_flag : 1; + USHORT transform_8x8_mode_flag : 1; + USHORT MinLumaBipredSize8x8Flag : 1; + USHORT IntraPicFlag : 1; + }; + USHORT wBitFields; + }; + UCHAR bit_depth_luma_minus8; + UCHAR bit_depth_chroma_minus8; + USHORT Reserved16Bits; + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_H264 RefFrameList[16]; + INT CurrFieldOrderCnt[2]; + INT FieldOrderCntList[16][2]; + CHAR pic_init_qs_minus26; + CHAR chroma_qp_index_offset; + CHAR second_chroma_qp_index_offset; + UCHAR ContinuationFlag; + CHAR pic_init_qp_minus26; + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + UCHAR Reserved8BitsA; + USHORT FrameNumList[16]; + + UINT UsedForReferenceFlags; + USHORT NonExistingFrameFlags; + USHORT frame_num; + UCHAR log2_max_frame_num_minus4; + UCHAR pic_order_cnt_type; + UCHAR log2_max_pic_order_cnt_lsb_minus4; + UCHAR delta_pic_order_always_zero_flag; + UCHAR direct_8x8_inference_flag; + UCHAR entropy_coding_mode_flag; + UCHAR pic_order_present_flag; + UCHAR num_slice_groups_minus1; + UCHAR slice_group_map_type; + UCHAR deblocking_filter_control_present_flag; + UCHAR redundant_pic_cnt_present_flag; + UCHAR Reserved8BitsB; + USHORT slice_group_change_rate_minus1; + UCHAR SliceGroupMap[810]; +} DXVA_PicParams_H264; + +typedef struct +{ + UCHAR bScalingLists4x4[6][16]; + UCHAR bScalingLists8x8[2][64]; +} DXVA_Qmatrix_H264; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; + USHORT first_mb_in_slice; + USHORT NumMbsForSlice; + USHORT BitOffsetToSliceData; + UCHAR slice_type; + UCHAR luma_log2_weight_denom; + UCHAR chroma_log2_weight_denom; + + UCHAR num_ref_idx_l0_active_minus1; + UCHAR num_ref_idx_l1_active_minus1; + CHAR slice_alpha_c0_offset_div2; + CHAR slice_beta_offset_div2; + UCHAR Reserved8Bits; + DXVA_PicEntry_H264 RefPicList[2][32]; + SHORT Weights[2][32][3][2]; + CHAR slice_qs_delta; + CHAR slice_qp_delta; + UCHAR redundant_pic_cnt; + UCHAR direct_spatial_mv_pred_flag; + UCHAR cabac_init_idc; + UCHAR disable_deblocking_filter_idc; + USHORT slice_id; +} DXVA_Slice_H264_Long; + +typedef struct +{ + UINT BSNALunitDataLocation; + UINT SliceBytesInBuffer; + USHORT wBadSliceChopping; +} DXVA_Slice_H264_Short; + +#include <poppack.h> + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_DXVA_H */ -- 2.17.0

2 1

Tahoma bold font issue
by Alistair Leslie-Hughes 01 May '19

01 May '19

I'm having an issue with the Tahoma bold font which happens to be issue https://bugs.winehq.org/show_bug.cgi?id=26037 Using tahomabd.sfd/ttf from the reactos project makes the font bold once again. I don't have enough knowledge in this area to validate that it's not going to break something else or that wine has newer changes than the one in reactos. How could we get this into wine? Any advise on how to get the Tahoma font updated would be great. Regards Alistair.

1 0

[PATCH 4/4] ntoskrnl.exe: Support NULL offset in IoBuildSynchronousFsdRequest.
by Jacek Caban 30 Apr '19

30 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1