August 2018 - Wine-devel - list.winehq.org

[PATCH] explorer: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 21 Aug '18

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/desktop.c | 8 ++++---- programs/explorer/explorer.c | 32 +++++++++++++++----------------- programs/explorer/systray.c | 8 ++++---- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4f47ad0d36..ff58204530 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -709,7 +709,7 @@ static const WCHAR *get_default_desktop_name(void) WCHAR *ret = NULL; HKEY hkey; - if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, sizeof(buffer)/sizeof(WCHAR), NULL )) + if (desk && GetUserObjectInformationW( desk, UOI_NAME, buffer, ARRAY_SIZE( buffer ), NULL )) { if (strcmpiW( buffer, defaultW )) return buffer; } @@ -792,7 +792,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; WCHAR buffer[MAX_PATH], libname[32], *name, *next; - WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; + WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; char error[80]; @@ -809,7 +809,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) RegCloseKey( hkey ); } } - else lstrcpynW( buffer, driver, sizeof(buffer)/sizeof(WCHAR) ); + else lstrcpynW( buffer, driver, ARRAY_SIZE( buffer )); name = buffer; while (name) @@ -817,7 +817,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) next = strchrW( name, ',' ); if (next) *next++ = 0; - snprintfW( libname, sizeof(libname)/sizeof(WCHAR), drv_formatW, name ); + snprintfW( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) { diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c50933661b..955678d23b 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -345,10 +345,8 @@ static void make_explorer_window(IShellFolder* startFolder) memset(nav_buttons,0,sizeof(nav_buttons)); - LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, - sizeof(explorer_title)/sizeof(WCHAR)); - LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, - sizeof(pathbox_label)/sizeof(WCHAR)); + LoadStringW(explorer_hInstance,IDS_EXPLORER_TITLE,explorer_title, ARRAY_SIZE( explorer_title )); + LoadStringW(explorer_hInstance,IDS_PATHBOX_LABEL,pathbox_label, ARRAY_SIZE( pathbox_label )); hdc = GetDC(0); dpix = GetDeviceCaps(hdc, LOGPIXELSX); @@ -415,7 +413,7 @@ static void make_explorer_window(IShellFolder* startFolder) nav_buttons[2].fsState=TBSTATE_ENABLED; nav_buttons[2].fsStyle=BTNS_BUTTON|BTNS_AUTOSIZE; SendMessageW(nav_toolbar,TB_BUTTONSTRUCTSIZE,sizeof(TBBUTTON),0); - SendMessageW(nav_toolbar,TB_ADDBUTTONSW,sizeof(nav_buttons)/sizeof(TBBUTTON),(LPARAM)nav_buttons); + SendMessageW(nav_toolbar,TB_ADDBUTTONSW,ARRAY_SIZE( nav_buttons ),(LPARAM)nav_buttons); band_info.cbSize = sizeof(band_info); band_info.fMask = RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; @@ -738,38 +736,38 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) while (*p) { while (isspaceW(*p)) p++; - if (strncmpW(p, arg_n, sizeof(arg_n)/sizeof(WCHAR))==0) + if (strncmpW(p, arg_n, ARRAY_SIZE( arg_n ))==0) { parameters->explorer_mode = FALSE; - p += sizeof(arg_n)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_n ); } - else if (strncmpW(p, arg_e, sizeof(arg_e)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_e, ARRAY_SIZE( arg_e ))==0) { parameters->explorer_mode = TRUE; - p += sizeof(arg_e)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_e ); } - else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_root, ARRAY_SIZE( arg_root ))==0) { - p += sizeof(arg_root)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_root ); p = copy_path_string(parameters->root,p); } - else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_select, ARRAY_SIZE( arg_select ))==0) { - p += sizeof(arg_select)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_select ); p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection); } - else if (strncmpW(p, arg_desktop, sizeof(arg_desktop)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop, ARRAY_SIZE( arg_desktop ))==0) { - p += sizeof(arg_desktop)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } /* workaround for Worms Armageddon that hardcodes a /desktop option with quotes */ - else if (strncmpW(p, arg_desktop_quotes, sizeof(arg_desktop_quotes)/sizeof(WCHAR))==0) + else if (strncmpW(p, arg_desktop_quotes, ARRAY_SIZE( arg_desktop_quotes ))==0) { - p += sizeof(arg_desktop_quotes)/sizeof(WCHAR); + p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } else diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9e58ad4833..3d36f74e16 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -405,13 +405,13 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW( icon->tiptext, nid->szTip, ARRAY_SIZE( icon->tiptext )); if (icon->display != -1) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); - lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + lstrcpynW( icon->info_text, nid->szInfo, ARRAY_SIZE( icon->info_text )); + lstrcpynW( icon->info_title, nid->szInfoTitle, ARRAY_SIZE( icon->info_title )); icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; @@ -933,7 +933,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab return; } - LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); + LoadStringW( NULL, IDS_START_LABEL, start_label, ARRAY_SIZE( start_label )); add_taskbar_button( 0 ); -- 2.14.4

1 0

[PATCH] dxdiag: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 21 Aug '18

21 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/dxdiag/information.c | 6 +++--- programs/dxdiag/main.c | 10 +++++----- programs/dxdiag/output.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index 5cc862be63..ec2b2b5b0e 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -156,7 +156,7 @@ static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_i fill_system_property_list(dxdiag_info, property_list); - for (i = 0; i < sizeof(property_list)/sizeof(property_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(property_list); i++) { if (!property_to_string(container, property_list[i].property_name, property_list[i].output)) { @@ -193,7 +193,7 @@ void free_dxdiag_information(struct dxdiag_information *system_info) if (!system_info) return; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) filler_list[i].free_function(system_info); HeapFree(GetProcessHeap(), 0, system_info); @@ -230,7 +230,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) if (!ret) goto error; - for (i = 0; i < sizeof(filler_list)/sizeof(filler_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(filler_list); i++) { IDxDiagContainer *child; BOOL success; diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index d7d430b570..b073674ca1 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -43,8 +43,8 @@ static void usage(void) WCHAR title[MAX_STRING_LEN]; WCHAR usage[MAX_STRING_LEN]; - LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, sizeof(title)/sizeof(WCHAR)); - LoadStringW(hInstance, STRING_USAGE, usage, sizeof(usage)/sizeof(WCHAR)); + LoadStringW(hInstance, STRING_DXDIAG_TOOL, title, ARRAY_SIZE(title)); + LoadStringW(hInstance, STRING_USAGE, usage, ARRAY_SIZE(usage)); MessageBoxW(NULL, usage, title, MB_OK | MB_ICONWARNING); @@ -126,7 +126,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info { info->output_type = OUTPUT_TEXT; return process_file_name(cmdline, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); } cmdline++; @@ -137,12 +137,12 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 't': info->output_type = OUTPUT_TEXT; return process_file_name(cmdline + 1, OUTPUT_TEXT, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'X': case 'x': info->output_type = OUTPUT_XML; return process_file_name(cmdline + 1, OUTPUT_XML, info->outfile, - sizeof(info->outfile)/sizeof(WCHAR)); + ARRAY_SIZE(info->outfile)); case 'W': case 'w': if (strncmpiW(cmdline, whql_colonW, 5)) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index c18c75d183..b1e0f188ee 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -179,7 +179,7 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons return FALSE; } - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { const struct text_information_field *fields = output_table[i].fields; unsigned int j; @@ -313,7 +313,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const if (FAILED(hr)) goto error; - for (i = 0; i < sizeof(output_table)/sizeof(output_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(output_table); i++) { IXMLDOMElement *info_element = xml_create_element(xmldoc, output_table[i].tag_name); const struct xml_information_field *fields = output_table[i].fields; @@ -394,14 +394,14 @@ static struct output_backend const WCHAR *get_output_extension(enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].filename_ext; } BOOL output_dxdiag_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename, enum output_type type) { - assert(type > OUTPUT_NONE && type <= sizeof(output_backends)/sizeof(output_backends[0])); + assert(type > OUTPUT_NONE && type <= ARRAY_SIZE(output_backends)); return output_backends[type - 1].output_handler(dxdiag_info, filename); } -- 2.14.4

1 0

[PATCH 1/4] comctl32/edit: Get rid of useless float cast
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

Since the division (the only operation with a fractional result) was immediately truncated to integer anyway, the float cast is completely useless. This works fine because the multiplication is done before the division (parentheses have been added to emphasize this point). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/edit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..7bcf9ce 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4911,7 +4911,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_MOUSEWHEEL: { - int wheelDelta; + INT wheelDelta; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -4931,10 +4931,10 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll; - pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; - es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + pulScrollLines = (INT) min((UINT) es->line_count, pulScrollLines); + cLineScroll = ((INT)pulScrollLines * es->wheelDeltaRemainder) / WHEEL_DELTA; + es->wheelDeltaRemainder -= (cLineScroll * WHEEL_DELTA) / (INT)pulScrollLines; result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } break; -- 1.9.1

1 3

[PATCH 1/2] comctl32/listbox: Update the size in SetColumnWidth unconditionally
by Gabriel Ivăncescu 21 Aug '18

21 Aug '18

When the listbox receives a WM_WINDOWPOSCHANGED message and calls DefWindowProc on it, which then ends up sending a WM_SIZE to the window, some applications swallow that up and won't pass the WM_SIZE to the listbox. However, they do pass a LB_SETCOLUMNWIDTH, even when the column width did not change at all. So we have to unconditionally update the size itself (not just the page) when we receive that message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b3491bb..b3719a6 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1260,10 +1260,12 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) */ static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); + /* update the SIZE unconditionally, because some applications swallow + WM_SIZE from DefWindowProc and only send LB_SETCOLUMNWIDTH, even + when the column width doesn't even change (but its size does) */ + TRACE("[%p]: new column width = %d\n", descr->self, width); descr->column_width = width; - LISTBOX_UpdatePage( descr ); + LISTBOX_UpdateSize(descr); return LB_OKAY; } -- 1.9.1

2 5

[PATCH vkd3d 3/8] vkd3d: Reference count CPU descriptors.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> We have to keep all image views referenced by all used VkFramebuffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 57 ++++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/resource.c | 46 +++++++++++++++++++++++++------------ libs/vkd3d/vkd3d_private.h | 11 +++++++-- 3 files changed, 91 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8fb6b62b9169..f5b6558dab7b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -750,6 +750,19 @@ static bool d3d12_command_allocator_add_descriptor_pool(struct d3d12_command_all return true; } +static bool d3d12_command_allocator_add_view(struct d3d12_command_allocator *allocator, + struct vkd3d_view *view) +{ + if (!vkd3d_array_reserve((void **)&allocator->views, &allocator->views_size, + allocator->view_count + 1, sizeof(*allocator->views))) + return false; + + vkd3d_view_incref(view); + allocator->views[allocator->view_count++] = view; + + return true; +} + static bool d3d12_command_allocator_add_buffer_view(struct d3d12_command_allocator *allocator, VkBufferView view) { @@ -808,6 +821,12 @@ static void d3d12_command_allocator_free_resources(struct d3d12_command_allocato } allocator->buffer_view_count = 0; + for (i = 0; i < allocator->view_count; ++i) + { + vkd3d_view_decref(allocator->views[i], device); + } + allocator->view_count = 0; + for (i = 0; i < allocator->descriptor_pool_count; ++i) { VK_CALL(vkDestroyDescriptorPool(device->vk_device, allocator->descriptor_pools[i], NULL)); @@ -889,6 +908,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo d3d12_command_allocator_free_resources(allocator); vkd3d_free(allocator->transfer_buffers); vkd3d_free(allocator->buffer_views); + vkd3d_free(allocator->views); vkd3d_free(allocator->descriptor_pools); vkd3d_free(allocator->pipelines); vkd3d_free(allocator->framebuffers); @@ -1077,6 +1097,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->descriptor_pools_size = 0; allocator->descriptor_pool_count = 0; + allocator->views = NULL; + allocator->views_size = 0; + allocator->view_count = 0; + allocator->buffer_views = NULL; allocator->buffer_views_size = 0; allocator->buffer_view_count = 0; @@ -3497,6 +3521,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; + struct vkd3d_view *view; unsigned int i; TRACE("iface %p, render_target_descriptor_count %u, render_target_descriptors %p, " @@ -3523,7 +3548,14 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi d3d12_command_list_track_resource_usage(list, rtv_desc->resource); - list->views[i + 1] = rtv_desc->vk_view; + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = rtv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + + list->views[i + 1] = view->u.vk_image_view; list->fb_width = max(list->fb_width, rtv_desc->width); list->fb_height = max(list->fb_height, rtv_desc->height); list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); @@ -3535,11 +3567,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi d3d12_command_list_track_resource_usage(list, dsv_desc->resource); + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = dsv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + + list->views[0] = view->u.vk_image_view; list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, 1); - - list->views[0] = dsv_desc->vk_view; } d3d12_command_list_invalidate_current_framebuffer(list); @@ -3549,7 +3587,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi static void d3d12_command_list_clear(struct d3d12_command_list *list, const struct vkd3d_vk_device_procs *vk_procs, const struct VkAttachmentDescription *attachment_desc, const struct VkAttachmentReference *color_reference, const struct VkAttachmentReference *ds_reference, - VkImageView vk_view, size_t width, size_t height, unsigned int layer_count, + struct vkd3d_view *view, size_t width, size_t height, unsigned int layer_count, const union VkClearValue *clear_value, unsigned int rect_count, const D3D12_RECT *rects) { struct VkSubpassDescription sub_pass_desc; @@ -3608,12 +3646,17 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, return; } + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + } + fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0; fb_desc.renderPass = vk_render_pass; fb_desc.attachmentCount = 1; - fb_desc.pAttachments = &vk_view; + fb_desc.pAttachments = &view->u.vk_image_view; fb_desc.width = width; fb_desc.height = height; fb_desc.layers = layer_count; @@ -3693,7 +3736,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra ds_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, NULL, &ds_reference, - dsv_desc->vk_view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); + dsv_desc->view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); } static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList *iface, @@ -3724,7 +3767,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; d3d12_command_list_clear(list, &list->device->vk_procs, &attachment_desc, &color_reference, NULL, - rtv_desc->vk_view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, + rtv_desc->view, rtv_desc->width, rtv_desc->height, rtv_desc->layer_count, &clear_value, rect_count, rects); } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 44f323350056..f6dffbfda31e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1099,12 +1099,12 @@ static struct vkd3d_view *vkd3d_view_create(void) return view; } -static void vkd3d_view_incref(struct vkd3d_view *view) +void vkd3d_view_incref(struct vkd3d_view *view) { InterlockedIncrement(&view->refcount); } -static void vkd3d_view_decref(struct vkd3d_view *view, +static void vkd3d_view_decref_descriptor(struct vkd3d_view *view, const struct d3d12_desc *descriptor, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1115,7 +1115,11 @@ static void vkd3d_view_decref(struct vkd3d_view *view, TRACE("Destroying view %p.\n", view); - if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) + if (!descriptor) + { + VK_CALL(vkDestroyImageView(device->vk_device, view->u.vk_image_view, NULL)); + } + else if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) @@ -1134,6 +1138,11 @@ static void vkd3d_view_decref(struct vkd3d_view *view, vkd3d_free(view); } +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) +{ + vkd3d_view_decref_descriptor(view, NULL, device); +} + static void d3d12_desc_destroy(struct d3d12_desc *descriptor, struct d3d12_device *device) { @@ -1142,7 +1151,7 @@ static void d3d12_desc_destroy(struct d3d12_desc *descriptor, || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV || descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) { - vkd3d_view_decref(descriptor->u.view, descriptor, device); + vkd3d_view_decref_descriptor(descriptor->u.view, descriptor, device); } memset(descriptor, 0, sizeof(*descriptor)); @@ -1789,12 +1798,10 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, /* RTVs */ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_device *device) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - if (rtv->magic != VKD3D_DESCRIPTOR_MAGIC_RTV) return; - VK_CALL(vkDestroyImageView(device->vk_device, rtv->vk_view, NULL)); + vkd3d_view_decref(rtv->view, device); memset(rtv, 0, sizeof(*rtv)); } @@ -1803,6 +1810,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev { const struct vkd3d_format *format; VkImageViewType vk_view_type; + struct vkd3d_view *view; uint32_t miplevel_idx; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -1834,30 +1842,35 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc && desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + if (!(view = vkd3d_view_create())) + return; + miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; vk_view_type = resource->desc.DepthOrArraySize > 1 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &rtv_desc->vk_view) < 0) + miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &view->u.vk_image_view) < 0) + { + vkd3d_free(view); return; + } + rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->format = format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); rtv_desc->layer_count = resource->desc.DepthOrArraySize; - rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; + rtv_desc->view = view; rtv_desc->resource = resource; } /* DSVs */ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_device *device) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - if (dsv->magic != VKD3D_DESCRIPTOR_MAGIC_DSV) return; - VK_CALL(vkDestroyImageView(device->vk_device, dsv->vk_view, NULL)); + vkd3d_view_decref(dsv->view, device); memset(dsv, 0, sizeof(*dsv)); } @@ -1865,6 +1878,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { const struct vkd3d_format *format; + struct vkd3d_view *view; uint32_t miplevel_idx; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -1896,15 +1910,19 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev if (desc && desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); + if (!(view = vkd3d_view_create())) + return; + miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D, - miplevel_idx, 1, 0, 1, false, &dsv_desc->vk_view) < 0) + miplevel_idx, 1, 0, 1, false, &view->u.vk_image_view) < 0) return; + dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; dsv_desc->format = format->vk_format; dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); - dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; + dsv_desc->view = view; dsv_desc->resource = resource; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 278f4f615c35..9b5d5db0c57a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -257,6 +257,9 @@ struct vkd3d_view VkBufferView vk_counter_view; }; +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN; +void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; + struct d3d12_desc { uint32_t magic; @@ -306,7 +309,7 @@ struct d3d12_rtv_desc uint64_t width; unsigned int height; unsigned int layer_count; - VkImageView vk_view; + struct vkd3d_view *view; struct d3d12_resource *resource; }; @@ -324,7 +327,7 @@ struct d3d12_dsv_desc VkFormat format; uint64_t width; unsigned int height; - VkImageView vk_view; + struct vkd3d_view *view; struct d3d12_resource *resource; }; @@ -561,6 +564,10 @@ struct d3d12_command_allocator size_t descriptor_pools_size; size_t descriptor_pool_count; + struct vkd3d_view **views; + size_t views_size; + size_t view_count; + VkBufferView *buffer_views; size_t buffer_views_size; size_t buffer_view_count; -- 2.16.4

2 1

[PATCH resend vkd3d 8/8] vkd3d-utils: Detect surface extensions at runtime.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-utils/vkd3d_utils_main.c | 16 ++++++++++++---- libs/vkd3d-utils/vkd3d_utils_private.h | 9 +++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79e31553cb7c..3ee2f130c50d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_CFLAGS = @XCB_CFLAGS@ libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 8c2503784e37..fa6e5f8f1616 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -28,15 +28,18 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, -#ifdef HAVE_XCB - VK_KHR_XCB_SURFACE_EXTENSION_NAME, -#endif + }; + static const char * const optional_instance_extensions[] = + { + "VK_KHR_xcb_surface", + "VK_MVK_macos_surface", }; static const char * const device_extensions[] = { @@ -49,9 +52,14 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = NULL; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 55d5300de0c1..6b5851e6bfc4 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,19 +19,16 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H -#include "vkd3d_memory.h" -#include <vkd3d_utils.h> - #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES -#ifdef HAVE_XCB -# define VK_USE_PLATFORM_XCB_KHR -#endif #include <pthread.h> #include <vkd3d.h> +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

2 1

[PATCH resend vkd3d 7/8] build: Add support for MoltenVK.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 90557ee42e68..ada7e9a7f0f8 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,10 @@ AC_CHECK_LIB([pthread], [pthread_create], AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], -- 2.16.4

3 2

[PATCH v2 vkd3d 6/8] build: Detect soname of libvulkan at configure time.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Remove usage of $LIBEXT. --- configure.ac | 6 +++--- libs/vkd3d/device.c | 4 ++-- m4/check-soname.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 m4/check-soname.m4 diff --git a/configure.ac b/configure.ac index b5123b8d11de..90557ee42e68 100644 --- a/configure.ac +++ b/configure.ac @@ -77,9 +77,9 @@ AC_CHECK_LIB([pthread], [pthread_create], [AC_MSG_ERROR([libpthread not found.])]) AC_SUBST([VULKAN_LIBS]) -AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan"], + [AC_MSG_ERROR([libvulkan not found.])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8280fd5d03be..c11f474a28d2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -283,9 +283,9 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (!vkGetInstanceProcAddr) { - if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + if (!(instance->libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) { - ERR("Failed to load libvulkan.\n"); + ERR("Failed to load libvulkan: %s.\n", dlerror()); return E_FAIL; } diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 new file mode 100644 index 000000000000..f1953413fa75 --- /dev/null +++ b/m4/check-soname.m4 @@ -0,0 +1,54 @@ +dnl +dnl Copyright 2002 Alexandre Julliard +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +dnl +dnl As a special exception to the GNU Lesser General Public License, +dnl if you distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it +dnl under the same distribution terms that you use for the rest of +dnl that program. + +dnl VKD3D_PATH_SONAME_TOOLS +AC_DEFUN([VKD3D_PATH_SONAME_TOOLS], +[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) +AC_CHECK_TOOL(OTOOL,otool,otool) +AC_CHECK_TOOL(READELF,[readelf],true)]) + +dnl VKD3D_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) +AC_DEFUN([VKD3D_CHECK_SONAME], +[AC_REQUIRE([VKD3D_PATH_SONAME_TOOLS])dnl +AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl +m4_pushdef([ac_lib_pattern],m4_default([$6],[lib$1]))dnl +AC_MSG_CHECKING([for -l$1]) +AC_CACHE_VAL(ac_Lib, +[ac_check_soname_save_LIBS=$LIBS + LIBS="-l$1 $5 $LIBS" + AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], + [AS_CASE(["$host_os"], + [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[[[^ ]]*\$\\).*$/\1/"';2,$d'`]) + AS_VAR_IF([ac_Lib],[], + [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[" | sed -e "s/^.*$]ac_lib_pattern[[[^ ]]*$.*$/\1/"';2,$d'`])])])]) + LIBS=$ac_check_soname_save_LIBS])dnl +AS_VAR_IF([ac_Lib],[], + [AC_MSG_RESULT([not found]) + $4], + [AC_MSG_RESULT(AS_VAR_GET(ac_Lib)) + AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["], + [Define to the soname of the lib$1 library.]) + $3])dnl +m4_popdef([ac_lib_pattern])dnl +AS_VAR_POPDEF([ac_Lib])]) -- 2.16.4

3 2

[PATCH resend vkd3d 5/8] build: Make libxcb optional.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 19 ++++++++++++++----- libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_private.h | 14 ++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index ddc6c972008f..b5123b8d11de 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) @@ -80,13 +81,17 @@ AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes])]) + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], + [with_spirv_tools=no]) -PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) +HAVE_XCB=no +AS_IF([test "x$with_xcb" != "xno"], + [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) + HAVE_XCB=yes], + [HAVE_XCB=no])]) dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) @@ -96,7 +101,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +dnl Makefiles AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) +AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], + [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) @@ -112,7 +120,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION - Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Have XCB: ${HAVE_XCB} + Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2c4d89a7e38e..8c2503784e37 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -34,7 +34,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, +#ifdef HAVE_XCB VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif }; static const char * const device_extensions[] = { diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 6aa0df6eeef5..55d5300de0c1 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,17 +19,19 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + +#define COBJMACROS +#define NONAMELESSUNION #define VK_NO_PROTOTYPES -#define VK_USE_PLATFORM_XCB_KHR +#ifdef HAVE_XCB +# define VK_USE_PLATFORM_XCB_KHR +#endif #include <pthread.h> #include <vkd3d.h> -#define COBJMACROS -#define NONAMELESSUNION -#include "vkd3d_memory.h" -#include "vkd3d_utils.h" - struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

3 2

[PATCH vkd3d 4/8] tests: Add test for CPU descriptors lifetime.
by Józef Kucia 21 Aug '18

21 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f340d0915a7c..cf51ab9bbcdd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18077,6 +18077,133 @@ static void test_render_a8(void) destroy_test_context(&context); } +static void test_cpu_descriptors_lifetime(void) +{ + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + ID3D12Resource *red_resource, *blue_resource; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + ID3D12DescriptorHeap *rtv_heap; + D3D12_CLEAR_VALUE clear_value; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&red_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + clear_value.Color[0] = 0.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 1.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&blue_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff0000ff, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xffff0000, 0); + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + /* Try again with OMSetRenderTargets(). */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(blue_resource); + ID3D12Resource_Release(red_resource); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -18189,4 +18316,5 @@ START_TEST(d3d12) run_test(test_geometry_shader); run_test(test_layered_rendering); run_test(test_render_a8); + run_test(test_cpu_descriptors_lifetime); } -- 2.16.4

2 1