May 2018 - Wine-commits - list.winehq.org

Dmitry Timoshkov : mstask: Keep the job file uuid across load/ save operations.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 8587b4788bccc7fb4a6be8de348928cb91bf83cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8587b4788bccc7fb4a6be8de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 16:29:26 2018 +0800 mstask: Keep the job file uuid across load/save operations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 7a110b3..58be83e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,7 @@ typedef struct LONG ref; ITaskDefinition *task; IExecAction *action; + UUID uuid; LPWSTR task_name; HRESULT status; WORD idle_minutes, deadline_minutes; @@ -1241,6 +1242,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) if (fixed->file_version != 0x0001) return SCHED_E_INVALID_TASK; + This->uuid = fixed->uuid; + TRACE("name_size_offset %04x\n", fixed->name_size_offset); TRACE("trigger_offset %04x\n", fixed->trigger_offset); TRACE("error_retry_count %u\n", fixed->error_retry_count); @@ -1583,7 +1586,6 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta ver = GetVersion(); fixed.product_version = MAKEWORD(ver >> 8, ver); fixed.file_version = 0x0001; - CoCreateGuid(&fixed.uuid); fixed.name_size_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset += sizeof(USHORT); /* Application Name */ @@ -1627,6 +1629,11 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta Sleep(100); } + if (GetLastError() == ERROR_ALREADY_EXISTS) + fixed.uuid = This->uuid; + else + CoCreateGuid(&fixed.uuid); + if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1848,6 +1855,8 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->is_dirty = FALSE; This->instance_count = 0; + CoCreateGuid(&This->uuid); + /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000;

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 100de495d875e12a438faefd884cd2d5b4011ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=100de495d875e12a438faefd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 24 20:52:07 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 | 71 ++++++++++++++++++++-------------------------------------------- 1 file changed, 22 insertions(+), 49 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1d9f9a5..5214893 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: 2017-12-12 22:41+0900\n" +"PO-Revision-Date: 2018-05-24 20:49+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -6665,10 +6665,8 @@ msgid "Connection reset by peer.\n" msgstr "相手側により接続がリセットされました。\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "メッセージ 0x%1 はファイル %2 に見つかりませんでした。\n" +msgstr "ファイルにデジタル署名がありません。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -8502,10 +8500,8 @@ msgid "&Browse..." msgstr "参照(&B)..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "ファイルの種類" +msgstr "ファイルの種類:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8516,16 +8512,12 @@ msgid "Size:" msgstr "サイズ:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "作成日" +msgstr "作成日:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "属性(&A):" +msgstr "属性:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8536,28 +8528,20 @@ msgid "&Archive" msgstr "アーカイブ(&A)" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "URL:" +msgstr "アプリケーション:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "アイコンの変更(&I)..." +msgstr "変更(&C)..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "更新日時" +msgstr "最終変更日時:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "最終変更日時:" +msgstr "最終アクセス日時:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9167,70 +9151,59 @@ msgid "" msgstr "この証明書には特定できないセキュリティ問題があります。" #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "サービス要求が時間切れとなりました。\n" +msgstr "要求は時間切れとなりました。\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "プリンタエラーが発生しました。" +msgstr "内部エラーが発生しました。\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "パス名が不正です。\n" +msgstr "URL が不正です。\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL スキームを認識できなかったかサポートしていません。\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "ユーザ名を見つけられませんでした。\n" +msgstr "サーバ名をを解決できませんでした。\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "ユーザプロファイルが正しくありません。\n" +msgstr "要求された操作は正しくありません。\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"操作は取り消されました。通常は要求が行われたハンドルが操作の完了前にクローズ" +"されたことが原因です。\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "プロファイルを追加できませんでした。\n" +msgstr "要求された項目は見つかりませんでした。\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "LDAP サーバに接続できません" +msgstr "サーバへの接続試行は失敗しました。\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "サーバへの接続は終了されました。\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"サーバから受信した SSL 証明書の日付が不正です。証明書は期限切れです。\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL 証明書の一般名(ホスト名フィールド)が不適切です。\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: fde111043e9fdd03c9fe13f712c4e3e3366decd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde111043e9fdd03c9fe13f7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 24 19:27:33 2018 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4bc100e..60bc651 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3684,18 +3684,19 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"Attribuutti 'writable' ei voi olla 'true' tämän objektin ominaisuuksissa" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Ei-konfiguroitavaa ominaisuutta '|' ei voi määritellä uudestaan" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Ominaisuudella ei voi olla sekä hakufunktiota että arvoa" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8502,10 +8503,8 @@ msgid "&Browse..." msgstr "&Selaa..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Tiedostotyyppi" +msgstr "Tiedostotyyppi:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8516,16 +8515,12 @@ msgid "Size:" msgstr "Koko:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Luotu" +msgstr "Luotu:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Ominaisuudet:" +msgstr "Ominaisuudet:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8536,28 +8531,20 @@ msgid "&Archive" msgstr "&Arkisto" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Avaa:" +msgstr "Avaa ohjelmalla:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "&Vaihda kuvaketta..." +msgstr "&Vaihda..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Muokattu" +msgstr "Muokattu:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Viimeisin muutos:" +msgstr "Käytetty:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size"

1 0

Alexandre Julliard : server: Removed unused visible rect from get_window_rectangles request.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 376c218ad69610dee92ef5ab51b313a90edf514c URL: https://source.winehq.org/git/wine.git/?a=commit;h=376c218ad69610dee92ef5ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 24 14:10:12 2018 +0200 server: Removed unused visible rect from get_window_rectangles request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 +-- server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 1 - server/window.c | 17 ++--------------- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 564ae92..98dbcb7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3682,7 +3682,6 @@ struct get_window_rectangles_reply { struct reply_header __header; rectangle_t window; - rectangle_t visible; rectangle_t client; }; enum coords_relative @@ -6511,6 +6510,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 552 +#define SERVER_PROTOCOL_VERSION 553 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9fb155b..99e7221 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2643,7 +2643,6 @@ enum message_type int relative; /* coords relative to (see below) */ @REPLY rectangle_t window; /* window rectangle */ - rectangle_t visible; /* visible part of the window rectangle */ rectangle_t client; /* client rectangle */ @END enum coords_relative diff --git a/server/request.h b/server/request.h index 3e6183b..2d55dfb 100644 --- a/server/request.h +++ b/server/request.h @@ -1767,9 +1767,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 ); C_ASSERT( sizeof(struct get_window_rectangles_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, window) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, visible) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 ); -C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 24 ); +C_ASSERT( sizeof(struct get_window_rectangles_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 ); diff --git a/server/trace.c b/server/trace.c index 44004ad..e2980a3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3222,7 +3222,6 @@ static void dump_get_window_rectangles_request( const struct get_window_rectangl static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req ) { dump_rectangle( " window=", &req->window ); - dump_rectangle( ", visible=", &req->visible ); dump_rectangle( ", client=", &req->client ); } diff --git a/server/window.c b/server/window.c index 4a1a278..9492a00 100644 --- a/server/window.c +++ b/server/window.c @@ -2346,42 +2346,29 @@ DECL_HANDLER(get_window_rectangles) if (!win) return; reply->window = win->window_rect; - reply->visible = win->visible_rect; reply->client = win->client_rect; switch (req->relative) { case COORDS_CLIENT: offset_rect( &reply->window, -win->client_rect.left, -win->client_rect.top ); - offset_rect( &reply->visible, -win->client_rect.left, -win->client_rect.top ); offset_rect( &reply->client, -win->client_rect.left, -win->client_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->client_rect, &reply->window ); - mirror_rect( &win->client_rect, &reply->visible ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &reply->window ); break; case COORDS_WINDOW: offset_rect( &reply->window, -win->window_rect.left, -win->window_rect.top ); - offset_rect( &reply->visible, -win->window_rect.left, -win->window_rect.top ); offset_rect( &reply->client, -win->window_rect.left, -win->window_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->window_rect, &reply->visible ); - mirror_rect( &win->window_rect, &reply->client ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->window_rect, &reply->client ); break; case COORDS_PARENT: if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) { mirror_rect( &win->parent->client_rect, &reply->window ); - mirror_rect( &win->parent->client_rect, &reply->visible ); mirror_rect( &win->parent->client_rect, &reply->client ); } break; case COORDS_SCREEN: client_to_screen_rect( win->parent, &reply->window ); - client_to_screen_rect( win->parent, &reply->visible ); client_to_screen_rect( win->parent, &reply->client ); break; default:

1 0

Józef Kucia : libs/vkd3d: Fix rendering to DXGI_FORMAT_A8_UNORM.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 78c952ee5ff0b7159af9b629fcb823140eaa9b85 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=78c952ee5ff0b7159af9b62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:36 2018 +0200 libs/vkd3d: Fix rendering to DXGI_FORMAT_A8_UNORM. In Direct3D alpha is taken from the .r component. 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/state.c | 30 ++++++++++++++++++++++++++---- tests/d3d12.c | 2 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 826d68f..9129d12 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1263,7 +1263,8 @@ static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, siz static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, - const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface *shader_interface) + const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_compile_arguments *compile_args) { struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1284,7 +1285,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.flags = 0; dump_shader_stage(stage, code->pShaderBytecode, code->BytecodeLength); - if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, NULL)) < 0) + if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, compile_args)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); @@ -1436,7 +1437,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st pipeline_info.pNext = NULL; pipeline_info.flags = 0; if (FAILED(hr = create_shader_stage(device, &pipeline_info.stage, - VK_SHADER_STAGE_COMPUTE_BIT, &desc->CS, &shader_interface))) + VK_SHADER_STAGE_COMPUTE_BIT, &desc->CS, &shader_interface, NULL))) { if (state->vk_set_layout) VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); @@ -1789,12 +1790,23 @@ static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input return S_OK; } +static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *format) +{ + if (format->dxgi_format == DXGI_FORMAT_A8_UNORM) + return VKD3D_SWIZZLE(VKD3D_SWIZZLE_W, VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_Y, VKD3D_SWIZZLE_Z); + + return VKD3D_NO_SWIZZLE; +} + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { + unsigned int ps_output_swizzle[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const struct vkd3d_shader_compile_arguments *compile_args; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; + struct vkd3d_shader_compile_arguments ps_compile_args; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_interface shader_interface; struct vkd3d_shader_signature input_signature; @@ -1907,6 +1919,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); + graphics->attachments[idx].flags = 0; graphics->attachments[idx].format = format->vk_format; graphics->attachments[idx].samples = VK_SAMPLE_COUNT_1_BIT; @@ -1924,6 +1938,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_compile_args.output_swizzles = ps_output_swizzle; + ps_compile_args.output_swizzle_count = rt_count; + shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -1952,8 +1969,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (shader_info.uav_counter_mask) FIXME("UAV counters not implemented for graphics pipelines.\n"); + if (shader_stages[i].stage == VK_SHADER_STAGE_FRAGMENT_BIT) + compile_args = &ps_compile_args; + else + compile_args = NULL; + if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], - shader_stages[i].stage, b, &shader_interface))) + shader_stages[i].stage, b, &shader_interface, compile_args))) goto fail; if (shader_stages[i].stage == VK_SHADER_STAGE_VERTEX_BIT diff --git a/tests/d3d12.c b/tests/d3d12.c index c7303f8..0e35fc8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -694,7 +694,7 @@ static void check_readback_data_uint8_(unsigned int line, struct resource_readba if (!all_match) break; } - todo_(line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u).\n", got, expected, x, y); + ok_(line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u).\n", got, expected, x, y); } #define check_sub_resource_uint8(a, b, c, d, e, f) check_sub_resource_uint8_(__LINE__, a, b, c, d, e, f)

1 0

Józef Kucia : libs/vkd3d-shader: Rename default sampler to dummy sampler.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: a87b3f3fb267e9059658039ae61d395bef4a2245 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a87b3f3fb267e9059658039… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:37 2018 +0200 libs/vkd3d-shader: Rename default sampler to dummy sampler. 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 | 2 +- libs/vkd3d-shader/spirv.c | 26 +++++++++++++------------- libs/vkd3d/state.c | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index 1f8fa39..61789d6 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -119,7 +119,7 @@ struct vkd3d_shader_interface * * In Vulkan OpImageFetch must be used with a sampled image. */ - struct vkd3d_shader_descriptor_binding default_sampler; + struct vkd3d_shader_descriptor_binding dummy_sampler; const struct vkd3d_shader_uav_counter_binding *uav_counters; unsigned int uav_counter_count; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4b2b46c..f4c9421 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1851,7 +1851,7 @@ struct vkd3d_dxbc_compiler } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; - uint32_t default_sampler_id; + uint32_t dummy_sampler_id; uint32_t binding_idx; @@ -3340,15 +3340,15 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -static uint32_t vkd3d_dxbc_compiler_get_default_sampler_id(struct vkd3d_dxbc_compiler *compiler) +static uint32_t vkd3d_dxbc_compiler_get_dummy_sampler_id(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, var_id; - if (compiler->default_sampler_id) - return compiler->default_sampler_id; + if (compiler->dummy_sampler_id) + return compiler->dummy_sampler_id; type_id = vkd3d_spirv_get_op_type_sampler(builder); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -3356,14 +3356,14 @@ static uint32_t vkd3d_dxbc_compiler_get_default_sampler_id(struct vkd3d_dxbc_com ptr_type_id, storage_class, 0); vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationDescriptorSet, shader_interface->default_sampler.set); + SpvDecorationDescriptorSet, shader_interface->dummy_sampler.set); vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationBinding, shader_interface->default_sampler.binding); + SpvDecorationBinding, shader_interface->dummy_sampler.binding); - vkd3d_spirv_build_op_name(builder, var_id, "default_sampler"); + vkd3d_spirv_build_op_name(builder, var_id, "dummy_sampler"); - compiler->default_sampler_id = var_id; - return compiler->default_sampler_id; + compiler->dummy_sampler_id = var_id; + return compiler->dummy_sampler_id; } static const struct vkd3d_spirv_resource_type *vkd3d_dxbc_compiler_enable_resource_type( @@ -4781,11 +4781,11 @@ static void vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(struct vkd3d_d sampled_image_type_id, image->image_id, image->sampler_id); } -static void vkd3d_dxbc_compiler_prepare_default_sampled_image(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_prepare_dummy_sampled_image(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg) { vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(compiler, image, resource_reg, - vkd3d_dxbc_compiler_get_default_sampler_id(compiler), false); + vkd3d_dxbc_compiler_get_dummy_sampler_id(compiler), false); } static void vkd3d_dxbc_compiler_prepare_sampled_image(struct vkd3d_dxbc_compiler *compiler, @@ -4813,7 +4813,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, FIXME("Texel offset not supported.\n"); /* OpImageFetch must be used with a sampled image. */ - vkd3d_dxbc_compiler_prepare_default_sampled_image(compiler, &image, &src[1].reg); + vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &src[1].reg); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); @@ -5023,7 +5023,7 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc { /* OpImageFetch must be used with a sampled image. */ op = SpvOpImageFetch; - vkd3d_dxbc_compiler_prepare_default_sampled_image(compiler, &image, &resource->reg); + vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &resource->reg); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); } else diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9129d12..2e01263 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1429,7 +1429,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.default_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->default_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -1945,7 +1945,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.default_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->default_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0;

1 0

Józef Kucia : libs/vkd3d: Rename default sampler to dummy sampler.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: b5d1dbd1825966e7375c4e9170bb90abcaede8d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5d1dbd1825966e7375c4e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:38 2018 +0200 libs/vkd3d: Rename default sampler to dummy sampler. 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/device.c | 12 ++++++------ libs/vkd3d/state.c | 22 +++++++++++----------- libs/vkd3d/vkd3d_private.h | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 48ad7c5..e4c4d52 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1075,7 +1075,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, return S_OK; } -static HRESULT d3d12_device_create_default_sampler(struct d3d12_device *device) +static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) { D3D12_STATIC_SAMPLER_DESC sampler_desc; @@ -1084,7 +1084,7 @@ static HRESULT d3d12_device_create_default_sampler(struct d3d12_device *device) sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_default_sampler); + return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); } static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) @@ -1273,7 +1273,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); - VK_CALL(vkDestroySampler(device->vk_device, device->vk_default_sampler, NULL)); + VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); if (device->vk_pipeline_cache) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); d3d12_device_destroy_vkd3d_queues(device); @@ -2222,10 +2222,10 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, return hr; } - if (FAILED(hr = d3d12_device_create_default_sampler(device))) + if (FAILED(hr = d3d12_device_create_dummy_sampler(device))) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - ERR("Failed to create default sampler, hr %#x.\n", hr); + ERR("Failed to create dummy sampler, hr %#x.\n", hr); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); vkd3d_instance_decref(device->vkd3d_instance); return hr; @@ -2234,7 +2234,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroySampler(device->vk_device, device->vk_default_sampler, NULL)); + VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); vkd3d_instance_decref(device->vkd3d_instance); return hr; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2e01263..19e6549 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -769,19 +769,19 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign return S_OK; } -static HRESULT d3d12_root_signature_init_default_sampler(struct d3d12_root_signature *root_signature, +static HRESULT d3d12_root_signature_init_dummy_sampler(struct d3d12_root_signature *root_signature, struct d3d12_device *device, struct vkd3d_descriptor_set_context *context) { VkDescriptorSetLayoutBinding *binding = context->current_binding; - root_signature->default_sampler.set = context->set_index; - root_signature->default_sampler.binding = context->descriptor_binding++; + root_signature->dummy_sampler.set = context->set_index; + root_signature->dummy_sampler.binding = context->descriptor_binding++; - binding->binding = root_signature->default_sampler.binding; + binding->binding = root_signature->dummy_sampler.binding; binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; binding->descriptorCount = 1; binding->stageFlags = VK_SHADER_STAGE_ALL; - binding->pImmutableSamplers = &device->vk_default_sampler; + binding->pImmutableSamplers = &device->vk_dummy_sampler; ++context->current_binding; return S_OK; @@ -877,7 +877,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa VkDescriptorSetLayoutBinding *binding_desc; struct d3d12_root_signature_info info; VkDescriptorSetLayout set_layouts[2]; - bool needs_default_sampler; + bool needs_dummy_sampler; HRESULT hr; memset(&context, 0, sizeof(context)); @@ -917,8 +917,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->root_descriptor_count = info.root_descriptor_count; /* An additional sampler is created for SpvOpImageFetch. */ - needs_default_sampler = info.srv_count || info.buffer_srv_count; - if (needs_default_sampler) + needs_dummy_sampler = info.srv_count || info.buffer_srv_count; + if (needs_dummy_sampler) { ++info.sampler_count; ++info.descriptor_count; @@ -970,7 +970,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context))) goto fail; - if (needs_default_sampler && FAILED(hr = d3d12_root_signature_init_default_sampler(root_signature, + if (needs_dummy_sampler && FAILED(hr = d3d12_root_signature_init_dummy_sampler(root_signature, device, &context))) goto fail; @@ -1429,7 +1429,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.dummy_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -1945,7 +1945,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.dummy_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4a359db..7506471 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -426,7 +426,7 @@ struct d3d12_root_signature unsigned int descriptor_count; struct vkd3d_shader_resource_binding *descriptor_mapping; - struct vkd3d_shader_descriptor_binding default_sampler; + struct vkd3d_shader_descriptor_binding dummy_sampler; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; @@ -664,7 +664,7 @@ struct d3d12_device VkPipelineCache vk_pipeline_cache; /* A sampler used for SpvOpImageFetch. */ - VkSampler vk_default_sampler; + VkSampler vk_dummy_sampler; VkPhysicalDeviceMemoryProperties memory_properties;

1 0

Józef Kucia : Update AUTHORS.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 5423de8267d0d29ef84cf960ab585bcfab7ab2eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5423de8267d0d29ef84cf96… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:32 2018 +0200 Update AUTHORS. 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> --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3d0c470..1991bdf 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,3 @@ Henri Verbeet Józef Kucia +Sven Hesse

1 0

Józef Kucia : libs/vkd3d: Process render target formats before shaders.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 3198cab3ed7670a7853aad4e9e68dc96f06b4b2f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3198cab3ed7670a7853aad4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:33 2018 +0200 libs/vkd3d: Process render target formats before shaders. We may need to swizzle components in pixel shader based on render target formats because Vulkan doesn't support swizzles for framebuffer attachment image views. 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/state.c | 174 ++++++++++++++++++++++++++--------------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b89f854..4841b0d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1837,6 +1837,93 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s return E_INVALIDARG; } + rt_count = desc->NumRenderTargets; + if (rt_count > ARRAY_SIZE(graphics->attachments) - 1) + { + FIXME("NumRenderTargets %zu > %zu, ignoring extra formats.\n", + rt_count, ARRAY_SIZE(graphics->attachments) - 1); + rt_count = ARRAY_SIZE(graphics->attachments) - 1; + } + + graphics->rt_idx = 0; + if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + { + const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; + VkImageLayout depth_layout; + + if (!(format = vkd3d_get_format(desc->DSVFormat, true))) + { + WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); + hr = E_FAIL; + goto fail; + } + + if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) + || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) + depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + else + depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + + graphics->attachments[0].flags = 0; + graphics->attachments[0].format = format->vk_format; + graphics->attachments[0].samples = VK_SAMPLE_COUNT_1_BIT; + if (desc->DepthStencilState.DepthEnable) + { + graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + } + else + { + graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + } + if (desc->DepthStencilState.StencilEnable) + { + graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; + } + else + { + graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + } + graphics->attachments[0].initialLayout = depth_layout; + graphics->attachments[0].finalLayout = depth_layout; + + graphics->attachment_references[0].attachment = 0; + graphics->attachment_references[0].layout = depth_layout; + ++graphics->rt_idx; + } + + for (i = 0; i < rt_count; ++i) + { + unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; + size_t idx = graphics->rt_idx + i; + + if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) + { + WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); + hr = E_FAIL; + goto fail; + } + + graphics->attachments[idx].flags = 0; + graphics->attachments[idx].format = format->vk_format; + graphics->attachments[idx].samples = VK_SAMPLE_COUNT_1_BIT; + graphics->attachments[idx].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + graphics->attachments[idx].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + graphics->attachments[idx].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + graphics->attachments[idx].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + graphics->attachments[idx].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + graphics->attachments[idx].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + graphics->attachment_references[idx].attachment = idx; + graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); + } + graphics->attachment_count = graphics->rt_idx + rt_count; + shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -1956,93 +2043,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = j; vkd3d_shader_free_shader_signature(&input_signature); - rt_count = desc->NumRenderTargets; - if (rt_count > ARRAY_SIZE(graphics->attachments) - 1) - { - FIXME("NumRenderTargets %zu > %zu, ignoring extra formats.\n", - rt_count, ARRAY_SIZE(graphics->attachments) - 1); - rt_count = ARRAY_SIZE(graphics->attachments) - 1; - } - - graphics->rt_idx = 0; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) - { - const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; - VkImageLayout depth_layout; - - if (!(format = vkd3d_get_format(desc->DSVFormat, true))) - { - WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); - hr = E_FAIL; - goto fail; - } - - if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) - || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - else - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; - - graphics->attachments[0].flags = 0; - graphics->attachments[0].format = format->vk_format; - graphics->attachments[0].samples = VK_SAMPLE_COUNT_1_BIT; - if (desc->DepthStencilState.DepthEnable) - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } - if (desc->DepthStencilState.StencilEnable) - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } - graphics->attachments[0].initialLayout = depth_layout; - graphics->attachments[0].finalLayout = depth_layout; - - graphics->attachment_references[0].attachment = 0; - graphics->attachment_references[0].layout = depth_layout; - ++graphics->rt_idx; - } - - for (i = 0; i < rt_count; ++i) - { - unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; - size_t idx = graphics->rt_idx + i; - - if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) - { - WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); - hr = E_FAIL; - goto fail; - } - - graphics->attachments[idx].flags = 0; - graphics->attachments[idx].format = format->vk_format; - graphics->attachments[idx].samples = VK_SAMPLE_COUNT_1_BIT; - graphics->attachments[idx].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[idx].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - graphics->attachments[idx].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[idx].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - graphics->attachments[idx].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - graphics->attachments[idx].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - graphics->attachment_references[idx].attachment = idx; - graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); - } - graphics->attachment_count = graphics->rt_idx + rt_count; - sub_pass_desc.flags = 0; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.inputAttachmentCount = 0;

1 0

Józef Kucia : libs/vkd3d-shader: Rework swizzle macros.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 926f844ead86849c27cdb875dd5cd83fe918b368 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=926f844ead86849c27cdb87… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:34 2018 +0200 libs/vkd3d-shader: Rework swizzle macros. 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/dxbc.c | 4 ++-- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 17 +++++++++++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5f87eae..87b2d71 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1521,7 +1521,7 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * if (src_param->reg.type == VKD3DSPR_IMMCONST) { - src_param->swizzle = VKD3DSP_NOSWIZZLE; + src_param->swizzle = VKD3D_NO_SWIZZLE; } else { @@ -1531,7 +1531,7 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * switch (swizzle_type) { case VKD3D_SM4_SWIZZLE_NONE: - src_param->swizzle = VKD3DSP_NOSWIZZLE; + src_param->swizzle = VKD3D_NO_SWIZZLE; break; case VKD3D_SM4_SWIZZLE_SCALAR: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f646d54..53ddd44 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2349,7 +2349,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com unsigned int i, component_idx, component_count; uint32_t type_id, components[VKD3D_VEC4_SIZE]; - if (swizzle == VKD3DSP_NOSWIZZLE && write_mask == VKD3DSP_WRITEMASK_ALL) + if (swizzle == VKD3D_NO_SWIZZLE && write_mask == VKD3DSP_WRITEMASK_ALL) return val_id; component_count = vkd3d_write_mask_component_count(write_mask); @@ -2972,7 +2972,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (val_id && input_component_count != component_count) val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, VKD3DSP_NOSWIZZLE, dst->write_mask); + val_id, VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); vkd3d_symbol_make_register(&reg_symbol, reg); @@ -4601,7 +4601,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ assert(compiler->control_flow_depth); assert(cf_info->current_block == VKD3D_BLOCK_SWITCH); - assert(src->swizzle == VKD3DSP_NOSWIZZLE && src->reg.type == VKD3DSPR_IMMCONST); + assert(src->swizzle == VKD3D_NO_SWIZZLE && src->reg.type == VKD3DSPR_IMMCONST); value = *src->reg.u.immconst_data; if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, @@ -5946,7 +5946,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com write_mask = signature->elements[i].mask & 0xff; val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - param_id[variable_idx], VKD3D_TYPE_FLOAT, VKD3DSP_NOSWIZZLE, write_mask); + param_id[variable_idx], VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, write_mask); if (compiler->output_info[i].component_type != VKD3D_TYPE_FLOAT) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 09c2e1d..45af2db 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -390,8 +390,6 @@ enum vkd3d_immconst_type VKD3D_IMMCONST_VEC4, }; -#define VKD3DSP_NOSWIZZLE (0u | (1u << 2) | (2u << 4) | (3u << 6)) - enum vkd3d_shader_src_modifier { VKD3DSPSM_NONE = 0, @@ -852,11 +850,22 @@ static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) return count; } +/* swizzle bits fields: wwzzyyxx */ +#define VKD3D_SWIZZLE_X (0u) +#define VKD3D_SWIZZLE_Y (1u) +#define VKD3D_SWIZZLE_Z (2u) +#define VKD3D_SWIZZLE_W (3u) +#define VKD3D_SWIZZLE_MASK (0x3u) +#define VKD3D_SWIZZLE_SHIFT(idx) (2u * (idx)) +#define VKD3D_NO_SWIZZLE ((VKD3D_SWIZZLE_X << VKD3D_SWIZZLE_SHIFT(0)) \ + | (VKD3D_SWIZZLE_Y << VKD3D_SWIZZLE_SHIFT(1)) \ + | (VKD3D_SWIZZLE_Z << VKD3D_SWIZZLE_SHIFT(2)) \ + | (VKD3D_SWIZZLE_W << VKD3D_SWIZZLE_SHIFT(3))) + static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, unsigned int idx) { - /* swizzle bits fields: wwzzyyxx */ - return (swizzle >> (2 * idx)) & 0x3; + return (swizzle >> VKD3D_SWIZZLE_SHIFT(idx)) & VKD3D_SWIZZLE_MASK; } #define VKD3D_DXBC_MAX_SOURCE_COUNT 6

1 0