Wine-Devel

By thread

wine-devel@list.winehq.org

September 2018

70 participants
1549 messages

Re: Wrap-up of wineconf

by Hugh McMaster

On Saturday, 1 September 2018 8:14 AM, Francois Gouget wrote: > Here are my photos (sorted, deduplicated, stiched up and labeled; they > got fast-tracked to the head of the photo sorting queue). Very nice! Thank you for your hard work. :) Hugh

Sept. 17, 2018

Re: [PATCH 7/7] wined3d: Cleanup get_flexible_vertex_size().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 17, 2018

Re: [PATCH 6/7] wined3d: Move get_flexible_vertex_size() to device.c.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 17, 2018

Re: [PATCH 5/7] wined3d: Initialise typeless formats after all formats properties are initialised.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 17, 2018

Re: [PATCH 2/7] wined3d: Add missing formats to debug_d3dformat().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 17, 2018

Re: [PATCH 4/7] wined3d: Initialise typeless_id for typeless formats early.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 17, 2018

Re: [PATCH 3/7] wined3d: Store additional flags directly in wined3d_format_block_info.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 17, 2018

Re: [PATCH 1/7] wined3d: Use get_format_internal() to get WINED3DFMT_UNKNOWN.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 17, 2018

[PATCH 2/2] d3d11: Add D3D11On12CreateDevice() stub.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 1 + dlls/d3d11/d3d11_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 60c77f9d3097..267778ab1439 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -4,6 +4,7 @@ @ stdcall D3D11CoreRegisterLayers() @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) +@ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stub D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 5d085edf2fee..6d981160f245 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -377,3 +377,18 @@ cleanup: return hr; } + +HRESULT WINAPI D3D11On12CreateDevice(IUnknown *device, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, + IUnknown * const *queues, UINT queue_count, UINT node_mask, + ID3D11Device **d3d11_device, ID3D11DeviceContext **d3d11_immediate_context, + D3D_FEATURE_LEVEL *obtained_feature_level) +{ + FIXME("device %p, flags %#x, feature_levels %p, feature_level_count %u, " + "queues %p, queue_count %u, node_mask 0x%08x, " + "d3d11_device %p, d3d11_immediate_context %p, obtained_feature_level %p stub!\n", + device, flags, feature_levels, feature_level_count, queues, queue_count, + node_mask, d3d11_device, d3d11_immediate_context, obtained_feature_level); + + return E_NOTIMPL; +} -- 2.16.4

Sept. 17, 2018

[PATCH 1/2] include: Add d3d11on12 header.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/Makefile.in | 1 + include/d3d11on12.idl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 include/d3d11on12.idl diff --git a/include/Makefile.in b/include/Makefile.in index 74dc293a2939..f90fe842083c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -95,6 +95,7 @@ SOURCES = \ d3d11_2.idl \ d3d11_3.idl \ d3d11_4.idl \ + d3d11on12.idl \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ diff --git a/include/d3d11on12.idl b/include/d3d11on12.idl new file mode 100644 index 000000000000..5a866d7a89d6 --- /dev/null +++ b/include/d3d11on12.idl @@ -0,0 +1,61 @@ +/* + * Copyright 2018 Józef Kucia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "d3d11.idl"; +import "d3d12.idl"; + +typedef struct D3D11_RESOURCE_FLAGS +{ + UINT BindFlags; + UINT MiscFlags; + UINT CPUAccessFlags; + UINT StructureByteStride; +} D3D11_RESOURCE_FLAGS; + +[ + uuid(85611e73-70a9-490e-9614-a9e302777904), + object, + local, + pointer_default(unique) +] +interface ID3D11On12Device : IUnknown +{ + HRESULT CreateWrappedResource(IUnknown *d3d12_resource, + const D3D11_RESOURCE_FLAGS *flags, + D3D12_RESOURCE_STATES input_state, + D3D12_RESOURCE_STATES output_state, + REFIID iid, void **d3d11_resource); + + void ReleaseWrappedResources(ID3D11Resource * const *resources, UINT count); + + void AcquireWrappedResources(ID3D11Resource * const *resources, UINT count); +} + +[local] HRESULT __stdcall D3D11On12CreateDevice(IUnknown *device, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, + IUnknown * const *queues, UINT queue_count, UINT node_mask, + ID3D11Device **d3d11_device, ID3D11DeviceContext **d3d11_immediate_context, + D3D_FEATURE_LEVEL *obtained_feature_level); + +typedef HRESULT (__stdcall *PFN_D3D11ON12_CREATE_DEVICE)(IUnknown *device, UINT FLAGS, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, + IUnknown * const *queues, UINT queue_count, UINT node_mask, + ID3D11Device **d3d11_device, ID3D11DeviceContext **d3d11_immediate_context, + D3D_FEATURE_LEVEL *obtained_feature_level); -- 2.16.4

Sept. 17, 2018

Jump to page: