July 2021 - Wine-devel - list.winehq.org

[PATCH 6/9] gdi32: Use NtGdiSaveDC for SaveDC implementation.
by Jacek Caban 30 Jul '21

30 Jul '21

2 1

[PATCH 5/9] gdi32: Move more functions from dc.c.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 132 -------------------------------------------- dlls/gdi32/gdidc.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 132 deletions(-)

2 1

[PATCH 4/9] gdi32: Use get_dc_attr in SetMiterLimit.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 ------------------------ dlls/gdi32/gdidc.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 24 deletions(-)

2 1

[PATCH 3/9] gdi32: Store miter limit in DC_ATTR.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 30 +++--------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 2 +- include/ntgdi.h | 1 + 6 files changed, 17 insertions(+), 30 deletions(-)

2 1

[PATCH 2/9] gdi32: Store DC pen color in DC_ATTR.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-)

2 1

[PATCH 1/9] gdi32: Store DC brush color in DC_ATTR.
by Jacek Caban 30 Jul '21

30 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 29 ++++------------------------- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 15 insertions(+), 27 deletions(-)

2 1

[PATCH v2] user32: Fix the logical problem that the client window is a Unicode window and still goes A->W.
by Haidong Yu 30 Jul '21

30 Jul '21

2 1

[PATCH] wined3d: Negiotiate less specific memory types on allocation failure.
by Jan Sikorski 30 Jul '21

30 Jul '21

Drop HOST_CACHED and/or DEVICE_LOCAL properties in case the device does not support a particular combination or there is no more space in a heap. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- Superseeds 210471 --- dlls/wined3d/buffer.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..6b0d84ce7a0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1387,8 +1387,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf struct wined3d_context_vk *context_vk) { struct wined3d_resource *resource = &buffer_vk->b.resource; + VkMemoryPropertyFlags memory_type, want_memory_type; uint32_t bind_flags = resource->bind_flags; - VkMemoryPropertyFlags memory_type; VkBufferUsageFlags usage; usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; @@ -1409,16 +1409,28 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = 0; + want_memory_type = 0; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) - memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + want_memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) - memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + want_memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) - memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + want_memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + memory_type = want_memory_type; + + while (!wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo)) { + if (memory_type & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) + { + memory_type = want_memory_type & ~VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + continue; + } + if (memory_type & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) + { + memory_type = (want_memory_type &= ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + continue; + } WARN("Failed to create Vulkan buffer.\n"); return FALSE; } -- 2.30.2

2 2

[PATCH] mfplat/allocator: Handle D3D11 resource sharing mode configuration attributes.
by Nikolay Sivov 30 Jul '21

30 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/sample.c | 11 ++++++- dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 09c65b5fcf1..d99e2b046a6 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -74,6 +74,7 @@ struct sample_allocator DXGI_FORMAT dxgi_format; unsigned int usage; unsigned int bindflags; + unsigned int miscflags; unsigned int buffer_count; } frame_desc; @@ -1352,6 +1353,7 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; else if (desc.Usage == D3D11_USAGE_STAGING) desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ; + desc.MiscFlags = allocator->frame_desc.miscflags; if (SUCCEEDED(hr = ID3D11Device_CreateTexture2D(service->d3d11_device, &desc, NULL, &texture))) { @@ -1380,7 +1382,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u { struct surface_service service; DXGI_FORMAT dxgi_format; - unsigned int i; + unsigned int i, value; GUID major, subtype; UINT64 frame_size; IMFSample *sample; @@ -1415,6 +1417,7 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u dxgi_format = MFMapDX9FormatToDXGIFormat(subtype.Data1); allocator->frame_desc.bindflags = 0; + allocator->frame_desc.miscflags = 0; allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; if (dxgi_format == DXGI_FORMAT_B8G8R8A8_UNORM || @@ -1428,7 +1431,13 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u } if (attributes) + { IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX; + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &value)) && value) + allocator->frame_desc.miscflags |= D3D11_RESOURCE_MISC_SHARED; + } sample_allocator_set_media_type(allocator, media_type); sample_allocator_set_attributes(allocator, attributes); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f1c041b7eb4..3e0907e41ad 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6798,6 +6798,12 @@ static void test_sample_allocator(void) D3D11_USAGE_STAGING, D3D11_USAGE_STAGING + 1, }; + static const unsigned int sharing[] = + { + D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + D3D11_RESOURCE_MISC_SHARED, + }; if (!pMFCreateVideoSampleAllocatorEx) { @@ -7155,6 +7161,67 @@ todo_wine IMFVideoSampleAllocatorEx_Release(allocatorex); } + /* MF_SA_D3D11_SHARED, MF_SA_D3D11_SHARED_WITHOUT_MUTEX */ + for (i = 0; i < ARRAY_SIZE(sharing); ++i) + { + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_SetDirectXManager(allocatorex, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_DeleteAllItems(attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_USAGE, D3D11_USAGE_DEFAULT); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + if (sharing[i] & D3D11_RESOURCE_MISC_SHARED) + { + hr = IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + } + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); + if (sharing[i] == (D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED)) + { + todo_wine + ok(hr == E_INVALIDARG, "%u: Unexpected hr %#x.\n", i, hr); + IMFVideoSampleAllocatorEx_Release(allocatorex); + continue; + } + ok(hr == S_OK, "%u: Unexpected hr %#x.\n", i, hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&texture); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(texture, &desc); + ok(desc.MiscFlags == sharing[i], "%u: unexpected misc flags %#x.\n", i, desc.MiscFlags); + + ID3D11Texture2D_Release(texture); + IMFDXGIBuffer_Release(dxgi_buffer); + IMFMediaBuffer_Release(buffer); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorEx_Release(allocatorex); + } + IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); -- 2.30.2

2 1

[PATCH 1/2] wined3d: Track queries started inside/outside of a render pass separately.
by Jan Sikorski 30 Jul '21

30 Jul '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 28 +++++++++++++-- dlls/wined3d/query.c | 64 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 7 +++- 3 files changed, 81 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4b1bea38370..c718f3facd5 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1285,13 +1285,26 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_query_pool_vk *pool_vk, *pool_vk_next; + struct wined3d_query_vk *query_vk; if (context_vk->vk_render_pass) { + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->render_pass_queries, struct wined3d_query_vk, entry) + wined3d_query_vk_suspend(query_vk, context_vk); + VK_CALL(vkCmdEndRenderPass(vk_command_buffer)); context_vk->vk_render_pass = VK_NULL_HANDLE; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, 0, NULL, 0, NULL, 0, NULL)); + + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->render_pass_queries, struct wined3d_query_vk, entry) + { + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + { + ERR("Failed to allocate new query.\n"); + break; + } + } } if (context_vk->vk_framebuffer) @@ -1561,6 +1574,12 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk wined3d_context_vk_accumulate_pending_queries(context_vk); LIST_FOR_EACH_ENTRY(query_vk, &context_vk->active_queries, struct wined3d_query_vk, entry) { + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + { + ERR("Failed to allocate new query.\n"); + break; + } + wined3d_query_vk_resume(query_vk, context_vk); } @@ -1594,12 +1613,11 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context TRACE("Submitting command buffer %p with id 0x%s.\n", buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + wined3d_context_vk_end_current_render_pass(context_vk); + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->active_queries, struct wined3d_query_vk, entry) - { wined3d_query_vk_suspend(query_vk, context_vk); - } - wined3d_context_vk_end_current_render_pass(context_vk); context_vk->graphics.vk_pipeline = VK_NULL_HANDLE; context_vk->update_compute_pipeline = 1; context_vk->update_stream_output = 1; @@ -2323,6 +2341,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont struct wined3d_rendertarget_view_vk *rtv_vk; struct wined3d_rendertarget_view *view; const VkPhysicalDeviceLimits *limits; + struct wined3d_query_vk *query_vk; VkRenderPassBeginInfo begin_info; unsigned int attachment_count, i; VkFramebufferCreateInfo fb_desc; @@ -2409,6 +2428,8 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont begin_info.pClearValues = NULL; VK_CALL(vkCmdBeginRenderPass(vk_command_buffer, &begin_info, VK_SUBPASS_CONTENTS_INLINE)); + LIST_FOR_EACH_ENTRY(query_vk, &context_vk->render_pass_queries, struct wined3d_query_vk, entry) + wined3d_query_vk_resume(query_vk, context_vk); return true; } @@ -3460,6 +3481,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi wined3d_context_vk_init_graphics_pipeline_key(context_vk); + list_init(&context_vk->render_pass_queries); list_init(&context_vk->active_queries); list_init(&context_vk->completed_query_pools); list_init(&context_vk->free_occlusion_query_pools); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1e082f8ffae..4628cb98cdc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1548,11 +1548,6 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, struct wined3d_query_pool_vk *pool_vk; size_t idx; - if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) - { - ERR("Failed to allocate new query.\n"); - return; - } pool_vk = query_vk->pool_idx.pool_vk; idx = query_vk->pool_idx.idx; @@ -1588,6 +1583,7 @@ void wined3d_query_vk_resume(struct wined3d_query_vk *query_vk, struct wined3d_c VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_ACTIVE; } void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) @@ -1597,6 +1593,7 @@ void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_ wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); wined3d_context_vk_add_pending_query(context_vk, query_vk); query_vk->pool_idx.pool_vk = NULL; + query_vk->flags &= ~WINED3D_QUERY_VK_FLAG_ACTIVE; } static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) @@ -1655,30 +1652,69 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); memset((void *)query->data, 0, query->data_size); vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); - if (query_vk->started) + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) { - wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_ACTIVE) + wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); list_remove(&query_vk->entry); } if (query_vk->pool_idx.pool_vk) wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, query_vk->pool_idx.idx, context_vk); - wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); - list_add_head(&context_vk->active_queries, &query_vk->entry); - query_vk->started = true; + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + { + ERR("Failed to allocate new query.\n"); + return false; + } + + /* A query need to either begin and end inside a single render pass, + * or begin and end ouside of a render pass. Occlusion queries, if issued + * ouside of a render pass, are queued up and only begun when a render + * pass is started, to avoid interrupting it when the query ends. */ + if (context_vk->vk_render_pass) + { + wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); + list_add_head(&context_vk->render_pass_queries, &query_vk->entry); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_ACTIVE | WINED3D_QUERY_VK_FLAG_RENDER_PASS; + } + else if (query->type == WINED3D_QUERY_TYPE_OCCLUSION) + { + list_add_head(&context_vk->render_pass_queries, &query_vk->entry); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_RENDER_PASS; + } + else + { + wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); + list_add_head(&context_vk->active_queries, &query_vk->entry); + query_vk->flags |= WINED3D_QUERY_VK_FLAG_ACTIVE; + } + + query_vk->flags |= WINED3D_QUERY_VK_FLAG_STARTED; context_release(&context_vk->c); } - if (flags & WINED3DISSUE_END && query_vk->started) + if (flags & WINED3DISSUE_END && query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); /* If the query was already ended because the command buffer was - * flushed, we don't need to end it here. */ - if ((vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer)) + * flushed or the render pass ended, we don't need to end it here. */ + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_ACTIVE) + { + vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); + if (!(query_vk->flags & WINED3D_QUERY_VK_FLAG_RENDER_PASS)) + wined3d_context_vk_end_current_render_pass(context_vk); wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); + } + else if (query_vk->pool_idx.pool_vk) + { + /* It was queued, but never activated. */ + wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, + query_vk->pool_idx.idx, context_vk); + query_vk->pool_idx.pool_vk = NULL; + } list_remove(&query_vk->entry); - query_vk->started = false; + query_vk->flags = 0; poll = true; context_release(&context_vk->c); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2048fc6ea6..86eae149306 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2050,13 +2050,17 @@ struct wined3d_query_pool_idx_vk size_t idx; }; +#define WINED3D_QUERY_VK_FLAG_ACTIVE 0x00000001 +#define WINED3D_QUERY_VK_FLAG_STARTED 0x00000002 +#define WINED3D_QUERY_VK_FLAG_RENDER_PASS 0x00000004 + struct wined3d_query_vk { struct wined3d_query q; struct list entry; struct wined3d_query_pool_idx_vk pool_idx; - bool started; + uint8_t flags; uint64_t command_buffer_id; uint32_t control_flags; size_t pending_count; @@ -2580,6 +2584,7 @@ struct wined3d_context_vk VkDeviceSize vk_so_offsets[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; struct wined3d_bo_vk vk_so_counter_bo; + struct list render_pass_queries; struct list active_queries; struct wined3d_pending_queries_vk pending_queries; struct list completed_query_pools; -- 2.30.2

3 4