wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

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

19 Jan '22

Module: vkd3d Branch: master Commit: 4c3ecdf5fd61d31524751ed90fda72444379c399 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c3ecdf5fd61d31524751ed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:59:30 2022 +1000 vkd3d: Use the resource's stored format in d3d12_resource_WriteToSubresource(). 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 b40683c..f81caa9 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1353,11 +1353,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc 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 d3d12_resource_validate_box().
by Alexandre Julliard 19 Jan '22

19 Jan '22

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 : vkd3d: Use the resource's stored format in vkd3d_create_image().
by Alexandre Julliard 19 Jan '22

19 Jan '22

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 19 Jan '22

19 Jan '22

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: Store the vkd3d format in resource objects.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 1f3ec35138edf770ac7e2465da6295e313f79137 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f3ec35138edf770ac7e246… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 14:52:09 2022 +1000 vkd3d: Store the vkd3d format in resource objects. Resource formats are immutable and the format object is static data. Storing it saves a function call and error check in many locations. The current implementation for finding a format iterates over the entire list of formats. 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 +-------- libs/vkd3d/resource.c | 3 +++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 353a61c..421a3c8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2116,17 +2116,10 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; - const struct vkd3d_format *format; VkImageMemoryBarrier barrier; assert(d3d12_resource_is_texture(resource)); - 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); - return; - } - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -2146,7 +2139,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = resource->u.vk_image; - barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; barrier.subresourceRange.baseMipLevel = 0; barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; barrier.subresourceRange.baseArrayLayer = 0; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78b32bd..b376ecd 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1778,6 +1778,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; + resource->format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0); + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -2030,6 +2032,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; + object->format = vkd3d_format_from_d3d12_resource_desc(d3d12_device, &create_info->desc, 0); object->u.vk_image = create_info->vk_image; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3f5ea21..aa18fcb 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -430,6 +430,7 @@ struct d3d12_resource LONG internal_refcount; D3D12_RESOURCE_DESC desc; + const struct vkd3d_format *format; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; union

1 0

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

19 Jan '22

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 19 Jan '22

19 Jan '22

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-rc5.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: website Branch: master Commit: 43b371d08b97f74e391f69dc8f424fac59f308a5 URL: https://source.winehq.org/git/website.git/?a=commit;h=43b371d08b97f74e391f6… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 19 09:51:36 2022 +0100 German translation for release 7.0-rc5. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022010701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2022010701.xml b/news/de/2022010701.xml new file mode 100644 index 00000000..7b9c3d1a --- /dev/null +++ b/news/de/2022010701.xml @@ -0,0 +1,13 @@ +<news> +<date>7. Januar 2022</date> +<title>Wine 7.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 7.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/7.0-rc5">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-rc5.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-rc4.
by Alexandre Julliard 19 Jan '22

19 Jan '22

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-rc3.
by Alexandre Julliard 19 Jan '22

19 Jan '22

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

← Newer
1
...
53
54
55
56
57
58
59
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022