March 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite/tests: Handle missing English font names.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: a8e29f0ed72d7feacbb6786f524a243eec571bc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e29f0ed72d7feacbb6786f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:48 2021 +0300 dwrite/tests: Handle missing English font names. Same as 0e4172a0c22a6f293cc3c5e1de265b2a5b480880 but for another test file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8fe59ca5a1e..39a11b8be9a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2179,8 +2179,8 @@ static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT3 hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(exists, "got %d\n", exists); - + if (!exists) + index = 0; hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); ok(hr == S_OK, "got 0x%08x\n", hr); }

1 0

Nikolay Sivov : dwrite: Check for vertical variants only when asked.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: f8e3cba7462eaa936a14add168ffe2fcb7d839ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8e3cba7462eaa936a14add1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:49 2021 +0300 dwrite: Check for vertical variants only when asked. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 13 +++++++------ dlls/dwrite/font.c | 4 +--- dlls/dwrite/opentype.c | 12 ++++++++++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4628a2a3704..27f4906a00d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -182,11 +182,12 @@ struct fontfacecached enum font_flags { - FONT_IS_SYMBOL = 1 << 0, - FONT_IS_MONOSPACED = 1 << 1, - FONT_IS_COLORED = 1 << 2, /* CPAL/COLR support */ - FONTFACE_HAS_KERNING_PAIRS = 1 << 3, - FONTFACE_HAS_VERTICAL_VARIANTS = 1 << 4 + FONT_IS_SYMBOL = 0x00000001, + FONT_IS_MONOSPACED = 0x00000002, + FONT_IS_COLORED = 0x00000004, /* CPAL/COLR support */ + FONTFACE_HAS_KERNING_PAIRS = 0x00000008, + FONTFACE_VERTICAL_VARIANTS = 0x00000010, + FONTFACE_NO_VERTICAL_VARIANTS = 0x00000020, }; struct dwrite_cmap; @@ -257,7 +258,7 @@ struct dwrite_fontface unsigned int ascent; unsigned int descent; } typo_metrics; - UINT32 flags; + unsigned int flags; struct dwrite_cmap cmap; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9386e9bec3f..5a96ccc71a0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1217,7 +1217,7 @@ static BOOL WINAPI dwritefontface1_HasVerticalGlyphVariants(IDWriteFontFace5 *if TRACE("%p.\n", iface); - return !!(fontface->flags & FONTFACE_HAS_VERTICAL_VARIANTS); + return opentype_has_vertical_variants(fontface); } static BOOL WINAPI dwritefontface2_IsColorFont(IDWriteFontFace5 *iface) @@ -5004,8 +5004,6 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li if (freetype_has_kerning_pairs(&fontface->IDWriteFontFace5_iface)) fontface->flags |= FONTFACE_HAS_KERNING_PAIRS; - if (opentype_has_vertical_variants(fontface)) - fontface->flags |= FONTFACE_HAS_VERTICAL_VARIANTS; fontface->glyph_image_formats = opentype_get_glyph_image_formats(&fontface->IDWriteFontFace5_iface); /* Font properties are reused from font object when 'normal' face creation path is used: diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 39943c52c9a..45967a12f0a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6342,6 +6342,9 @@ BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) struct lookups lookups = { 0 }; UINT16 format; + if (fontface->flags & (FONTFACE_VERTICAL_VARIANTS | FONTFACE_NO_VERTICAL_VARIANTS)) + return !!(fontface->flags & FONTFACE_VERTICAL_VARIANTS); + context.cache = fontface_get_shaping_cache(fontface); context.table = &context.cache->gsub; @@ -6384,7 +6387,12 @@ BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) heap_free(lookups.lookups); - return !!count; + if (count) + fontface->flags |= FONTFACE_VERTICAL_VARIANTS; + else + fontface->flags |= FONTFACE_NO_VERTICAL_VARIANTS; + + return !!(fontface->flags & FONTFACE_VERTICAL_VARIANTS); } HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, unsigned int glyph_count, @@ -6398,7 +6406,7 @@ HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, u memcpy(glyphs, nominal_glyphs, glyph_count * sizeof(*glyphs)); - if (!(fontface->flags & FONTFACE_HAS_VERTICAL_VARIANTS)) + if (!opentype_has_vertical_variants(fontface)) return S_OK; context.cache = fontface_get_shaping_cache(fontface);

1 0

Nikolay Sivov : dwrite: Read legacy kerning table directly.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 968a9e6b0cd5c2df4a522ba525b83d198b077bae URL: https://source.winehq.org/git/wine.git/?a=commit;h=968a9e6b0cd5c2df4a522ba5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:50 2021 +0300 dwrite: Read legacy kerning table directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 19 +++--- dlls/dwrite/font.c | 32 ++++------ dlls/dwrite/freetype.c | 41 ------------- dlls/dwrite/opentype.c | 143 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=968a9e6b0cd5c2df4a52…

1 0

Nikolay Sivov : dwrite: Remove unused type definitions.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 9ea34503012fe32c420f4f94b37a685d19632544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea34503012fe32c420f4f94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:51 2021 +0300 dwrite: Remove unused type definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 01bf1ce0a09..717b1ea0351 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -400,7 +400,7 @@ struct ot_script WORD default_langsys; WORD langsys_count; struct ot_langsys_record langsys[1]; -} OT_Script; +}; struct ot_script_record { @@ -802,25 +802,6 @@ struct ot_gpos_mark_to_mark_format1 WORD mark2_array; }; -typedef struct { - WORD SubstFormat; - WORD Coverage; - WORD DeltaGlyphID; -} GSUB_SingleSubstFormat1; - -typedef struct { - WORD SubstFormat; - WORD Coverage; - WORD GlyphCount; - WORD Substitute[1]; -} GSUB_SingleSubstFormat2; - -typedef struct { - WORD SubstFormat; - WORD ExtensionLookupType; - DWORD ExtensionOffset; -} GSUB_ExtensionPosFormat1; - struct kern_header { WORD version;

1 0

Huw Davies : winemac: Add discardEventsPassingTest to WineEventQueue's interface.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 7a68ae5951160c631bfcfc0b6a3acf76188b4c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a68ae5951160c631bfcfc0b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 10:42:02 2021 +0000 winemac: Add discardEventsPassingTest to WineEventQueue's interface. This is called from the status item implementation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_event.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 72ff8f9c6d4..1cc7e8ac4ba 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -53,6 +53,7 @@ enum { - (void) postEvent:(macdrv_event*)inEvent; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; + - (void) discardEventsPassingTest:(BOOL (^)(macdrv_event* event))block; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout flags:(NSUInteger)flags; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout;

1 0

Huw Davies : riched20/tests: Use the system locale to determine rtl and multibyte behaviour.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: dc85e70be0b141ff9ea1b01ee55acec3d11c54a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc85e70be0b141ff9ea1b01e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:45 2021 +0000 riched20/tests: Use the system locale to determine rtl and multibyte behaviour. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f6158d9a3d1..4c87869c4a3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -615,7 +615,7 @@ static void test_EM_POSFROMCHAR(void) "gg\n" "hh\n"; - rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + rtl = (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); @@ -771,7 +771,7 @@ static void test_EM_SETCHARFORMAT(void) BOOL rtl; DWORD expect_effects; - rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + rtl = (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); @@ -5609,7 +5609,7 @@ static void test_EM_FORMATRANGE(void) {"WINE\r\n\r\nwine\r\nwine", 5, 6} }; - skip_non_english = (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH); + skip_non_english = (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH); if (skip_non_english) skip("Skipping some tests on non-English platform\n"); @@ -8964,7 +8964,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); test_WM_CHAR(); test_EM_FINDTEXT(FALSE);

1 0

Georg Lehmann : winevulkan: Rework VkEnumValue creation.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 3a359feb85154c29df947efe798369c158854fb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a359feb85154c29df947efe… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 5 14:32:44 2021 +0100 winevulkan: Rework VkEnumValue creation. Makes future changes to VkEnumValue easier by deduplicating creation logic. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 49 +++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1243f211b5e..d3bf8906efc 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -357,9 +357,9 @@ class VkDefine(object): class VkEnum(object): - def __init__(self, name, values, alias=None): + def __init__(self, name, alias=None): self.name = name - self.values = values + self.values = [] if alias == None else alias.values self.required = False self.alias = alias self.aliased_by = [] @@ -367,7 +367,7 @@ class VkEnum(object): @staticmethod def from_alias(enum, alias): name = enum.attrib.get("name") - aliasee = VkEnum(name, alias.values, alias=alias) + aliasee = VkEnum(name, alias=alias) alias.add_aliased_by(aliasee) return aliasee @@ -375,34 +375,43 @@ class VkEnum(object): @staticmethod def from_xml(enum): name = enum.attrib.get("name") - values = [] + result = VkEnum(name) for v in enum.findall("enum"): + value_name = v.attrib.get("name") # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") alias_name = v.attrib.get("alias") if alias_name: - alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) + result.create_alias(value_name, alias_name) elif value: - # Some values are in hex form. We want to preserve the hex representation - # at least when we convert back to a string. Internally we want to use int. - if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) - else: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) + result.create_value(value_name, value) else: # bitmask - value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) + result.create_bitpos(value_name, int(v.attrib.get("bitpos"))) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect # the size definition. max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2', name).upper() + "_MAX_ENUM" - values.append(VkEnumValue(max_name, value=0x7fffffff, hex=True)) + result.create_value(max_name, "0x7fffffff") + + return result + + def create_alias(self, name, alias_name): + """ Create an aliased value for this enum """ + self.add(VkEnumValue(name, alias=alias_name)) + + def create_value(self, name, value): + """ Create a new value for this enum """ + # Some values are in hex form. We want to preserve the hex representation + # at least when we convert back to a string. Internally we want to use int. + hex = "0x" in value + self.add(VkEnumValue(name, value=int(value, 0), hex=hex)) - return VkEnum(name, values) + def create_bitpos(self, name, pos): + """ Create a new bitmask value for this enum """ + self.add(VkEnumValue(name, value=(1 << pos), hex=True)) def add(self, value): """ Add a value to enum. """ @@ -2874,7 +2883,7 @@ class VkRegistry(object): if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) + enum.create_bitpos(enum_elem.attrib["name"], int(enum_elem.attrib["bitpos"])) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part @@ -2891,12 +2900,12 @@ class VkRegistry(object): if direction is not None: value = -value - enum.add(VkEnumValue(enum_elem.attrib["name"], value=value)) + enum.create_value(enum_elem.attrib["name"], str(value)) elif "value" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]))) + enum.create_value(enum_elem.attrib["name"], enum_elem.attrib["value"]) elif "alias" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) + enum.create_alias(enum_elem.attrib["name"], enum_elem.attrib["alias"]) elif "value" in enum_elem.keys(): # Constants are not aliased, no need to add them here, they'll get added later on.

1 0

Georg Lehmann : winevulkan: Generate constants for 64bit flags.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: d49cbc7f148d4fdca5f96681e241c13a65c242b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d49cbc7f148d4fdca5f96681… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 5 14:32:45 2021 +0100 winevulkan: Generate constants for 64bit flags. Fixes one of the issue related to the changes for VK_KHR_synchronization2. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 55 ++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d3bf8906efc..1d739c12cae 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -357,8 +357,11 @@ class VkDefine(object): class VkEnum(object): - def __init__(self, name, alias=None): + def __init__(self, name, bitwidth, alias=None): + if not bitwidth in [32, 64]: + LOGGER.error("unknown bitwidth {0} for {1}".format(bitwidth, name)) self.name = name + self.bitwidth = bitwidth self.values = [] if alias == None else alias.values self.required = False self.alias = alias @@ -367,7 +370,7 @@ class VkEnum(object): @staticmethod def from_alias(enum, alias): name = enum.attrib.get("name") - aliasee = VkEnum(name, alias=alias) + aliasee = VkEnum(name, alias.bitwidth, alias=alias) alias.add_aliased_by(aliasee) return aliasee @@ -375,7 +378,8 @@ class VkEnum(object): @staticmethod def from_xml(enum): name = enum.attrib.get("name") - result = VkEnum(name) + bitwidth = int(enum.attrib.get("bitwidth", "32")) + result = VkEnum(name, bitwidth) for v in enum.findall("enum"): value_name = v.attrib.get("name") @@ -390,28 +394,29 @@ class VkEnum(object): # bitmask result.create_bitpos(value_name, int(v.attrib.get("bitpos"))) - # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, - # which is to prepare for extensions as they can add values and hence affect - # the size definition. - max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2', name).upper() + "_MAX_ENUM" - result.create_value(max_name, "0x7fffffff") + if bitwidth == 32: + # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, + # which is to prepare for extensions as they can add values and hence affect + # the size definition. + max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2', name).upper() + "_MAX_ENUM" + result.create_value(max_name, "0x7fffffff") return result def create_alias(self, name, alias_name): """ Create an aliased value for this enum """ - self.add(VkEnumValue(name, alias=alias_name)) + self.add(VkEnumValue(name, self.bitwidth, alias=alias_name)) def create_value(self, name, value): """ Create a new value for this enum """ # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. hex = "0x" in value - self.add(VkEnumValue(name, value=int(value, 0), hex=hex)) + self.add(VkEnumValue(name, self.bitwidth, value=int(value, 0), hex=hex)) def create_bitpos(self, name, pos): """ Create a new bitmask value for this enum """ - self.add(VkEnumValue(name, value=(1 << pos), hex=True)) + self.add(VkEnumValue(name, self.bitwidth, value=(1 << pos), hex=True)) def add(self, value): """ Add a value to enum. """ @@ -432,13 +437,20 @@ class VkEnum(object): if self.is_alias(): return "" - text = "typedef enum {0}\n{{\n".format(self.name) + default_value = 0x7ffffffe if self.bitwidth == 32 else 0xfffffffffffffffe # Print values sorted, values can have been added in a random order. - values = sorted(self.values, key=lambda value: value.value if value.value is not None else 0x7ffffffe) - for value in values: - text += " {0},\n".format(value.definition()) - text += "}} {0};\n".format(self.name) + values = sorted(self.values, key=lambda value: value.value if value.value is not None else default_value) + + if self.bitwidth == 32: + text = "typedef enum {0}\n{{\n".format(self.name) + for value in values: + text += " {0},\n".format(value.definition()) + text += "}} {0};\n".format(self.name) + elif self.bitwidth == 64: + text = "typedef VkFlags64 {0};\n\n".format(self.name) + for value in values: + text += "static const {0} {1};\n".format(self.name, value.definition()) for aliasee in self.aliased_by: text += "typedef {0} {1};\n".format(self.name, aliasee.name) @@ -454,28 +466,31 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value=None, hex=False, alias=None): + def __init__(self, name, bitwidth, value=None, hex=False, alias=None): self.name = name + self.bitwidth = bitwidth self.value = value self.hex = hex self.alias = alias def __repr__(self): + postfix = "ull" if self.bitwidth == 64 else "" if self.is_alias(): return "{0}={1}".format(self.name, self.alias) - return "{0}={1}".format(self.name, self.value) + return "{0}={1}{2}".format(self.name, self.value, postfix) def definition(self): """ Convert to text definition e.g. VK_FOO = 1 """ + postfix = "ull" if self.bitwidth == 64 else "" if self.is_alias(): return "{0} = {1}".format(self.name, self.alias) # Hex is commonly used for FlagBits and sometimes within # a non-FlagBits enum for a bitmask value as well. if self.hex: - return "{0} = 0x{1:08x}".format(self.name, self.value) + return "{0} = 0x{1:08x}{2}".format(self.name, self.value, postfix) else: - return "{0} = {1}".format(self.name, self.value) + return "{0} = {1}{2}".format(self.name, self.value, postfix) def is_alias(self): return self.alias is not None

1 0

Matteo Bruni : wined3d: Correctly handle modifiers on instructions with multiple destination registers.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 65b3279baed3db067f2d750af97160c787f00d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=65b3279baed3db067f2d750a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 5 17:06:22 2021 +0100 wined3d: Correctly handle modifiers on instructions with multiple destination registers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 108 ++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65b3279baed3db067f2d…

1 0

Matteo Bruni : wined3d: Disable WINED3DFMT_D16_LOCKABLE on backbuffer ORM.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: d06cdcd646450e91c36661726048f408cfb99bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d06cdcd646450e91c3666172… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 5 17:06:23 2021 +0100 wined3d: Disable WINED3DFMT_D16_LOCKABLE on backbuffer ORM. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 233cd49209f..11df11fbcd9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3134,6 +3134,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) continue; + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && format->f.id == WINED3DFMT_D16_LOCKABLE) + continue; + format->internal = format_texture_info[i].gl_internal; format->srgb_internal = format_texture_info[i].gl_srgb_internal; format->rt_internal = format_texture_info[i].gl_rt_internal;

1 0