July 2019 - Wine-Devel - list.winehq.org

[PATCH 3/5] wined3d: Don't acquire a context in wined3d_texture_load_drawable().

by Henri Verbeet

The one we already have should be fine. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6ae822ddf28..19c2f3b6146 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2547,9 +2547,7 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) { - struct wined3d_texture *restore_texture; struct wined3d_device *device; - unsigned int restore_idx; unsigned int level; RECT r; @@ -2569,13 +2567,6 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, } device = texture->resource.device; - restore_texture = context->current_rt.texture; - restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != texture || restore_idx != sub_resource_idx) - context = context_acquire(device, texture, sub_resource_idx); - else - restore_texture = NULL; - level = sub_resource_idx % texture->level_count; SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), wined3d_texture_get_level_height(texture, level)); @@ -2585,9 +2576,6 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, NULL, WINED3D_TEXF_POINT); - if (restore_texture) - context_restore(context, restore_texture, restore_idx); - return TRUE; } -- 2.11.0

July 29, 2019

[PATCH 2/5] wined3d: Acquire front-buffer contexts when blitting to the drawable in texture2d_blt_fbo().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3668c61fa33..7d7dd257f62 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -147,9 +147,9 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const RECT *dst_rect) { struct wined3d_texture *required_texture, *restore_texture; - unsigned int required_idx, restore_idx; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; + unsigned int restore_idx; GLenum gl_filter; GLenum buffer; RECT s, d; @@ -192,26 +192,21 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + /* Acquire a context for the front-buffer, even though we may be blitting + * to/from a back-buffer. Since context_acquire() doesn't take the + * resource location into account, it may consider the back-buffer to be + * offscreen. */ if (src_location == WINED3D_LOCATION_DRAWABLE) - { - required_texture = src_texture; - required_idx = src_sub_resource_idx; - } + required_texture = src_texture->swapchain->front_buffer; else if (dst_location == WINED3D_LOCATION_DRAWABLE) - { - required_texture = dst_texture; - required_idx = dst_sub_resource_idx; - } + required_texture = dst_texture->swapchain->front_buffer; else - { required_texture = NULL; - required_idx = 0; - } restore_texture = context->current_rt.texture; restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != required_texture || restore_idx != required_idx) - context = context_acquire(device, required_texture, required_idx); + if (restore_texture != required_texture) + context = context_acquire(device, required_texture, 0); else restore_texture = NULL; -- 2.11.0

July 29, 2019

[PATCH 1/5] wined3d: Acquire a context for the front buffer in swapchain_gl_present().

by Henri Verbeet

Since context_acquire() doesn't take the resource location into account, it may consider the back-buffer to be offscreen, and return an already active context for a different swapchain. This fixes a regression introduced by commit 64d41b3dec0635c56268be64d407ed9bfd8c0695. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bf0c308f0d3..8603c8de7a0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -434,7 +434,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_context *context; BOOL render_to_fbo; - context = context_acquire(swapchain->device, back_buffer, 0); + context = context_acquire(swapchain->device, swapchain->front_buffer, 0); context_gl = wined3d_context_gl(context); if (!context_gl->valid) { -- 2.11.0

July 29, 2019

Re: Another Call for WineConf 2019 presentations

by Francois Gouget

On Tue, 23 Jul 2019, Michael Stefaniuc wrote: [...] > If there is interest I could do a coccinelle tutorial / presentation on > how to use it to find code patterns and do quick and not so dirty code > transformations. I would be interested. -- Francois Gouget <fgouget(a)free.fr>

July 29, 2019

Re: Re: RFC: VK_EXTERNAL_MEMORY_WIN32 extension patch

by Derek Lesho

Marvin, you've forgotten to run make_vulkan. On Mon, Jul 29, 2019 at 12:17 AM Marvin <testbot(a)winehq.org> wrote: > > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=54897 > > Your paranoid android. > > > === debian10 (build log) === > > ../../../wine/dlls/winevulkan/vulkan.c:1219:5: error: unknown type name ‘VkImportMemoryFdInfoKHR’; did you mean ‘VkImportMemoryWin32HandleInfoKHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1233:19: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1259:27: error: request for member ‘sType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1259:36: error: ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1260:27: error: request for member ‘pNext’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1261:27: error: request for member ‘handleType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1283:75: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1285:31: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1292:35: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1292:59: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1322:17: error: unknown type name ‘VkMemoryGetFdInfoKHR’; did you mean ‘VkPresentInfoKHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1326:29: error: request for member ‘sType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1326:38: error: ‘VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1327:29: error: request for member ‘pNext’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1328:29: error: request for member ‘memory’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1329:29: error: request for member ‘handleType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1331:35: error: ‘struct vulkan_device_funcs’ has no member named ‘p_vkGetMemoryFdKHR’; did you mean ‘p_vkFreeMemory’? > ../../../wine/dlls/winevulkan/vulkan.c:1370:27: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1371:33: error: request for member ‘fd’ in something not a structure or union > Task: The win32 build failed > > === debian10 (build log) === > > ../../../wine/dlls/winevulkan/vulkan.c:1219:5: error: unknown type name ‘VkImportMemoryFdInfoKHR’; did you mean ‘VkImportMemoryWin32HandleInfoKHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1233:19: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1259:27: error: request for member ‘sType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1259:36: error: ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1260:27: error: request for member ‘pNext’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1261:27: error: request for member ‘handleType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1283:75: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1285:31: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1292:35: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1292:59: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1322:17: error: unknown type name ‘VkMemoryGetFdInfoKHR’; did you mean ‘VkPresentInfoKHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1326:29: error: request for member ‘sType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1326:38: error: ‘VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR’? > ../../../wine/dlls/winevulkan/vulkan.c:1327:29: error: request for member ‘pNext’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1328:29: error: request for member ‘memory’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1329:29: error: request for member ‘handleType’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1331:35: error: ‘struct vulkan_device_funcs’ has no member named ‘p_vkGetMemoryFdKHR’; did you mean ‘p_vkFreeMemory’? > ../../../wine/dlls/winevulkan/vulkan.c:1370:27: error: request for member ‘fd’ in something not a structure or union > ../../../wine/dlls/winevulkan/vulkan.c:1371:33: error: request for member ‘fd’ in something not a structure or union > Task: The wow64 build failed

July 29, 2019

Re: Re: RFC: VK_EXTERNAL_MEMORY_WIN32 extension patch

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54897 Your paranoid android. === debian10 (build log) === ../../../wine/dlls/winevulkan/vulkan.c:1219:5: error: unknown type name ‘VkImportMemoryFdInfoKHR’; did you mean ‘VkImportMemoryWin32HandleInfoKHR’? ../../../wine/dlls/winevulkan/vulkan.c:1233:19: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1259:27: error: request for member ‘sType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1259:36: error: ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR’? ../../../wine/dlls/winevulkan/vulkan.c:1260:27: error: request for member ‘pNext’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1261:27: error: request for member ‘handleType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1283:75: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1285:31: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1292:35: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1292:59: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1322:17: error: unknown type name ‘VkMemoryGetFdInfoKHR’; did you mean ‘VkPresentInfoKHR’? ../../../wine/dlls/winevulkan/vulkan.c:1326:29: error: request for member ‘sType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1326:38: error: ‘VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR’? ../../../wine/dlls/winevulkan/vulkan.c:1327:29: error: request for member ‘pNext’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1328:29: error: request for member ‘memory’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1329:29: error: request for member ‘handleType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1331:35: error: ‘struct vulkan_device_funcs’ has no member named ‘p_vkGetMemoryFdKHR’; did you mean ‘p_vkFreeMemory’? ../../../wine/dlls/winevulkan/vulkan.c:1370:27: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1371:33: error: request for member ‘fd’ in something not a structure or union Task: The win32 build failed === debian10 (build log) === ../../../wine/dlls/winevulkan/vulkan.c:1219:5: error: unknown type name ‘VkImportMemoryFdInfoKHR’; did you mean ‘VkImportMemoryWin32HandleInfoKHR’? ../../../wine/dlls/winevulkan/vulkan.c:1233:19: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1259:27: error: request for member ‘sType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1259:36: error: ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR’? ../../../wine/dlls/winevulkan/vulkan.c:1260:27: error: request for member ‘pNext’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1261:27: error: request for member ‘handleType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1283:75: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1285:31: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1292:35: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1292:59: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1322:17: error: unknown type name ‘VkMemoryGetFdInfoKHR’; did you mean ‘VkPresentInfoKHR’? ../../../wine/dlls/winevulkan/vulkan.c:1326:29: error: request for member ‘sType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1326:38: error: ‘VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR’ undeclared (first use in this function); did you mean ‘VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR’? ../../../wine/dlls/winevulkan/vulkan.c:1327:29: error: request for member ‘pNext’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1328:29: error: request for member ‘memory’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1329:29: error: request for member ‘handleType’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1331:35: error: ‘struct vulkan_device_funcs’ has no member named ‘p_vkGetMemoryFdKHR’; did you mean ‘p_vkFreeMemory’? ../../../wine/dlls/winevulkan/vulkan.c:1370:27: error: request for member ‘fd’ in something not a structure or union ../../../wine/dlls/winevulkan/vulkan.c:1371:33: error: request for member ‘fd’ in something not a structure or union Task: The wow64 build failed

July 29, 2019

Re: RFC: VK_EXTERNAL_MEMORY_WIN32 extension patch

by Derek Lesho

I just realized that I forgot the attach the patch itself! My bad! On Sun, Jul 28, 2019 at 9:06 PM Derek Lesho <dereklesho52(a)gmail.com> wrote: > > Hello, before I break this patch up and submit a patchset, I'd like to inquire about a few things in this patch I have made. > > The biggest question I have is how we want to process allocate_info without modifying what is passed in. > > In order to copy the whole pNext chain or the unknown bits, we'd need a way to get the struct length given the sType. To do this we'd have to generate something in make_vulkan, but I'm not sure of the specifics (mostly where the helper would go). > > Alternatively, we could try restoring the chain after it is finished, however this may not be thread safe, if the struct is being read in another thread. > > Additionally, I'd like to know how to better organize the functions for creating/operating on gpu-resource objects. Right now they're in ntdll's misc.c, so that I can use some ntdll internal functions, but maybe we should have a separate file for this. > > If any of you want to play around with this patch, Joshua Ashton (d9vk creator) made a few patches on DXVK that implement D3D shared resources using this extension and files, and modified a D3D example to use shared resources, which is what I've been using to test my implementation: > > https://github.com/Joshua-Ashton/dxvk/tree/dxvk-shared-resources > > D3D11 binary attached (Joshua didn't send me source) > > Note: Make sure to reset to HEAD~1 then build, as I think the latest commit is broken. Also, replace VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_(+KMT_)BIT with VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_(+KMT_)BIT. Also, this branch only compiles with MSVC. Alternatively, I'll attach the binaries to this email. > > Note 2: Make sure to use native d3dcompiler_47 > > Shared-Resources.tar.xz

July 29, 2019

RFC: VK_EXTERNAL_MEMORY_WIN32 extension patch

by Derek Lesho

Hello, before I break this patch up and submit a patchset, I'd like to inquire about a few things in this patch I have made. The biggest question I have is how we want to process allocate_info without modifying what is passed in. In order to copy the whole pNext chain or the unknown bits, we'd need a way to get the struct length given the sType. To do this we'd have to generate something in make_vulkan, but I'm not sure of the specifics (mostly where the helper would go). Alternatively, we could try restoring the chain after it is finished, however this may not be thread safe, if the struct is being read in another thread. Additionally, I'd like to know how to better organize the functions for creating/operating on gpu-resource objects. Right now they're in ntdll's misc.c, so that I can use some ntdll internal functions, but maybe we should have a separate file for this. If any of you want to play around with this patch, Joshua Ashton (d9vk creator) made a few patches on DXVK that implement D3D shared resources using this extension and files, and modified a D3D example to use shared resources, which is what I've been using to test my implementation: https://github.com/Joshua-Ashton/dxvk/tree/dxvk-shared-resources D3D11 binary attached (Joshua didn't send me source) Note: Make sure to reset to HEAD~1 then build, as I think the latest commit is broken. Also, replace VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_(+KMT_)BIT with VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_(+KMT_)BIT. Also, this branch only compiles with MSVC. Alternatively, I'll attach the binaries to this email. Note 2: Make sure to use native d3dcompiler_47 Shared-Resources.tar.xz <https://drive.google.com/file/d/112N8xhnUJ0FyBDodgbP42fD31-VLq5ka/view?usp=…>

July 29, 2019

Re: TestBot news

by Francois Gouget

On Sun, 28 Jul 2019, Aaryaman Vasishta wrote: [...] > > I guess these updates might be useful to have just to be safe. That being > said, since these are VM's, would the corresponding vulnerabilities > negatively affect the testbot? Not really. It's more a question of seeing the latest behavior of the APIs. -- Francois Gouget <fgouget(a)codeweavers.com>

July 27, 2019

Re: TestBot news

by Aaryaman Vasishta

Thanks Francois! > > There were updates after 2014, not sure if they are download only. One of > the latest: > > https://support.microsoft.com/en-us/help/4500705/customer-guidance-for-cve-… > > I guess these updates might be useful to have just to be safe. That being said, since these are VM's, would the corresponding vulnerabilities negatively affect the testbot?

July 27, 2019