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

[PATCH] kernel32: add stub for GetApplicationRestartSettings
by Louis Lenders 27 Aug '18

27 Aug '18

Found this trying to start newest firefox 61.0.2. This prevents crashing it. (note: also removed a superfluous extra emply line few lines above this change) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 ++++++++++- include/winbase.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c53276c70a..f1d75b8e1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -543,7 +543,7 @@ @ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d615f06c4a..b2e3aeee98 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3953,7 +3953,6 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) return FALSE; } - /*********************************************************************** * RegisterApplicationRestart (KERNEL32.@) */ @@ -4023,6 +4022,16 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return E_FAIL; } +/*********************************************************************** + * GetApplicationRestartSettings (KERNEL32.@) + */ +HRESULT WINAPI GetApplicationRestartSettings(HANDLE process, WCHAR *cmdline, DWORD *size, DWORD *flags) +{ + FIXME("%p, %p, %p, %p)\n", process, cmdline, size, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return E_FAIL; +} + /********************************************************************** * GetNumaHighestNodeNumber (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index aa57dae818..8b26308b95 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2038,6 +2038,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT); #define GetAtomName WINELIB_NAME_AW(GetAtomName) -- 2.17.1

2 2

[PATCH vkd3d 09/10] tests: Add test for clearing 3D textures.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7261e89e82df..1c6b65fa758a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3311,10 +3311,12 @@ static void test_clear_render_target_view(void) ID3D12DescriptorHeap *rtv_heap; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; + struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; ID3D12Device *device; + D3D12_BOX box; HRESULT hr; memset(&desc, 0, sizeof(desc)); @@ -3388,6 +3390,48 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 3D texture */ + ID3D12Resource_Release(resource); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; + resource_desc.DepthOrArraySize = 32; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); + + reset_command_list(command_list, context.allocator); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resource, 0, queue, command_list, 0xbf4c7f19, 2); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE3D; + rtv_desc.Texture3D.FirstWSlice = 2; + rtv_desc.Texture3D.WSize = 2; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 32, 32, 2); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 2, 32, 32, 4); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 0, 0, 4, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context); -- 2.16.4

1 0

[PATCH vkd3d 05/10] vkd3d: Add support for 2D array texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d9cc48db319e..77a346ea7df7 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1489,6 +1489,17 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture2DArray.MipLevels; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + if (desc->u.Texture2DArray.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; @@ -1878,6 +1889,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; @@ -1962,6 +1981,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev case D3D12_DSV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; break; + case D3D12_DSV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } -- 2.16.4

1 0

[PATCH vkd3d 04/10] vkd3d: Add support for 3D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 71 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index faf9a710cef1..d9cc48db319e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -309,8 +309,7 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) { unsigned int size = max(desc->Width, desc->Height); - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - size = max(size, desc->DepthOrArraySize); + size = max(size, d3d12_resource_desc_get_depth(desc, 0)); return vkd3d_log2i(size) + 1; } @@ -339,6 +338,8 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.format = format->vk_format; @@ -1311,7 +1312,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->miplevel_idx = 0; desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + desc->layer_count = d3d12_resource_desc_get_layer_count(&resource->desc); switch (resource->desc.Dimension) { @@ -1488,6 +1489,13 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture3D.MipLevels; + if (desc->u.Texture3D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; @@ -1612,27 +1620,30 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc) { - if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) - { - if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - - vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; - } - else if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2DARRAY) - { - if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); - - vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; - vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; - vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; - } - else + switch (desc->ViewDimension) { - WARN("Unexpected view dimension %#x.\n", desc->ViewDimension); - return; + case D3D12_UAV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + if (desc->u.Texture3D.FirstWSlice || desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize) + FIXME("Unhandled depth view %u-%u.\n", + desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } @@ -1867,10 +1878,22 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; + vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } + else if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = 0; + vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; + } if (!(view = vkd3d_view_create())) return; @@ -1885,7 +1908,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); - rtv_desc->layer_count = resource->desc.DepthOrArraySize; + rtv_desc->layer_count = vkd3d_desc.layer_count; rtv_desc->view = view; rtv_desc->resource = resource; } -- 2.16.4

1 0

[PATCH vkd3d 03/10] vkd3d: Add support for default 3D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 03015bf45cbd..faf9a710cef1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1325,6 +1325,11 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; break; + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + desc->view_type = VK_IMAGE_VIEW_TYPE_3D; + desc->layer_count = 1; + break; + default: FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); return false; @@ -1909,6 +1914,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } + if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + WARN("Cannot create DSV for 3D texture.\n"); + return; + } + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0, VKD3D_VIEW_TYPE_DSV)) return; -- 2.16.4

1 0

[PATCH vkd3d 02/10] vkd3d: Add support for default 1D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d4d1b38f7496..03015bf45cbd 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1308,15 +1308,21 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return false; } + desc->miplevel_idx = 0; + desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; + desc->layer_idx = 0; + desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + switch (resource->desc.Dimension) { + case D3D12_RESOURCE_DIMENSION_TEXTURE1D: + desc->view_type = resource->desc.DepthOrArraySize > 1 + ? VK_IMAGE_VIEW_TYPE_1D_ARRAY : VK_IMAGE_VIEW_TYPE_1D; + break; + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: desc->view_type = resource->desc.DepthOrArraySize > 1 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - desc->miplevel_idx = 0; - desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; - desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; break; default: @@ -1337,7 +1343,7 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, struct VkImageViewCreateInfo view_desc; VkResult vr; - assert(resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D); + assert(d3d12_resource_is_texture(resource)); view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; view_desc.pNext = NULL; -- 2.16.4

1 0

[PATCH 1/4] wined3d: Add max_rt_count field to d3d_info.
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/cs.c | 17 +++++++++-------- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8c1cce457ed0..af17df83cd02 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7bd51f4c2a19..ecfce4181235 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -588,7 +588,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; + unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; @@ -839,6 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_state *state = &cs->state; @@ -893,7 +894,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->textures[i]) wined3d_resource_release(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_release(state->fb->render_targets[i]->resource); @@ -906,7 +907,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, - BOOL indexed, const struct wined3d_gl_info *gl_info) + BOOL indexed, const struct wined3d_d3d_info *d3d_info) { unsigned int i; @@ -927,7 +928,7 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -943,7 +944,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -959,7 +960,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -967,7 +968,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -980,7 +981,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab67a967a3fa..96b8d3c247d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -970,7 +970,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -1240,7 +1240,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4380,11 +4380,14 @@ void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { + unsigned int max_rt_count; + TRACE("device %p, view_idx %u.\n", device, view_idx); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } @@ -4402,13 +4405,15 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) { struct wined3d_rendertarget_view *prev; + unsigned int max_rt_count; TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", device, view_idx, view, set_viewport); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return WINED3DERR_INVALIDCALL; } @@ -4706,6 +4711,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; @@ -4739,7 +4745,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -5038,7 +5044,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774cd48caec6..8fa3a2492dfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2201,7 +2201,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->AdapterOrdinalInGroup = 0; caps->NumberOfAdaptersInGroup = 1; - caps->NumSimultaneousRTs = gl_info->limits.buffers; + caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; caps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de0b4867de79..bc031890960e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -164,6 +164,7 @@ struct wined3d_d3d_limits unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + unsigned int max_rt_count; float pointsize_max; }; -- 2.16.4

2 1

[PATCH 2/4] wined3d: Pass context to wined3d_texture_set_compatible_renderbuffer().
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/texture.c | 7 +++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9d2236bc17a0..a4cfd66dfc42 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -608,7 +608,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { - wined3d_texture_set_compatible_renderbuffer(ds_texture, ds_level, &render_targets[0]); + wined3d_texture_set_compatible_renderbuffer(ds_texture, context, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7cc03fe4821e..f72442d1ddfe 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1453,15 +1453,14 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, - unsigned int level, const struct wined3d_rendertarget_info *rt) + struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_renderbuffer_entry *entry; - const struct wined3d_gl_info *gl_info; unsigned int src_width, src_height; unsigned int width, height; GLuint renderbuffer = 0; - gl_info = &texture->resource.device->adapter->gl_info; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) return; @@ -1528,7 +1527,7 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture texture->current_renderbuffer = entry; } - checkGLcall("set_compatible_renderbuffer"); + checkGLcall("set compatible renderbuffer"); } HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc031890960e..8da12d7cf3f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3366,7 +3366,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, -- 2.16.4

2 1

[PATCH 4/4] dxgi: Choose exact formats for D3D12 swapchain fallback formats.
by Józef Kucia 27 Aug '18

27 Aug '18

Mainly to avoid gamma correction issues. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 83e0f256748f..101f2d185e17 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1694,6 +1694,32 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return DXGI_FORMAT_UNKNOWN; + } +} + +static VkFormat get_swapchain_fallback_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return VK_FORMAT_UNDEFINED; + } +} + static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, VkSurfaceKHR vk_surface, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat *vk_format) @@ -1734,10 +1760,11 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, if (i == format_count) { /* Try to create a swapchain with format conversion. */ + format = get_swapchain_fallback_format(format); WARN("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); for (i = 0; i < format_count; ++i) { - if (formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) { format = formats[i].format; break; @@ -1757,20 +1784,6 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, return S_OK; } -static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) -{ - switch (vk_format) - { - case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; - case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; - default: - FIXME("Unhandled format %#x.\n", vk_format); - return DXGI_FORMAT_UNKNOWN; - } -} - static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, uint32_t memory_type_mask, VkMemoryPropertyFlags flags, uint32_t *memory_type_index) -- 2.16.4

2 1

[PATCH 3/4] wined3d: Avoid accessing gl_info in vertexdeclaration_init().
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/vertexdeclaration.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a4cfd66dfc42..83e35638bc6e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3683,7 +3683,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (use_vs(state)) { - if (state->vertex_declaration->half_float_conv_needed) + if (state->vertex_declaration->have_half_floats && !gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { TRACE("Using immediate mode draw with vertex shaders for FLOAT16 conversion.\n"); context->use_immediate_mode_draw = TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 9098b3225c85..c050a6dda9f1 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -174,7 +174,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; unsigned int i; if (TRACE_ON(d3d_decl)) @@ -218,7 +217,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tesselation pseudo streams. */ - if (e->input_slot >= MAX_STREAMS) continue; + if (e->input_slot >= MAX_STREAMS) + continue; if (!e->format->gl_vtx_format) { @@ -254,7 +254,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) { - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) declaration->half_float_conv_needed = TRUE; + declaration->have_half_floats = TRUE; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8da12d7cf3f3..da3cd4615686 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3463,10 +3463,10 @@ struct wined3d_vertex_declaration struct wined3d_device *device; struct wined3d_vertex_declaration_element *elements; - UINT element_count; + unsigned int element_count; BOOL position_transformed; - BOOL half_float_conv_needed; + BOOL have_half_floats; }; struct wined3d_saved_states -- 2.16.4

2 1