September 2018 - Wine-commits

Józef Kucia : include: Add d3d11on12 header.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 43c0e33f7c96e7439102c0cc5b9c449200de5426 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c0e33f7c96e7439102c0cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 12:20:29 2018 +0200 include: Add d3d11on12 header. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d11on12.idl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 74dc293..f90fe84 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 0000000..4208391 --- /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);

1 0

Józef Kucia : d3d11: Add D3D11On12CreateDevice() stub.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 8a985174ebc1b041d9a4f1abbdc184fe692d25bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a985174ebc1b041d9a4f1ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 12:20:30 2018 +0200 d3d11: Add D3D11On12CreateDevice() stub. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 60c77f9..267778a 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 5d085ed..6d98116 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; +}

1 0

Nikolay Sivov : d2d1: Implement GetSurface() for bitmaps.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: ef6a8dc16d186112da665def9a32bd54662b7764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef6a8dc16d186112da665def… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 16 18:51:19 2018 +0300 d2d1: Implement GetSurface() for bitmaps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 64 +++++++++++++++++++++++++-------------------- dlls/d2d1/d2d1_private.h | 12 ++++++--- dlls/d2d1/device.c | 9 +++---- dlls/d2d1/tests/d2d1.c | 67 +++++++++++++++++++++++++++++------------------- 4 files changed, 88 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef6a8dc16d186112da66…

1 0

Nikolay Sivov : include: Add ID2D1BitmapBrush1 definition.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 86f0fe98891292889c075038ac58bb1baf3317ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f0fe98891292889c075038… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 16 18:51:20 2018 +0300 include: Add ID2D1BitmapBrush1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ff283f8..284bd60 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -288,6 +288,19 @@ interface ID2D1Bitmap1 : ID2D1Bitmap [ object, + uuid(41343a53-e41a-49a2-91cd-21793bbb62e5), + local, +] +interface ID2D1BitmapBrush1 : ID2D1BitmapBrush +{ + void SetInterpolationMode1( + [in] D2D1_INTERPOLATION_MODE mode + ); + D2D1_INTERPOLATION_MODE GetInterpolationMode1(); +} + +[ + object, uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), local, ]

1 0

Józef Kucia : wined3d: Use get_format_internal() to get WINED3DFMT_UNKNOWN.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 62d1b643335aa83d248b73d3e08ea7753f6fb143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d1b643335aa83d248b73d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:22 2018 +0200 wined3d: Use get_format_internal() to get WINED3DFMT_UNKNOWN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0f8ee71..b4a3c1d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3982,7 +3982,7 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *ad { FIXME("Can't find format %s (%#x) in the format lookup table.\n", debug_d3dformat(format_id), format_id); - return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return get_format_internal(adapter, WINED3DFMT_UNKNOWN); } format = &adapter->formats[idx]; @@ -3997,7 +3997,7 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *ad FIXME("Cannot find depth/stencil typeless format %s (%#x).\n", debug_d3dformat(format_id), format_id); - return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return get_format_internal(adapter, WINED3DFMT_UNKNOWN); } return format;

1 0

Józef Kucia : wined3d: Add missing formats to debug_d3dformat().
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: e1c59f12c56bdc1c319e6c7cf77089a910c78393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1c59f12c56bdc1c319e6c7c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:23 2018 +0200 wined3d: Add missing formats to debug_d3dformat(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b4a3c1d..904baef 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4142,6 +4142,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R5G5_SNORM_L6_UNORM); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); FMT_TO_STR(WINED3DFMT_R10G11B11_SNORM); + FMT_TO_STR(WINED3DFMT_R10G10B10X2_TYPELESS); FMT_TO_STR(WINED3DFMT_R10G10B10X2_UINT); FMT_TO_STR(WINED3DFMT_R10G10B10X2_SNORM); FMT_TO_STR(WINED3DFMT_R10G10B10_SNORM_A2_UNORM); @@ -4167,6 +4168,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); FMT_TO_STR(WINED3DFMT_ATI1N); FMT_TO_STR(WINED3DFMT_ATI2N); + FMT_TO_STR(WINED3DFMT_INST); FMT_TO_STR(WINED3DFMT_NVDB); FMT_TO_STR(WINED3DFMT_NVHU); FMT_TO_STR(WINED3DFMT_NVHS);

1 0

Józef Kucia : wined3d: Store additional flags directly in wined3d_format_block_info.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 15e594ae4734546e886af37670a48c8e49bc637a URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e594ae4734546e886af376… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:24 2018 +0200 wined3d: Store additional flags directly in wined3d_format_block_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 904baef..eb4001d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -570,31 +570,30 @@ struct wined3d_format_block_info UINT block_width; UINT block_height; UINT block_byte_count; - BOOL verify; - BOOL compressed; + unsigned int flags; }; static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8, TRUE, TRUE}, - {WINED3DFMT_DXT2, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_DXT3, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_DXT4, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_DXT5, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_BC1_UNORM, 4, 4, 8, TRUE, TRUE}, - {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE, TRUE}, - {WINED3DFMT_BC4_SNORM, 4, 4, 8, TRUE, TRUE}, - {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_BC6H_SF16, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_BC7_UNORM, 4, 4, 16, TRUE, TRUE}, - {WINED3DFMT_ATI1N, 4, 4, 8, FALSE, TRUE}, - {WINED3DFMT_ATI2N, 4, 4, 16, FALSE, TRUE}, - {WINED3DFMT_YUY2, 2, 1, 4, FALSE, FALSE}, - {WINED3DFMT_UYVY, 2, 1, 4, FALSE, FALSE}, + {WINED3DFMT_DXT1, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT2, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT3, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT4, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT5, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC1_UNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC2_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC3_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC4_UNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC4_SNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC5_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC5_SNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC6H_UF16, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC6H_SF16, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC7_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_ATI1N, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_ATI2N, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_YUY2, 2, 1, 4, WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_UYVY, 2, 1, 4, WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, }; struct wined3d_format_vertex_info @@ -2103,23 +2102,17 @@ fail: static BOOL init_format_block_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; - unsigned int flags, i; + unsigned int i; for (i = 0; i < ARRAY_SIZE(format_block_info); ++i) { if (!(format = get_format_internal(adapter, format_block_info[i].id))) return FALSE; - flags = WINED3DFMT_FLAG_BLOCKS; - if (!format_block_info[i].verify) - flags |= WINED3DFMT_FLAG_BLOCKS_NO_VERIFY; - if (format_block_info[i].compressed) - flags |= WINED3DFMT_FLAG_COMPRESSED; - format->block_width = format_block_info[i].block_width; format->block_height = format_block_info[i].block_height; format->block_byte_count = format_block_info[i].block_byte_count; - format_set_flag(format, flags); + format_set_flag(format, WINED3DFMT_FLAG_BLOCKS | format_block_info[i].flags); } return TRUE;

1 0

Józef Kucia : wined3d: Initialise typeless_id for typeless formats early.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 34b7e19cdbf5504519fe6a5cfcbfaf371a56f000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34b7e19cdbf5504519fe6a5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:25 2018 +0200 wined3d: Initialise typeless_id for typeless formats early. Allows us to use wined3d_format_is_typeless() while initialising formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index eb4001d..0d87ffd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2025,7 +2025,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) { - const struct wined3d_format *typeless_format; + struct wined3d_format *typeless_format; unsigned int component_count = 0; DWORD flags = 0; @@ -2052,6 +2052,8 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) format->block_byte_count = typeless_format->block_byte_count; format->typeless_id = typeless_format->id; + typeless_format->typeless_id = typeless_format->id; + for (j = 0; j < strlen(typed_formats[i].channels); ++j) { enum wined3d_channel_type channel_type = map_channel_type(typed_formats[i].channels[j]);

1 0

Józef Kucia : wined3d: Initialise typeless formats after all formats properties are initialised.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 454f87980a8e19f20c56755a686406baf4dd203e URL: https://source.winehq.org/git/wine.git/?a=commit;h=454f87980a8e19f20c56755a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:26 2018 +0200 wined3d: Initialise typeless formats after all formats properties are initialised. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0d87ffd..b19f18f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3954,10 +3954,11 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi apply_format_fixups(adapter, gl_info); init_format_fbo_compat_info(adapter, ctx); init_format_filter_info(adapter, gl_info); - if (!init_typeless_formats(adapter)) goto fail; init_format_gen_mipmap_info(adapter, gl_info); init_format_depth_bias_scale(adapter, ctx); + if (!init_typeless_formats(adapter)) goto fail; + return TRUE; fail:

1 0

Józef Kucia : wined3d: Move get_flexible_vertex_size( ) to device.c.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 51db33ca070e16f7e2f3fc6e0c7cb9e432c0e0da URL: https://source.winehq.org/git/wine.git/?a=commit;h=51db33ca070e16f7e2f3fc6e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 11:06:27 2018 +0200 wined3d: Move get_flexible_vertex_size() to device.c. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 27 --------------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f6a0b39..667b90b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3016,6 +3016,36 @@ unsigned int CDECL wined3d_device_get_max_frame_latency(const struct wined3d_dev return device->max_frame_latency; } +static DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) +{ + DWORD size = 0; + int i; + int numTextures = (d3dvtVertexType & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; + + if (d3dvtVertexType & WINED3DFVF_NORMAL) size += 3 * sizeof(float); + if (d3dvtVertexType & WINED3DFVF_DIFFUSE) size += sizeof(DWORD); + if (d3dvtVertexType & WINED3DFVF_SPECULAR) size += sizeof(DWORD); + if (d3dvtVertexType & WINED3DFVF_PSIZE) size += sizeof(DWORD); + switch (d3dvtVertexType & WINED3DFVF_POSITION_MASK) + { + case WINED3DFVF_XYZ: size += 3 * sizeof(float); break; + case WINED3DFVF_XYZRHW: size += 4 * sizeof(float); break; + case WINED3DFVF_XYZB1: size += 4 * sizeof(float); break; + case WINED3DFVF_XYZB2: size += 5 * sizeof(float); break; + case WINED3DFVF_XYZB3: size += 6 * sizeof(float); break; + case WINED3DFVF_XYZB4: size += 7 * sizeof(float); break; + case WINED3DFVF_XYZB5: size += 8 * sizeof(float); break; + case WINED3DFVF_XYZW: size += 4 * sizeof(float); break; + default: FIXME("Unexpected position mask %#x.\n", d3dvtVertexType & WINED3DFVF_POSITION_MASK); + } + for (i = 0; i < numTextures; i++) + { + size += GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, i) * sizeof(float); + } + + return size; +} + /* Context activation is done by the caller. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b19f18f..db27270 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5563,33 +5563,6 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr *dst = tmp; } -DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { - DWORD size = 0; - int i; - int numTextures = (d3dvtVertexType & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; - - if (d3dvtVertexType & WINED3DFVF_NORMAL) size += 3 * sizeof(float); - if (d3dvtVertexType & WINED3DFVF_DIFFUSE) size += sizeof(DWORD); - if (d3dvtVertexType & WINED3DFVF_SPECULAR) size += sizeof(DWORD); - if (d3dvtVertexType & WINED3DFVF_PSIZE) size += sizeof(DWORD); - switch (d3dvtVertexType & WINED3DFVF_POSITION_MASK) { - case WINED3DFVF_XYZ: size += 3 * sizeof(float); break; - case WINED3DFVF_XYZRHW: size += 4 * sizeof(float); break; - case WINED3DFVF_XYZB1: size += 4 * sizeof(float); break; - case WINED3DFVF_XYZB2: size += 5 * sizeof(float); break; - case WINED3DFVF_XYZB3: size += 6 * sizeof(float); break; - case WINED3DFVF_XYZB4: size += 7 * sizeof(float); break; - case WINED3DFVF_XYZB5: size += 8 * sizeof(float); break; - case WINED3DFVF_XYZW: size += 4 * sizeof(float); break; - default: ERR("Unexpected position mask\n"); - } - for (i = 0; i < numTextures; i++) { - size += GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, i) * sizeof(float); - } - - return size; -} - unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) { /* On core profile we have to also count diffuse and specular colors and the diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aea874f..19341a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1540,7 +1540,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_draw_parameters *draw_parameters) DECLSPEC_HIDDEN; void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *dispatch_parameters) DECLSPEC_HIDDEN; -DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define eps 1e-8f

1 0