October 2018 - Wine-commits

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: wine Branch: master Commit: 8fd5c6cb523b16c0e7ddb4477d2b700b581d504f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd5c6cb523b16c0e7ddb447… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 12 00:35:40 2018 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 108 +++++++++++++++++++++------------------------------------------ 1 file changed, 35 insertions(+), 73 deletions(-) diff --git a/po/ja.po b/po/ja.po index c7d6090..4ec0f12 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-05-24 20:49+0900\n" +"PO-Revision-Date: 2018-10-11 00:24+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -405,16 +405,12 @@ msgid "&Retry" msgstr "再試行(&R)" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "タブを隠す(&T)" +msgstr "詳細を隠す" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細" +msgstr "詳細を見る" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -3434,46 +3430,36 @@ msgid "Publishers..." msgstr "発行元..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "LAN 接続" +msgstr "接続" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Web プロキシの自動検出を使う" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "プロキシの自動構成スクリプトを使う" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "アドレス" +msgstr "アドレス:" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "ローカルサーバ(&L)" +msgstr "プロキシサーバ" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "プロキシサーバを利用する" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "ポートなし" +msgstr "ポート:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3736,18 +3722,20 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"このオブジェクトにおけるプロパティ記述子の 'writable' 属性は 'true' に設定で" +"きません" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "変更不可のプロパティ '|' は再定義できません" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "書換不可のプロパティ '|' は変更できません" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "プロパティはアクセサと値の両方になることはできません" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -10736,6 +10724,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"シンボリックリンクを作成します。\n" +"\n" +"構文: MKLINK [オプション] リンク名対象\n" +"\n" +"オプション:\n" +"/d ディレクトリのシンボリックリンクを作成します。\n" +"/h ハードリンクを作成します。\n" +"/j ディレクトリのジャンクションを作成します。\n" +"リンク名は新しいシンボリックリンクの名前です。\n" +"対象はリンク名が指すパスです。\n" #: cmd.rc:312 msgid "" @@ -11041,10 +11039,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "エラー: 無効なオプション '%c'。\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "エラー: プロセス(%1)が見つかりません。\n" +msgstr "エラー: ホスト名が得られません: %u\n" #: hostname.rc:33 msgid "" @@ -12840,10 +12836,8 @@ msgid "Confirm Value Delete" msgstr "値の削除確認" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "本当にレジストリ値 '%1' を削除しますか?" +msgstr "本当に選択したレジストリ値を削除しますか?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14205,11 +14199,11 @@ msgstr "色(&O):" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME タイプ" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "ファイル関連付けの管理(&A)" #: winecfg.rc:308 msgid "Folders" @@ -14822,6 +14816,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"プログラムがシステム上でクラッシュしましたが、バックトレースを取得する " +"WineDbg がプロセスにアタッチできませんでした。" #: winedbg.rc:41 msgid "(unidentified)" @@ -15114,7 +15110,7 @@ msgstr "地雷" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "すべての結果が失われます。よろしいですか?" #: winemine.rc:30 msgid "WineMine" @@ -15683,41 +15679,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15765,7 +15726,7 @@ msgstr "" "\tディレクトリとみなします。\n" "[/S] ディレクトリとサブディレクトリをコピーします。\n" "[/E] 空ディレクトリを含め、ディレクトリとサブディレクトリをコピー。\n" -"[/Q] コピー中にファイル名を一覧にしません。すなわち寡黙です。\n" +"[/Q] コピー中にファイル名を一覧にしないので、寡黙です。\n" "[/F] コピー中に完全な送り元と送り先の名前を表示します。\n" "[/L] 操作を模擬実行し、コピー予定のファイル名を表示します。\n" "[/W] コピーを開始する前に確認のメッセージを表示します。\n" @@ -15781,6 +15742,7 @@ msgstr "" "[/A] アーカイブ属性のファイルだけコピーします。\n" "[/M] アーカイブ属性のファイルだけコピーし、アーカイブ属性を\n" "\t取り除きます。\n" +"[/K] ファイル属性をコピー。これがない場合、属性はコピーされません。\n" "[/D | /D:月-日-年] 新しいファイルや指定された日付以降に変更された\n" "\t\tファイルをコピーします。日付が指定されない場合は、\n" "\t\tコピー先がコピー元より古いファイルだけコピーします。\n"

1 0

Akihiro Sagawa : winex11: Fix a compiler warning when building without vulkan support.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: wine Branch: master Commit: 1931b17868d5afe0d817c2921293131f9878f095 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1931b17868d5afe0d817c292… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 12 00:35:32 2018 +0900 winex11: Fix a compiler warning when building without vulkan support. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 063281d..28ae1a9 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,9 +41,9 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -WINE_DECLARE_DEBUG_CHANNEL(fps); #ifdef SONAME_LIBVULKAN +WINE_DECLARE_DEBUG_CHANNEL(fps); static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug =

1 0

Zebediah Figura : widl: Fix -Oicf marshalling of pointers to arrays.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: wine Branch: master Commit: b0c5a77e26c51f60b7d5e4df557f969a044b7fd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0c5a77e26c51f60b7d5e4df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 10 16:19:23 2018 -0500 widl: Fix -Oicf marshalling of pointers to arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5b498bf..0301024 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1057,13 +1057,13 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: + case TGT_ARRAY: *flags |= IsSimpleRef | MustFree; *typestring_offset = ref->typestring_offset; if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_STRING: case TGT_POINTER: - case TGT_ARRAY: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: *flags |= MustFree;

1 0

Józef Kucia : vkd3d: Prepare descriptors once for all descriptor tables.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: vkd3d Branch: master Commit: 604fd99637bf62c85ccacd6ead4b61100a96009b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=604fd99637bf62c85ccacd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 11 15:33:30 2018 +0200 vkd3d: Prepare descriptors once for all descriptor tables. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3f3ed05..2830a03 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2220,8 +2220,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor = d3d12_desc_from_gpu_handle(base_descriptor); - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2329,6 +2327,9 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis if (!rs || !rs->pool_size_count || !rs->vk_set_layout) return; + if (bindings->descriptor_table_dirty_mask) + d3d12_command_list_prepare_descriptors(list, bind_point); + for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i))

1 0

Józef Kucia : vkd3d: Avoid copying root descriptors.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: vkd3d Branch: master Commit: cf23d71d5df1889c8cedf616e893882cc4fa6162 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf23d71d5df1889c8cedf61… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 11 15:33:31 2018 +0200 vkd3d: Avoid copying root descriptors. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 138 ++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 18 ++++++ 2 files changed, 136 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cf23d71d5df1889c8ce…

1 0

Józef Kucia : vkd3d: Avoid using VkCopyDescriptorSet.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: vkd3d Branch: master Commit: 869602cbea5d4a1432d467d13c14dc6eb295ee36 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=869602cbea5d4a1432d467d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 11 15:33:32 2018 +0200 vkd3d: Avoid using VkCopyDescriptorSet. VkCopyDescriptorSet may result in the CPU reading GPU memory then writing GPU memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 101 ++++----------------------------------------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 10 insertions(+), 92 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d77d6d4..437c29f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1983,98 +1983,11 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list return true; } -static void d3d12_command_list_copy_descriptors(struct d3d12_command_list *list, - const struct vkd3d_pipeline_bindings *bindings, VkDescriptorSet src_set) -{ - const struct d3d12_root_signature *root_signature = bindings->root_signature; - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - const struct d3d12_root_descriptor_table *descriptor_table; - const struct d3d12_root_descriptor_table_range *range; - VkDevice vk_device = list->device->vk_device; - VkCopyDescriptorSet *descriptor_copies; - unsigned int copy_descriptor_count; - unsigned int i, j, k, count; - unsigned int idx; - - count = 0; - for (i = 0; i < root_signature->parameter_count; ++i) - { - if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) - continue; - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - continue; - - descriptor_table = &root_signature->parameters[i].u.descriptor_table; - for (j = 0; j < descriptor_table->range_count; ++j) - { - range = &descriptor_table->ranges[j]; - switch (range->descriptor_magic) - { - case VKD3D_DESCRIPTOR_MAGIC_SRV: - case VKD3D_DESCRIPTOR_MAGIC_UAV: - count += 2 * range->descriptor_count; - break; - default: - ++count; - break; - } - } - } - - if (!count) - return; - - if (!(descriptor_copies = vkd3d_calloc(count, sizeof(*descriptor_copies)))) - return; - - idx = 0; - for (i = 0; i < root_signature->parameter_count; ++i) - { - if (root_signature->parameters[i].parameter_type != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) - continue; - if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - continue; - - descriptor_table = &root_signature->parameters[i].u.descriptor_table; - for (j = 0; j < descriptor_table->range_count; ++j) - { - range = &descriptor_table->ranges[j]; - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - copy_descriptor_count = 2 * range->descriptor_count; - else - copy_descriptor_count = 1; - for (k = 0; k < copy_descriptor_count; ++k) - { - descriptor_copies[idx].sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET; - descriptor_copies[idx].pNext = NULL; - descriptor_copies[idx].srcSet = src_set; - descriptor_copies[idx].srcBinding = range->binding + k; - descriptor_copies[idx].srcArrayElement = 0; - descriptor_copies[idx].dstSet = bindings->descriptor_set; - descriptor_copies[idx].dstBinding = range->binding + k; - descriptor_copies[idx].dstArrayElement = 0; - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - descriptor_copies[idx].descriptorCount = 1; - else - descriptor_copies[idx].descriptorCount = range->descriptor_count; - ++idx; - } - } - } - assert(count == idx); - VK_CALL(vkUpdateDescriptorSets(vk_device, 0, NULL, count, descriptor_copies)); - - vkd3d_free(descriptor_copies); -} - static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *list, VkPipelineBindPoint bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct d3d12_root_signature *root_signature = bindings->root_signature; - VkDescriptorSet previous_descriptor_set = bindings->descriptor_set; if (bindings->descriptor_set && !bindings->in_use) return; @@ -2095,10 +2008,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li root_signature->vk_set_layout); bindings->in_use = false; + bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask; bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask; - - if (previous_descriptor_set) - d3d12_command_list_copy_descriptors(list, bindings, previous_descriptor_set); } static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write, @@ -2193,6 +2104,12 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (!descriptor_count) return; + if (!(descriptor = d3d12_desc_from_gpu_handle(base_descriptor))) + { + WARN("Descriptor table %u is not set.\n", index); + return; + } + if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) return; if (!(image_infos = vkd3d_calloc(descriptor_count, sizeof(*image_infos)))) @@ -2201,8 +2118,6 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list return; } - descriptor = d3d12_desc_from_gpu_handle(base_descriptor); - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -3329,6 +3244,7 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; + bindings->descriptor_table_active_mask = 0; bindings->push_descriptor_active_mask = 0; } @@ -3365,6 +3281,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l assert(index < ARRAY_SIZE(bindings->descriptor_tables)); bindings->descriptor_tables[index] = base_descriptor; bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index; + bindings->descriptor_table_active_mask |= (uint64_t)1 << index; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bbd88ae..cb3d597 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -661,6 +661,7 @@ struct vkd3d_pipeline_bindings D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST]; uint64_t descriptor_table_dirty_mask; + uint64_t descriptor_table_active_mask; VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; uint8_t uav_counter_dirty_mask;

1 0

Józef Kucia : vkd3d-shader: Recognize enableMinimumPrecision global flag.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: vkd3d Branch: master Commit: 970aafaf55de9db3f6d61cb8df5ed414542b8011 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=970aafaf55de9db3f6d61cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 11 15:33:33 2018 +0200 vkd3d-shader: Recognize enableMinimumPrecision global flag. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/trace.c | 34 ++++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++++--- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 63a1a0e..7d4a3b3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3468,7 +3468,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler const struct vkd3d_shader_instruction *instruction) { if (instruction->flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) - FIXME("Unrecognized global flags %#x.\n", instruction->flags); + FIXME("Unhandled global flags %#x.\n", instruction->flags); else WARN("Unhandled global flags %#x.\n", instruction->flags); } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 420ccea..e0cb5ba 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -398,26 +398,30 @@ static unsigned int shader_get_float_offset(enum vkd3d_shader_register_type regi static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD global_flags) { - if (global_flags & VKD3DSGF_REFACTORING_ALLOWED) - { - shader_addline(buffer, "refactoringAllowed"); - global_flags &= ~VKD3DSGF_REFACTORING_ALLOWED; - if (global_flags) - shader_addline(buffer, " | "); - } + unsigned int i; - if (global_flags & VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL) + static const struct { - shader_addline(buffer, "forceEarlyDepthStencil"); - global_flags &= ~VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL; - if (global_flags) - shader_addline(buffer, " | "); + unsigned int flag; + const char *name; } + global_flag_info[] = + { + {VKD3DSGF_REFACTORING_ALLOWED, "refactoringAllowed"}, + {VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL, "forceEarlyDepthStencil"}, + {VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS, "enableRawAndStructuredBuffers"}, + {VKD3DSGF_ENABLE_MINIMUM_PRECISION, "enableMinimumPrecision"}, + }; - if (global_flags & VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS) + for (i = 0; i < ARRAY_SIZE(global_flag_info); ++i) { - shader_addline(buffer, "enableRawAndStructuredBuffers"); - global_flags &= ~VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS; + if (global_flags & global_flag_info[i].flag) + { + shader_addline(buffer, global_flag_info[i].name); + global_flags &= ~global_flag_info[i].flag; + if (global_flags) + shader_addline(buffer, " | "); + } } if (global_flags) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b1eadde..a2747ac 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -439,9 +439,10 @@ enum vkd3d_shader_interpolation_mode enum vkd3d_shader_global_flags { - VKD3DSGF_REFACTORING_ALLOWED = 0x1, - VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x4, - VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, + VKD3DSGF_REFACTORING_ALLOWED = 0x01, + VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x04, + VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x08, + VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20 }; enum vkd3d_shader_sync_flags

1 0

Józef Kucia : vkd3d-shader: Add OpenGL SPIR-V target environment.
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: vkd3d Branch: master Commit: 2f43965c2c7489b162f3ad61fae7b1771c6da18f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2f43965c2c7489b162f3ad6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 11 15:33:34 2018 +0200 vkd3d-shader: Add OpenGL SPIR-V target environment. More changes are needed for full support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_shader.h | 10 ++++++ libs/vkd3d-shader/spirv.c | 63 +++++++++++++++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_main.c | 21 ++++++++++++ libs/vkd3d/state.c | 1 + 4 files changed, 78 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2f43965c2c7489b162f…

1 0

Józef Kucia : vkd3d: Simplify d3d12_command_list_set_root_cbv().
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: vkd3d Branch: master Commit: 7652a6e62c02cdf5df06ff6d2c5f2cc091511a1a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7652a6e62c02cdf5df06ff6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 11 15:33:28 2018 +0200 vkd3d: Simplify d3d12_command_list_set_root_cbv(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55fa933..1ed92ca 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3383,12 +3383,8 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, buffer_info.offset = gpu_address - resource->gpu_address; buffer_info.range = VK_WHOLE_SIZE; - if (!vk_info->KHR_push_descriptor) - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; descriptor_write.pNext = NULL; - descriptor_write.dstSet = bindings->descriptor_set; descriptor_write.dstBinding = root_descriptor->binding; descriptor_write.dstArrayElement = 0; descriptor_write.descriptorCount = 1; @@ -3399,11 +3395,14 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list, if (vk_info->KHR_push_descriptor) { + descriptor_write.dstSet = VK_NULL_HANDLE; VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { + d3d12_command_list_prepare_descriptors(list, bind_point); + descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); } }

1 0

Józef Kucia : vkd3d: Simplify d3d12_command_list_set_root_descriptor().
by Alexandre Julliard 11 Oct '18

11 Oct '18

Module: vkd3d Branch: master Commit: 3b0d20c4748e9fd986c00a656be188d89a82ccdc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b0d20c4748e9fd986c00a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 11 15:33:29 2018 +0200 vkd3d: Simplify d3d12_command_list_set_root_descriptor(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1ed92ca..3f3ed05 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3465,12 +3465,8 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li return; } - if (!vk_info->KHR_push_descriptor) - d3d12_command_list_prepare_descriptors(list, bind_point); - descriptor_write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; descriptor_write.pNext = NULL; - descriptor_write.dstSet = bindings->descriptor_set; descriptor_write.dstBinding = root_descriptor->binding; descriptor_write.dstArrayElement = 0; descriptor_write.descriptorCount = 1; @@ -3481,11 +3477,14 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li if (vk_info->KHR_push_descriptor) { + descriptor_write.dstSet = VK_NULL_HANDLE; VK_CALL(vkCmdPushDescriptorSetKHR(list->vk_command_buffer, bind_point, root_signature->vk_pipeline_layout, 0, 1, &descriptor_write)); } else { + d3d12_command_list_prepare_descriptors(list, bind_point); + descriptor_write.dstSet = bindings->descriptor_set; VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); } }

1 0