January 2022 - Wine-Commits

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_resource_ReadFromSubresource().
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: e1f2325aec9440f69aca1717e516d200c89f8f56 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1f2325aec9440f69aca171… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:59:31 2022 +1000 vkd3d: Use the resource's stored format in d3d12_resource_ReadFromSubresource(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f81caa9..a4d16ee 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1441,11 +1441,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resour device = resource->device; vk_procs = &device->vk_procs; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) - { - ERR("Invalid DXGI format %#x.\n", resource->desc.Format); - return E_INVALIDARG; - } + format = resource->format; if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { FIXME("Not supported for format %#x.\n", format->dxgi_format);

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in vkd3d_create_image().
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 70d87dcf37fa1f0c866d2cd0c8ee748032cc94a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=70d87dcf37fa1f0c866d2cd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:58:59 2022 +1000 vkd3d: Use the resource's stored format in vkd3d_create_image(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b376ecd..a2be9a8 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -855,7 +855,11 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, VkImageCreateInfo image_info; VkResult vr; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + if (resource) + { + format = resource->format; + } + else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid DXGI format %#x.\n", desc->Format); return E_INVALIDARG;

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_ResourceBarrier().
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 16393e10d5ca668449069ff0458950f18311497f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16393e10d5ca668449069ff… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:52:10 2022 +1000 vkd3d: Use the resource's stored format in d3d12_command_list_ResourceBarrier(). Signed-off-by: Conor McCarthy <cmccarthy(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 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 421a3c8..9ea9d7f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4057,15 +4057,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } else { - const struct vkd3d_format *format; VkImageMemoryBarrier vk_barrier; - if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) - { - ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); - continue; - } - vk_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = src_access_mask; @@ -4076,7 +4069,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.image = resource->u.vk_image; - vk_barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + vk_barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; if (sub_resource_idx == D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES) { vk_barrier.subresourceRange.baseMipLevel = 0;

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_resource_validate_box().
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: 04b1c977ce2d9c621a794a6da7f17abd5ee792f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=04b1c977ce2d9c621a794a6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:59:20 2022 +1000 vkd3d: Use the resource's stored format in d3d12_resource_validate_box(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a2be9a8..b40683c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1080,7 +1080,6 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, unsigned int sub_resource_idx, const D3D12_BOX *box) { unsigned int mip_level = sub_resource_idx % resource->desc.MipLevels; - struct d3d12_device *device = resource->device; const struct vkd3d_format *vkd3d_format; uint32_t width_mask, height_mask; uint64_t width, height, depth; @@ -1089,7 +1088,7 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, height = d3d12_resource_desc_get_height(&resource->desc, mip_level); depth = d3d12_resource_desc_get_depth(&resource->desc, mip_level); - vkd3d_format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0); + vkd3d_format = resource->format; assert(vkd3d_format); width_mask = vkd3d_format->block_width - 1; height_mask = vkd3d_format->block_height - 1;

1 0

Conor McCarthy : tests: Test a texture with format DXGI_FORMAT_UNKNOWN in test_create_committed_resource().
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: vkd3d Branch: master Commit: b93edeccfd377c6ca0a6fc11b4cbfb513c354324 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b93edeccfd377c6ca0a6fc1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:07:54 2022 +1000 tests: Test a texture with format DXGI_FORMAT_UNKNOWN in test_create_committed_resource(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a448801..3540c9a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1736,6 +1736,12 @@ static void test_create_committed_resource(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); resource_desc.SampleDesc.Count = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &clear_value, &IID_ID3D12Resource, (void **)&resource);

1 0

Julian Rüger : German translation for release 7.0-rc4.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: website Branch: master Commit: 2aedca0e3d9c115753ee33bbd1c25356d0a20088 URL: https://source.winehq.org/git/website.git/?a=commit;h=2aedca0e3d9c115753ee3… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 19 09:51:10 2022 +0100 German translation for release 7.0-rc4. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022010201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2022010201.xml b/news/de/2022010201.xml new file mode 100644 index 00000000..ab0b5983 --- /dev/null +++ b/news/de/2022010201.xml @@ -0,0 +1,13 @@ +<news> +<date>2. Januar 2022</date> +<title>Wine 7.0-rc4 freigegeben</title> +<body> + Die Entwicklungsversion 7.0-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/7.0-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 7.0.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: website Branch: master Commit: be471971aa42ad103877c6e65d967c62ab99af15 URL: https://source.winehq.org/git/website.git/?a=commit;h=be471971aa42ad103877c… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 19 10:00:46 2022 +0100 German translation for release 7.0. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022011801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2022011801.xml b/news/de/2022011801.xml new file mode 100644 index 00000000..12e41209 --- /dev/null +++ b/news/de/2022011801.xml @@ -0,0 +1,17 @@ +<news> +<date>18. Januar 2022</date> +<title>Wine 7.0 freigegeben</title> +<body> + Das Wine-Team ist stolz verkünden zu können, dass die stabile Version Wine 7.0 verfügbar ist. + Dieses Release verkörpert den Entwicklungsaufwand eines Jahres und über 9.100 individuellen Änderungen. Enthalten sind eine große Zahl an Verbesserungen, welche in den <a href="{$root}/announce/7.0">Release-Notes (en)</a> aufgeführt sind. Die Bereiche mit den nennenswertesten Änderungen sind: + +<ul> + <li>Die meisten Module wurden zum PE-Format konvertiert.</li> + <li>Bessere Unterstützung von Theming, inklusive einer mitgelieferten Theme für einen moderneres Auftreten.</li> + <li>Erheblich verbesserter HID-Stack und Joystick-Unterstützung.</li> + <li>Neue WoW64-Architektur.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/7.0/wine-7.0.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 7.0-rc6.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: website Branch: master Commit: 1f0cb4b5e88d7ff653b21a5aeb89a5196dd22429 URL: https://source.winehq.org/git/website.git/?a=commit;h=1f0cb4b5e88d7ff653b21… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 19 09:53:52 2022 +0100 German translation for release 7.0-rc6. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022011401.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2022011401.xml b/news/de/2022011401.xml new file mode 100644 index 00000000..4a92be22 --- /dev/null +++ b/news/de/2022011401.xml @@ -0,0 +1,13 @@ +<news> +<date>14. Januar 2022</date> +<title>Wine 7.0-rc6 freigegeben</title> +<body> + Die Entwicklungsversion 7.0-rc6 von Wine ist jetzt verfügbar. Dies wird voraussichtlich der letzte Release-Candidate vor dem finalen 7.0. + <a href="{$root}/announce/7.0-rc6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 7.0-rc1.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: website Branch: master Commit: 74a27fcb45c5389d4015ccf5640805a55f89798a URL: https://source.winehq.org/git/website.git/?a=commit;h=74a27fcb45c5389d4015c… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 19 09:39:17 2022 +0100 German translation for release 7.0-rc1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021121002.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2021121002.xml b/news/de/2021121002.xml new file mode 100644 index 00000000..0442f3b1 --- /dev/null +++ b/news/de/2021121002.xml @@ -0,0 +1,16 @@ +<news> +<date>10. Dezember 2021</date> +<title>Wine 7.0-rc1 freigegeben</title> +<body> + Die Entwicklungsversion 7.0-rc1 von Wine ist jetzt verfügbar. + Dies ist der erste Release Candidate des bevorstehenden Wine 7.0. Hiermit beginnt der jährliche Code-Freeze. Wir bitten Sie, dieses Release ausführlich zu testen, um uns zu helfen Wine 7.0 so gut wie möglich zu machen. + <a href="{$root}/announce/7.0-rc1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Reimplementierung des WinMM-Joysticktreibers.</li> + <li>Alle Unix-Bibliotheken zur neuen, syscall-basierten Schnittstelle konvertiert.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc1.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 7.0-rc3.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: website Branch: master Commit: 708b5403e22e646ba24576d966fc74af2c9f4e52 URL: https://source.winehq.org/git/website.git/?a=commit;h=708b5403e22e646ba2457… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 19 09:50:39 2022 +0100 German translation for release 7.0-rc3. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021122601.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2021122601.xml b/news/de/2021122601.xml new file mode 100644 index 00000000..46377816 --- /dev/null +++ b/news/de/2021122601.xml @@ -0,0 +1,13 @@ +<news> +<date>26. Dezember 2021</date> +<title>Wine 7.0-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 7.0-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/7.0-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-Freeze befinden.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/7.0/wine-7.0-rc3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0