- Wine-Commits - list.winehq.org

Stefan Dösinger : vkd3d: Add ID3D12Device9 interface stubs.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: d5c89051ddb1e0a4588e441aab31c02dec505b2a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5c89051ddb1e0a4588e441aab31c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 3 14:18:40 2024 +0300 vkd3d: Add ID3D12Device9 interface stubs. --- libs/vkd3d/device.c | 293 +++++++++++++++++++++++++-------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +- 4 files changed, 172 insertions(+), 139 deletions(-)

1 0

Zhiyi Zhang : gdiplus: Search microsoft platform names first in load_ttf_name_id().
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 9786ee25554fa9b3d32488685a9751676d0269db URL: https://gitlab.winehq.org/wine/wine/-/commit/9786ee25554fa9b3d32488685a9751… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 28 17:00:39 2024 +0800 gdiplus: Search microsoft platform names first in load_ttf_name_id(). Search names in fonts in the order of Microsoft, Mac and finally Unicode platform. This is also the order win32u uses to load font names. Fix Granado Espada Japan (1219160) launcher crashes at start in the Japanese locale. The game ships a font with a broken name record of Mac platform and encoding ID 0 (Roman) but the name string is in code page 10001 (Japanese). This broken name record is placed before the name records for the Microsoft platform so it gets selected first. Then the name string in the name record doesn't get converted correctly to Unicode because of the wrong code page. Thus the EnumFontFamiliesExW() in GdipPrivateAddMemoryFont() fails to find the font and causes game crash. --- dlls/gdiplus/font.c | 38 +++++++++++++++++++++++--------------- dlls/gdiplus/tests/font.c | 1 - 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index da37279fbef..67d75ed97f6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1385,12 +1385,13 @@ static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *da static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) { + static const WORD platform_id_table[] = {TT_PLATFORM_MICROSOFT, TT_PLATFORM_MACINTOSH, TT_PLATFORM_APPLE_UNICODE}; LANGID lang = GetSystemDefaultLangID(); const tt_header *header; const tt_name_table *name_table; - const tt_name_record *name_record; + const tt_name_record *name_record_table, *name_record; DWORD pos, ofs = 0, count; - int i, res, best_lang = 0, best_index = -1; + int i, j, res, best_lang = 0, best_index = -1; if (sizeof(tt_header) > size) return NULL; @@ -1421,26 +1422,33 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) if (pos > size) return NULL; name_table = (const tt_name_table*)&mem[ofs]; + name_record_table = (const tt_name_record *)&mem[pos]; count = GET_BE_WORD(name_table->count); if (GET_BE_WORD(name_table->string_offset) >= size - ofs) return NULL; ofs += GET_BE_WORD(name_table->string_offset); - for (i=0; i<count; i++) + for (i = 0; i < ARRAY_SIZE(platform_id_table); i++) { - name_record = (const tt_name_record*)&mem[pos]; - pos += sizeof(*name_record); - if (pos > size) - return NULL; + for (j = 0; j < count; j++) + { + name_record = name_record_table + j; + if ((const BYTE *)name_record - mem > size) + return NULL; - if (GET_BE_WORD(name_record->name_id) != id) continue; - if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL; - if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL; + if (GET_BE_WORD(name_record->platform_id) != platform_id_table[i]) continue; + if (GET_BE_WORD(name_record->name_id) != id) continue; + if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL; + if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL; - res = match_name_table_language( name_record, lang ); - if (res > best_lang) - { - best_lang = res; - best_index = i; + res = match_name_table_language(name_record, lang); + if (res > best_lang) + { + best_lang = res; + best_index = j; + } } + + if (best_index != -1) + break; } if (best_lang) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 6a21ea30361..1bbb18f4c6d 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1558,7 +1558,6 @@ static void test_GdipPrivateAddMemoryFont(void) { stat = GdipGetFontCollectionFamilyCount(fonts, &count); ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed, error %d\n", stat); - todo_wine ok(count == 1, "Expected count 1, got %d\n", count); } else if (i == 1 && stat == FileNotFound)

1 0

Zhiyi Zhang : gdiplus/tests: Add tests for GdipPrivateAddMemoryFont().
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 242ee3d0133704313473476782ade8a8704fc12a URL: https://gitlab.winehq.org/wine/wine/-/commit/242ee3d0133704313473476782ade8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 29 11:46:14 2024 +0800 gdiplus/tests: Add tests for GdipPrivateAddMemoryFont(). --- dlls/gdiplus/tests/font.c | 64 ++++++++-- dlls/gdiplus/tests/resource.rc | 8 ++ dlls/gdiplus/tests/wine_mac_win.ttf | Bin 0 -> 1140 bytes dlls/gdiplus/tests/wine_mac_win.ttx | 203 ++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/wine_unicode_mac.ttf | Bin 0 -> 1168 bytes dlls/gdiplus/tests/wine_unicode_mac.ttx | 203 ++++++++++++++++++++++++++++++++ 6 files changed, 471 insertions(+), 7 deletions(-)

1 0

Zebediah Figura : wined3d: Require ARB_texture_non_power_of_two.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 95633ebbd17e3052d4e4522ac4b14dd37b73d7ea URL: https://gitlab.winehq.org/wine/wine/-/commit/95633ebbd17e3052d4e4522ac4b14d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 18 14:35:50 2024 -0500 wined3d: Require ARB_texture_non_power_of_two. Also allowing r500's "normalized texrect" functionality. Keeping WINED3D_GL_NORMALIZED_TEXRECT is far less invasive and painful than the rest of the NP2 fixup code. --- dlls/wined3d/adapter_gl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2486686640f..bc9da1f0881 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5330,6 +5330,13 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, } } + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + { + ERR("Required extension ARB_texture_non_power_of_two is not supported.\n"); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); + return FALSE; + } + if (gl_info->glsl_version <= MAKEDWORD_VERSION(1, 20)) { ERR("GLSL version %s is too low; 1.20 is required.\n",

1 0

Alistair Leslie-Hughes : include: Add more DBCOLUMN_ defines.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: 74a32e2b43b42321d6f05492c4cf64029df106d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/74a32e2b43b42321d6f05492c4cf64… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 24 15:48:36 2023 +1100 include: Add more DBCOLUMN_ defines. --- include/dbs.idl | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index f72204b1e90..34e58e5a5d0 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -542,10 +542,38 @@ cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") -cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") +cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") +cpp_quote("DEFINE_DBID(DBCOLUMN_IDNAME, DBCIDGUID, DBKIND_GUID_PROPID, 2);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NAME, DBCIDGUID, DBKIND_GUID_PROPID, 3);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NUMBER, DBCIDGUID, DBKIND_GUID_PROPID, 4);") +cpp_quote("DEFINE_DBID(DBCOLUMN_TYPE, DBCIDGUID, DBKIND_GUID_PROPID, 5);") +cpp_quote("DEFINE_DBID(DBCOLUMN_PRECISION, DBCIDGUID, DBKIND_GUID_PROPID, 7);") +cpp_quote("DEFINE_DBID(DBCOLUMN_SCALE, DBCIDGUID, DBKIND_GUID_PROPID, 8);") +cpp_quote("DEFINE_DBID(DBCOLUMN_FLAGS, DBCIDGUID, DBKIND_GUID_PROPID, 9);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COLLATINGSEQUENCE, DBCIDGUID, DBKIND_GUID_PROPID, 12);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COMPUTEMODE, DBCIDGUID, DBKIND_GUID_PROPID, 13);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DEFAULTVALUE, DBCIDGUID, DBKIND_GUID_PROPID, 14);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINNAME, DBCIDGUID, DBKIND_GUID_PROPID, 15);") +cpp_quote("DEFINE_DBID(DBCOLUMN_HASDEFAULT, DBCIDGUID, DBKIND_GUID_PROPID, 16);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISAUTOINCREMENT, DBCIDGUID, DBKIND_GUID_PROPID, 17);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISCASESENSITIVE, DBCIDGUID, DBKIND_GUID_PROPID, 18);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISSEARCHABLE, DBCIDGUID, DBKIND_GUID_PROPID, 20);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISUNIQUE, DBCIDGUID, DBKIND_GUID_PROPID, 21);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECATALOGNAME, DBCIDGUID, DBKIND_GUID_PROPID, 23);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASESCHEMANAME, DBCIDGUID, DBKIND_GUID_PROPID, 24);") +cpp_quote("DEFINE_DBID(DBCOLUMN_GUID, DBCIDGUID, DBKIND_GUID_PROPID, 29);") +cpp_quote("DEFINE_DBID(DBCOLUMN_PROPID, DBCIDGUID, DBKIND_GUID_PROPID, 30);") +cpp_quote("DEFINE_DBID(DBCOLUMN_TYPEINFO, DBCIDGUID, DBKIND_GUID_PROPID, 31);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINCATALOG, DBCIDGUID, DBKIND_GUID_PROPID, 32);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINSCHEMA, DBCIDGUID, DBKIND_GUID_PROPID, 33);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DATETIMEPRECISION, DBCIDGUID, DBKIND_GUID_PROPID, 34);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NUMERICPRECISIONRADIX, DBCIDGUID, DBKIND_GUID_PROPID, 35);") +cpp_quote("DEFINE_DBID(DBCOLUMN_OCTETLENGTH, DBCIDGUID, DBKIND_GUID_PROPID, 36);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COLUMNSIZE, DBCIDGUID, DBKIND_GUID_PROPID, 37);") +cpp_quote("DEFINE_DBID(DBCOLUMN_CLSID, DBCIDGUID, DBKIND_GUID_PROPID, 38);") +cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02")

1 0

Alistair Leslie-Hughes : include: Add some DWMWA_* enum values.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: e08fbd2743196835ab76fb35416b7da2c5981c2d URL: https://gitlab.winehq.org/wine/wine/-/commit/e08fbd2743196835ab76fb35416b7d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 4 14:19:57 2024 +1100 include: Add some DWMWA_* enum values. --- include/dwmapi.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/dwmapi.h b/include/dwmapi.h index 1b19426ce2d..fb39aeeba10 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -57,6 +57,15 @@ enum DWMWINDOWATTRIBUTE { DWMWA_CLOAK, DWMWA_CLOAKED, DWMWA_FREEZE_REPRESENTATION, + DWMWA_PASSIVE_UPDATE_MODE, + DWMWA_USE_HOSTBACKDROPBRUSH, + DWMWA_USE_IMMERSIVE_DARK_MODE = 20, + DWMWA_WINDOW_CORNER_PREFERENCE = 33, + DWMWA_BORDER_COLOR, + DWMWA_CAPTION_COLOR, + DWMWA_TEXT_COLOR, + DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, + DWMWA_SYSTEMBACKDROP_TYPE, DWMWA_LAST };

1 0

Alistair Leslie-Hughes : include: Add STORAGE_HOTPLUG_INFO structure.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: wine Branch: master Commit: a865ec353c85bf2492225344d89ab621d65ee9c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a865ec353c85bf2492225344d89ab6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 4 16:09:35 2024 +1100 include: Add STORAGE_HOTPLUG_INFO structure. --- include/ntddstor.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/ntddstor.h b/include/ntddstor.h index b8c4bb73b0d..4d715efd1ef 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -272,6 +272,14 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR { USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; +typedef struct _STORAGE_HOTPLUG_INFO { + ULONG Size; + BOOLEAN MediaRemovable; + BOOLEAN MediaHotplug; + BOOLEAN DeviceHotplug; + BOOLEAN WriteCacheEnableOverride; +} STORAGE_HOTPLUG_INFO, *PSTORAGE_HOTPLUG_INFO; + #ifdef __cplusplus } #endif

1 0

Giovanni Mascellani : vkd3d-shader/ir: Synthesize selection constructs from conditional jumps.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: a278f32d3ffad1fb31b8185e3bb63fdfa2522510 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a278f32d3ffad1fb31b8185e3bb63… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Feb 20 23:29:48 2024 +0100 vkd3d-shader/ir: Synthesize selection constructs from conditional jumps. --- libs/vkd3d-shader/ir.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 08f643e8..8af53739 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3050,6 +3050,8 @@ struct vsir_cfg_structure STRUCTURE_TYPE_BLOCK, /* Execute a loop, which is identified by an index. */ STRUCTURE_TYPE_LOOP, + /* Execute a selection construct. */ + STRUCTURE_TYPE_SELECTION, /* Execute a `return' or a (possibly) multilevel `break' or * `continue', targeting a loop by its index. If `condition' * is non-NULL, then the jump is conditional (this is @@ -3065,6 +3067,13 @@ struct vsir_cfg_structure unsigned idx; } loop; struct + { + struct vkd3d_shader_src_param *condition; + struct vsir_cfg_structure_list if_body; + struct vsir_cfg_structure_list else_body; + bool invert_condition; + } selection; + struct { enum vsir_cfg_jump_type { @@ -3110,6 +3119,20 @@ static struct vsir_cfg_structure *vsir_cfg_structure_list_append(struct vsir_cfg return ret; } +static enum vkd3d_result vsir_cfg_structure_list_append_from_region(struct vsir_cfg_structure_list *list, + struct vsir_cfg_structure *begin, size_t size) +{ + if (!vkd3d_array_reserve((void **)&list->structures, &list->capacity, list->count + size, + sizeof(*list->structures))) + return VKD3D_ERROR_OUT_OF_MEMORY; + + memcpy(&list->structures[list->count], begin, size * sizeof(*begin)); + + list->count += size; + + return VKD3D_OK; +} + static void vsir_cfg_structure_init(struct vsir_cfg_structure *structure, enum vsir_cfg_structure_type type) { memset(structure, 0, sizeof(*structure)); @@ -3118,8 +3141,20 @@ static void vsir_cfg_structure_init(struct vsir_cfg_structure *structure, enum v static void vsir_cfg_structure_cleanup(struct vsir_cfg_structure *structure) { - if (structure->type == STRUCTURE_TYPE_LOOP) - vsir_cfg_structure_list_cleanup(&structure->u.loop.body); + switch (structure->type) + { + case STRUCTURE_TYPE_LOOP: + vsir_cfg_structure_list_cleanup(&structure->u.loop.body); + break; + + case STRUCTURE_TYPE_SELECTION: + vsir_cfg_structure_list_cleanup(&structure->u.selection.if_body); + vsir_cfg_structure_list_cleanup(&structure->u.selection.else_body); + break; + + default: + break; + } } struct vsir_cfg @@ -3295,6 +3330,25 @@ static void vsir_cfg_structure_dump(struct vsir_cfg *cfg, struct vsir_cfg_struct TRACE("%s} # %u\n", cfg->debug_buffer.buffer, structure->u.loop.idx); break; + case STRUCTURE_TYPE_SELECTION: + TRACE("%sif {\n", cfg->debug_buffer.buffer); + + vsir_cfg_structure_list_dump(cfg, &structure->u.selection.if_body); + + if (structure->u.selection.else_body.count == 0) + { + TRACE("%s}\n", cfg->debug_buffer.buffer); + } + else + { + TRACE("%s} else {\n", cfg->debug_buffer.buffer); + + vsir_cfg_structure_list_dump(cfg, &structure->u.selection.else_body); + + TRACE("%s}\n", cfg->debug_buffer.buffer); + } + break; + case STRUCTURE_TYPE_JUMP: { const char *type_str; @@ -4205,6 +4259,52 @@ static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *li --list->count; } +static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structure_list *list) +{ + enum vkd3d_result ret; + size_t i; + + for (i = 0; i < list->count; ++i) + { + struct vsir_cfg_structure *structure = &list->structures[i], new_selection, *new_jump; + + if (structure->type != STRUCTURE_TYPE_JUMP || !structure->u.jump.condition) + continue; + + vsir_cfg_structure_init(&new_selection, STRUCTURE_TYPE_SELECTION); + new_selection.u.selection.condition = structure->u.jump.condition; + new_selection.u.selection.invert_condition = structure->u.jump.invert_condition; + + if (!(new_jump = vsir_cfg_structure_list_append(&new_selection.u.selection.if_body, + STRUCTURE_TYPE_JUMP))) + return VKD3D_ERROR_OUT_OF_MEMORY; + new_jump->u.jump.type = structure->u.jump.type; + new_jump->u.jump.target = structure->u.jump.target; + + /* Move the rest of the structure list in the else branch + * rather than leaving it after the selection construct. The + * reason is that this is more conducive to further + * optimization, because all the conditional `break's appear + * as the last instruction of a branch of a cascade of + * selection constructs at the end of the structure list we're + * processing, instead of being buried in the middle of the + * structure list itself. */ + if ((ret = vsir_cfg_structure_list_append_from_region(&new_selection.u.selection.else_body, + &list->structures[i + 1], list->count - i - 1)) < 0) + return ret; + + *structure = new_selection; + list->count = i + 1; + + if ((ret = vsir_cfg_synthesize_selections(&structure->u.selection.else_body)) < 0) + return ret; + + break; + } + + return VKD3D_OK; +} + static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) { enum vkd3d_result ret; @@ -4227,6 +4327,9 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) return ret; + + if ((ret = vsir_cfg_synthesize_selections(loop_body)) < 0) + return ret; } return VKD3D_OK; @@ -4340,6 +4443,41 @@ static enum vkd3d_result vsir_cfg_structure_list_emit(struct vsir_cfg *cfg, break; } + case STRUCTURE_TYPE_SELECTION: + if (!reserve_instructions(&cfg->instructions, &cfg->ins_capacity, cfg->ins_count + 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + if (!vsir_instruction_init_with_params(cfg->program, &cfg->instructions[cfg->ins_count], &no_loc, + VKD3DSIH_IF, 0, 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + cfg->instructions[cfg->ins_count].src[0] = *structure->u.selection.condition; + + if (structure->u.selection.invert_condition) + cfg->instructions[cfg->ins_count].flags |= VKD3D_SHADER_CONDITIONAL_OP_Z; + + ++cfg->ins_count; + + if ((ret = vsir_cfg_structure_list_emit(cfg, &structure->u.selection.if_body, loop_idx)) < 0) + return ret; + + if (structure->u.selection.else_body.count != 0) + { + if (!reserve_instructions(&cfg->instructions, &cfg->ins_capacity, cfg->ins_count + 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + vsir_instruction_init(&cfg->instructions[cfg->ins_count++], &no_loc, VKD3DSIH_ELSE); + + if ((ret = vsir_cfg_structure_list_emit(cfg, &structure->u.selection.else_body, loop_idx)) < 0) + return ret; + } + + if (!reserve_instructions(&cfg->instructions, &cfg->ins_capacity, cfg->ins_count + 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + vsir_instruction_init(&cfg->instructions[cfg->ins_count++], &no_loc, VKD3DSIH_ENDIF); + break; + case STRUCTURE_TYPE_JUMP: { /* Encode the jump target as the loop index plus a bit to remember whether

1 0

Giovanni Mascellani : vkd3d-shader/ir: Remove trailing `continue's.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: 0d13b6afe9bf9b737cd0d3c6fef099629ef466b3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d13b6afe9bf9b737cd0d3c6fef09… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Feb 20 23:29:48 2024 +0100 vkd3d-shader/ir: Remove trailing `continue's. --- libs/vkd3d-shader/ir.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c495955d..08f643e8 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4196,6 +4196,54 @@ fail: return VKD3D_ERROR_OUT_OF_MEMORY; } +static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *list, unsigned int target) +{ + struct vsir_cfg_structure *last = &list->structures[list->count - 1]; + + if (last->type == STRUCTURE_TYPE_JUMP && last->u.jump.type == JUMP_CONTINUE + && !last->u.jump.condition && last->u.jump.target == target) + --list->count; +} + +static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) +{ + enum vkd3d_result ret; + size_t i; + + for (i = 0; i < list->count; ++i) + { + struct vsir_cfg_structure *loop = &list->structures[i]; + struct vsir_cfg_structure_list *loop_body; + + if (loop->type != STRUCTURE_TYPE_LOOP) + continue; + + loop_body = &loop->u.loop.body; + + if (loop_body->count == 0) + continue; + + vsir_cfg_remove_trailing_continue(loop_body, loop->u.loop.idx); + + if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) + return ret; + } + + return VKD3D_OK; +} + +static enum vkd3d_result vsir_cfg_optimize(struct vsir_cfg *cfg) +{ + enum vkd3d_result ret; + + ret = vsir_cfg_optimize_recurse(cfg, &cfg->structured_program); + + if (TRACE_ON()) + vsir_cfg_dump_structured_program(cfg); + + return ret; +} + static enum vkd3d_result vsir_cfg_structure_list_emit(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list, unsigned int loop_idx) { @@ -5317,6 +5365,12 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t return result; } + if ((result = vsir_cfg_optimize(&cfg)) < 0) + { + vsir_cfg_cleanup(&cfg); + return result; + } + if ((result = vsir_cfg_emit_structured_program(&cfg)) < 0) { vsir_cfg_cleanup(&cfg);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Move `continue's to the false branch when possible.
by Alexandre Julliard April 4, 2024

April 4, 2024

Module: vkd3d Branch: master Commit: d8414302e89b43a60a40386a565459d62da4377d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8414302e89b43a60a40386a56545… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Feb 29 16:00:51 2024 +0100 vkd3d-shader/ir: Move `continue's to the false branch when possible. --- libs/vkd3d-shader/ir.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 7230d0e8..c495955d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4115,11 +4115,29 @@ static enum vkd3d_result vsir_cfg_build_structured_program(struct vsir_cfg *cfg) * next block, in which case we make sure it's the * false branch. */ if (action_true.jump_type == JUMP_NONE) + { + invert_condition = true; + } + else if (stack_depth >= 2) + { + struct vsir_cfg_structure_list *inner_loop_frame = stack[stack_depth - 2]; + struct vsir_cfg_structure *inner_loop = &inner_loop_frame->structures[inner_loop_frame->count - 1]; + + assert(inner_loop->type == STRUCTURE_TYPE_LOOP); + + /* Otherwise, if one of the branches is + * continueing the inner loop we're inside, + * make sure it's the false branch (because it + * will be optimized out later). */ + if (action_true.jump_type == JUMP_CONTINUE && action_true.target == inner_loop->u.loop.idx) + invert_condition = true; + } + + if (invert_condition) { struct vsir_cfg_edge_action tmp = action_true; action_true = action_false; action_false = tmp; - invert_condition = true; } assert(action_true.jump_type != JUMP_NONE);

1 0