June 2020 - Wine-devel - list.winehq.org

[PATCH 2/7] wined3d: Create WINED3D_NO3D swapchain surfaces without GPU access.
by Henri Verbeet 01 Jun '20

01 Jun '20

The main issue this addresses is that WINED3D_RESOURCE_ACCESS_GPU implies that WINED3D_LOCATION_TEXTURE_RGB makes sense as a location for the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e23da1180c1..3497a4d560e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1413,7 +1413,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; texture_desc.bind_flags = 0; - texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (device->wined3d->flags & WINED3D_NO3D) + texture_desc.access = WINED3D_RESOURCE_ACCESS_CPU; + else + texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER) texture_desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture_desc.width = swapchain->state.desc.backbuffer_width; @@ -1493,7 +1496,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc texture_desc.format = swapchain->state.desc.auto_depth_stencil_format; texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; - texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (device->wined3d->flags & WINED3D_NO3D) + texture_desc.access = WINED3D_RESOURCE_ACCESS_CPU; + else + texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, device->device_parent, &texture_desc, 0, &ds))) -- 2.20.1

1 0

[PATCH 1/7] wined3d: Wait for the command stream to finish before removing the context in adapter_no3d_uninit_3d().
by Henri Verbeet 01 Jun '20

01 Jun '20

Like we do in adapter_gl_uninit_3d() and adapter_vk_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0b945919b96..ddce04f55dd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2573,6 +2573,8 @@ static void adapter_no3d_uninit_3d(struct wined3d_device *device) context_no3d = &wined3d_device_no3d(device)->context_no3d; device->blitter->ops->blitter_destroy(device->blitter, NULL); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + device_context_remove(device, context_no3d); wined3d_context_cleanup(context_no3d); } -- 2.20.1

1 0

[PATCH] ntdll: Include <stdarg.h> in unix/debug.c.
by Gerald Pfeifer 01 Jun '20

01 Jun '20

commit e6e2f2325a0a4eb14f10dd6df319b068761e9600 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:48:44 2020 +0200 ntdll: Don't include ntdll_misc.h from the Unix library. indirectly removed the inclusion of <stdarg.h> which alas is required to build unix/debug.c where it is needed for windef.h that uses va_list, at least on x86 (32-bit). Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 12e9cdd36d..2aa6548b36 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -26,6 +26,7 @@ #include "wine/port.h" #include <assert.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -- 2.25.0

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.142.
by Liam Middlebrook 01 Jun '20

01 Jun '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 241686122c..1dee769836 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.140" +VK_XML_VERSION = "1.2.142" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.26.2

1 0

[PATCH 1/2] winemac: Fix a string format warning for tick counts in update_clipboard().
by Ken Thomases 01 Jun '20

01 Jun '20

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index cf5d56b1f1e..65fb3cc8ec4 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1783,7 +1783,7 @@ static void update_clipboard(void) static BOOL updating; TRACE("is_clipboard_owner %d last_clipboard_update %llu now %llu\n", - is_clipboard_owner, last_clipboard_update, GetTickCount64()); + is_clipboard_owner, (unsigned long long)last_clipboard_update, (unsigned long long)GetTickCount64()); if (updating) return; updating = TRUE; -- 2.22.0

1 1

[PATCH 5/5] windowscodecs: Implement DdsFrameDecode_Dds_GetSizeInBlocks().
by Ziqing Hui 01 Jun '20

01 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 15 +++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- 2 files changed, 17 insertions(+), 6 deletions(-)

2 1

[PATCH 4/5] windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetSizeInBlocks().
by Ziqing Hui 01 Jun '20

01 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

2 1

[PATCH 3/5] windowscodecs: Implement DdsFrameDecode_Dds_GetFormatInfo().
by Ziqing Hui 01 Jun '20

01 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 59 ++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 4 +- 2 files changed, 53 insertions(+), 10 deletions(-)

2 1

[PATCH 2/5] windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetFormatInfo().
by Ziqing Hui 01 Jun '20

01 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 55 ++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-)

2 1

[PATCH 1/5] windowscodecs: Check NULL parameters for DdsFrameDecode_GetSize().
by Ziqing Hui 01 Jun '20

01 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 2 ++ dlls/windowscodecs/tests/ddsformat.c | 6 ++++++ 2 files changed, 8 insertions(+)

2 1