September 2018 - Wine-devel

[PATCH 2/5] ole32: Add IDataObject_GetData tests on synthesized format.
by Piotr Caban 27 Sep '18

27 Sep '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/clipboard.c | 82 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-)

2 1

[PATCH 1/5] ole32: Initialize more FORMATETC fields using InitFormatEtc helper.
by Piotr Caban 27 Sep '18

27 Sep '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/clipboard.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

2 1

[PATCH] quartz/tests: Make testpin_{AddRef,Release}() static.
by Francois Gouget 27 Sep '18

27 Sep '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/quartz/tests/filtergraph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 74a3b68e436..e64a9fa69f2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -878,13 +878,13 @@ static HRESULT WINAPI testpin_QueryInterface(IPin *iface, REFIID iid, void **out return E_NOINTERFACE; } -ULONG WINAPI testpin_AddRef(IPin *iface) +static ULONG WINAPI testpin_AddRef(IPin *iface) { struct testpin *pin = impl_from_IPin(iface); return InterlockedIncrement(&pin->ref); } -ULONG WINAPI testpin_Release(IPin *iface) +static ULONG WINAPI testpin_Release(IPin *iface) { struct testpin *pin = impl_from_IPin(iface); return InterlockedDecrement(&pin->ref); -- 2.19.0

1 0

[PATCH] winebus.sys: Add a trailing '\n' to a TRACE().
by Francois Gouget 27 Sep '18

27 Sep '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6b1949ce0e5..cee0ae60734 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -391,7 +391,7 @@ static NTSTATUS handle_IRP_MN_QUERY_DEVICE_RELATIONS(IRP *irp) NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - TRACE("IRP_MN_QUERY_DEVICE_RELATIONS"); + TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); switch (irpsp->Parameters.QueryDeviceRelations.Type) { case EjectionRelations: -- 2.19.0

1 0

[PATCH 4/4] d3d11/tests: Use SetRect() in more places.
by Józef Kucia 26 Sep '18

26 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ab2642279f7..41afdf951327 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9597,10 +9597,7 @@ static void test_scissor(void) hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - scissor_rect.left = 160; - scissor_rect.top = 120; - scissor_rect.right = 480; - scissor_rect.bottom = 360; + SetRect(&scissor_rect, 160, 120, 480, 360); ID3D11DeviceContext_RSSetScissorRects(immediate_context, 1, &scissor_rect); ID3D11DeviceContext_ClearRenderTargetView(immediate_context, test_context.backbuffer_rtv, red); @@ -27272,10 +27269,7 @@ static void test_multiple_viewports(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); ID3D11DeviceContext_RSSetViewports(context, 2, vp); - rects[0].left = 0; - rects[0].top = 0; - rects[0].right = width; - rects[0].bottom = texture_desc.Height / 2; + SetRect(&rects[0], 0, 0, width, texture_desc.Height / 2); memset(&rects[1], 0, sizeof(*rects)); ID3D11DeviceContext_RSSetScissorRects(context, 1, rects); constant.draw_id = 4; @@ -27290,14 +27284,8 @@ static void test_multiple_viewports(void) check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[7], 1); /* Set both rectangles. */ - rects[0].left = 0; - rects[0].top = 0; - rects[0].right = width; - rects[0].bottom = texture_desc.Height / 2; - rects[1].left = width; - rects[1].top = 0; - rects[1].right = width * 2; - rects[1].bottom = texture_desc.Height / 2; + SetRect(&rects[0], 0, 0, width, texture_desc.Height / 2); + SetRect(&rects[1], width, 0, 2 * width, texture_desc.Height / 2); ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); ID3D11DeviceContext_RSSetScissorRects(context, 2, rects); constant.draw_id = 5; -- 2.16.4

2 1

[PATCH 3/4] d3d10core/tests: Use SetRect() in more places.
by Józef Kucia 26 Sep '18

26 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 4ee79af53d78..158a3e39d973 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -4809,10 +4809,7 @@ static void test_scissor(void) hr = ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - scissor_rect.left = 160; - scissor_rect.top = 120; - scissor_rect.right = 480; - scissor_rect.bottom = 360; + SetRect(&scissor_rect, 160, 120, 480, 360); ID3D10Device_RSSetScissorRects(device, 1, &scissor_rect); ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); @@ -16923,10 +16920,7 @@ static void test_multiple_viewports(void) ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); ID3D10Device_RSSetViewports(device, 2, vp); - rects[0].left = 0; - rects[0].top = 0; - rects[0].right = width; - rects[0].bottom = texture_desc.Height / 2; + SetRect(&rects[0], 0, 0, width, texture_desc.Height / 2); memset(&rects[1], 0, sizeof(*rects)); ID3D10Device_RSSetScissorRects(device, 1, rects); constant.draw_id = 4; @@ -16941,14 +16935,8 @@ static void test_multiple_viewports(void) check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[7], 1); /* Set both rectangles. */ - rects[0].left = 0; - rects[0].top = 0; - rects[0].right = width; - rects[0].bottom = texture_desc.Height / 2; - rects[1].left = width; - rects[1].top = 0; - rects[1].right = width * 2; - rects[1].bottom = texture_desc.Height / 2; + SetRect(&rects[0], 0, 0, width, texture_desc.Height / 2); + SetRect(&rects[1], width, 0, 2 * width, texture_desc.Height / 2); ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); ID3D10Device_RSSetScissorRects(device, 2, rects); constant.draw_id = 5; -- 2.16.4

2 1

[PATCH 2/4] d3d10core/tests: Add a few more tests for texture formats.
by Józef Kucia 26 Sep '18

26 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c41a4eb6603c..4ee79af53d78 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -6714,6 +6714,13 @@ static void test_texture(void) 0xffb1c4de, 0xfff0f1f2, 0xfffafdfe, 0xff5a560f, 0xffd5ff00, 0xffc8f99f, 0xffaa00aa, 0xffdd55bb, }; + static const WORD r8g8_data[] = + { + 0x0000, 0xffff, 0x0000, 0x7fff, + 0x0203, 0xff10, 0x0b0c, 0x8000, + 0xc4de, 0xfff0, 0xfdfe, 0x5a6f, + 0xff00, 0xffc8, 0x00aa, 0xdd5b, + }; static const BYTE a8_data[] = { 0x00, 0x10, 0x20, 0x30, @@ -6816,10 +6823,14 @@ static void test_texture(void) {blue_data, 5 * sizeof(*blue_data)}, } }; + static const struct texture r32f_float = {4, 4, 1, 1, DXGI_FORMAT_R32_FLOAT, + {{r32_float, 4 * sizeof(*r32_float)}}}; static const struct texture r32f_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, {{r32_float, 4 * sizeof(*r32_float)}}}; static const struct texture r32u_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, {{r32_uint, 4 * sizeof(*r32_uint)}}}; + static const struct texture r8g8_snorm = {4, 4, 1, 1, DXGI_FORMAT_R8G8_SNORM, + {{r8g8_data, 4 * sizeof(*r8g8_data)}}}; static const struct texture r9g9b9e5_texture = {4, 4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; static const DWORD red_colors[] = @@ -6899,6 +6910,13 @@ static void test_texture(void) 0x7e7e7e7e, 0x7e7e7e7e, 0x7e7e7e7e, 0x7e808080, 0x7e7e7e7e, 0x7e7f7f7f, 0x7e7f7f7f, 0x7e7f7f7f, }; + static const DWORD snorm_colors[] = + { + 0xff000000, 0xff000000, 0xff000000, 0xff00ff00, + 0xff000406, 0xff000020, 0xff001618, 0xff000000, + 0xff000000, 0xff000000, 0xff000000, 0xff00b5df, + 0xff000000, 0xff000000, 0xff000000, 0xff0000b7, + }; static const DWORD r32f_colors[] = { 0xff000000, 0xff0000ff, 0xff00007f, 0xff00007f, @@ -7060,6 +7078,7 @@ static void test_texture(void) #define BC3_UNORM_SRGB DXGI_FORMAT_BC3_UNORM_SRGB #define R8G8B8A8_UNORM_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define R8G8B8A8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define R8G8_SNORM DXGI_FORMAT_R8G8_SNORM #define R32_FLOAT DXGI_FORMAT_R32_FLOAT #define R32_UINT DXGI_FORMAT_R32_UINT #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN @@ -7072,6 +7091,8 @@ static void test_texture(void) {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, srgb_colors}, {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM, TEX_2D, 0, 1}, 0.0f, srgb_data}, {&ps_sample, &r32f_typeless, {R32_FLOAT, TEX_2D, 0, 1}, 0.0f, r32f_colors}, + {&ps_sample, &r32f_float, {R32_FLOAT, TEX_2D, 0, 1}, 0.0f, r32f_colors}, + {&ps_sample, &r8g8_snorm, {R8G8_SNORM, TEX_2D, 0, 1}, 0.0f, snorm_colors}, {&ps_sample, &array_2d_texture, {FMT_UNKNOWN, TEX_2D, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 1, 1}, 0.0f, green_data}, @@ -7087,6 +7108,7 @@ static void test_texture(void) #undef BC3_UNORM_SRGB #undef R8G8B8A8_UNORM_SRGB #undef R8G8B8A8_UNORM +#undef R8G8_SNORM #undef R32_FLOAT #undef R32_UINT #undef FMT_UNKNOWN -- 2.16.4

2 1

[PATCH 1/4] d3d10core/tests: Add test for staging buffers.
by Józef Kucia 26 Sep '18

26 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 11eede764bc5..c41a4eb6603c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17223,6 +17223,69 @@ static void test_depth_clip(void) release_test_context(&test_context); } +static void test_staging_buffers(void) +{ + struct d3d10core_test_context test_context; + ID3D10Buffer *dst_buffer, *src_buffer; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_BUFFER_DESC buffer_desc; + struct resource_readback rb; + float data[16], value; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + buffer_desc.ByteWidth = sizeof(data); + buffer_desc.Usage = D3D10_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + buffer_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i; + resource_data.pSysMem = data; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &src_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &dst_buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_buffer, (ID3D10Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == data[i], "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = 2 * i; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)src_buffer, 0, NULL, data, 0, 0); + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_buffer, (ID3D10Resource *)src_buffer); + get_buffer_readback(dst_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == i, "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + ID3D10Buffer_Release(dst_buffer); + ID3D10Buffer_Release(src_buffer); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -17331,6 +17394,7 @@ START_TEST(d3d10core) queue_test(test_multiple_viewports); queue_test(test_multisample_resolve); queue_test(test_depth_clip); + queue_test(test_staging_buffers); run_queued_tests(); -- 2.16.4

3 2

[v2 PATCH 1/4] d2d1: Add ID2D1Effect stub.
by Nikolay Sivov 26 Sep '18

26 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/device.c | 12 ++- dlls/d2d1/effect.c | 215 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 dlls/d2d1/effect.c diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 4bfe3b5953..413571338b 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ dc_render_target.c \ device.c \ + effect.c \ factory.c \ geometry.c \ hwnd_render_target.c \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9bfbbf2a6c..726d143d86 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -503,6 +503,14 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect +{ + ID2D1Effect ID2D1Effect_iface; + LONG refcount; +}; + +void d2d_effect_init(struct d2d_effect *effect) DECLSPEC_HIDDEN; + static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 5e6655feba..be31ecafc8 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1858,9 +1858,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, REFCLSID effect_id, ID2D1Effect **effect) { + struct d2d_effect *object; + FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); - return E_NOTIMPL; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_effect_init(object); + + TRACE("Created effect %p.\n", object); + *effect = &object->ID2D1Effect_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection( diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c new file mode 100644 index 0000000000..48e2912ab8 --- /dev/null +++ b/dlls/d2d1/effect.c @@ -0,0 +1,215 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Effect) + || IsEqualGUID(iid, &IID_ID2D1Properties) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Effect_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_AddRef(ID2D1Effect *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + ULONG refcount = InterlockedIncrement(&effect->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + ULONG refcount = InterlockedDecrement(&effect->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(effect); + + return refcount; +} + +static UINT32 STDMETHODCALLTYPE d2d_effect_GetPropertyCount(ID2D1Effect *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_GetPropertyName(ID2D1Effect *iface, UINT32 index, + WCHAR *name, UINT32 name_count) +{ + FIXME("iface %p, index %u, name %p, name_count %u stub!\n", iface, index, name, name_count); + + return E_NOTIMPL; +} + +static UINT32 STDMETHODCALLTYPE d2d_effect_GetPropertyNameLength(ID2D1Effect *iface, UINT32 index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return 0; +} + +static D2D1_PROPERTY_TYPE STDMETHODCALLTYPE d2d_effect_GetType(ID2D1Effect *iface, UINT32 index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return 0; +} + +static UINT32 STDMETHODCALLTYPE d2d_effect_GetPropertyIndex(ID2D1Effect *iface, const WCHAR *name) +{ + FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name)); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_SetValueByName(ID2D1Effect *iface, const WCHAR *name, + D2D1_PROPERTY_TYPE type, const BYTE *value, UINT32 value_size) +{ + FIXME("iface %p, name %s, type %#x, value %p, value_size %u stub!\n", iface, debugstr_w(name), + type, value, value_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_SetValue(ID2D1Effect *iface, UINT32 index, D2D1_PROPERTY_TYPE type, + const BYTE *value, UINT32 value_size) +{ + FIXME("iface %p, index %u, type %#x, value %p, value_size %u stub!\n", iface, index, type, value, value_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_GetValueByName(ID2D1Effect *iface, const WCHAR *name, + D2D1_PROPERTY_TYPE type, BYTE *value, UINT32 value_size) +{ + FIXME("iface %p, name %s, type %#x, value %p, value_size %u stub!\n", iface, debugstr_w(name), type, + value, value_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_GetValue(ID2D1Effect *iface, UINT32 index, D2D1_PROPERTY_TYPE type, + BYTE *value, UINT32 value_size) +{ + FIXME("iface %p, index %u, type %#x, value %p, value_size %u stub!\n", iface, index, type, + value, value_size); + + return E_NOTIMPL; +} + +static UINT32 STDMETHODCALLTYPE d2d_effect_GetValueSize(ID2D1Effect *iface, UINT32 index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return 0; +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_GetSubProperties(ID2D1Effect *iface, UINT32 index, ID2D1Properties **props) +{ + FIXME("iface %p, index %u, props %p stub!\n", iface, index, props); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_effect_SetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image *input, BOOL invalidate) +{ + FIXME("iface %p, index %u, input %p, invalidate %d stub!\n", iface, index, input, invalidate); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UINT32 count) +{ + FIXME("iface %p, count %u stub!\n", iface, count); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image **input) +{ + FIXME("iface %p, index %u, input %p stub!\n", iface, index, input); +} + +static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) +{ + FIXME("iface %p, output %p stub!\n", iface, output); +} + +static const ID2D1EffectVtbl d2d_effect_vtbl = +{ + d2d_effect_QueryInterface, + d2d_effect_AddRef, + d2d_effect_Release, + d2d_effect_GetPropertyCount, + d2d_effect_GetPropertyName, + d2d_effect_GetPropertyNameLength, + d2d_effect_GetType, + d2d_effect_GetPropertyIndex, + d2d_effect_SetValueByName, + d2d_effect_SetValue, + d2d_effect_GetValueByName, + d2d_effect_GetValue, + d2d_effect_GetValueSize, + d2d_effect_GetSubProperties, + d2d_effect_SetInput, + d2d_effect_SetInputCount, + d2d_effect_GetInput, + d2d_effect_GetInputCount, + d2d_effect_GetOutput, +}; + +void d2d_effect_init(struct d2d_effect *effect) +{ + effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; + effect->refcount = 1; +} + -- 2.19.0

3 8

[PATCH vkd3d 6/9] vkd3d: Use heap memory for placed resources.
by Józef Kucia 26 Sep '18

26 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 95 ++++++++++++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 77 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 272fa70585f7..f25ace3cdafc 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -57,7 +57,7 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const VkMemoryRequirements *memory_requirements, VkDeviceMemory *vk_memory) + const VkMemoryRequirements *memory_requirements, VkDeviceMemory *vk_memory, uint32_t *vk_memory_type) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryAllocateInfo allocate_info; @@ -88,6 +88,9 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, return hresult_from_vk_result(vr); } + if (vk_memory_type) + *vk_memory_type = allocate_info.memoryTypeIndex; + return S_OK; } @@ -284,7 +287,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, memory_requirements.memoryTypeBits = ~(uint32_t)0; if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, - heap->desc.Flags, &memory_requirements, &heap->vk_memory))) + heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type))) return hr; heap->device = device; @@ -529,7 +532,7 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, &memory_requirements)); if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - &memory_requirements, vk_memory))) + &memory_requirements, vk_memory, NULL))) return hr; if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) @@ -554,7 +557,7 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, &memory_requirements)); if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - &memory_requirements, vk_memory))) + &memory_requirements, vk_memory, NULL))) return hr; if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) @@ -1056,6 +1059,22 @@ static HRESULT d3d12_resource_create(struct d3d12_device *device, return hr; } +static HRESULT vkd3d_allocate_resource_memory( + struct d3d12_device *device, struct d3d12_resource *resource, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) +{ + if (d3d12_resource_is_buffer(resource)) + { + return vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer, + heap_properties, heap_flags, &resource->vk_memory); + } + else + { + return vkd3d_allocate_image_memory(device, resource->u.vk_image, + heap_properties, heap_flags, &resource->vk_memory); + } +} + HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, @@ -1068,40 +1087,78 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, desc, initial_state, optimized_clear_value, &object))) return hr; - if (d3d12_resource_is_buffer(object)) + if (FAILED(hr = vkd3d_allocate_resource_memory(device, object, heap_properties, heap_flags))) { - hr = vkd3d_allocate_buffer_memory(device, object->u.vk_buffer, - heap_properties, heap_flags, &object->vk_memory); + d3d12_resource_Release(&object->ID3D12Resource_iface); + return hr; } + + TRACE("Created committed resource %p.\n", object); + + *resource = object; + + return S_OK; +} + +static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, + struct d3d12_resource *resource, struct d3d12_heap *heap, UINT64 heap_offset) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkDevice vk_device = device->vk_device; + VkMemoryRequirements requirements; + VkResult vr; + + if (d3d12_resource_is_buffer(resource)) + VK_CALL(vkGetBufferMemoryRequirements(vk_device, resource->u.vk_buffer, &requirements)); else + VK_CALL(vkGetImageMemoryRequirements(vk_device, resource->u.vk_image, &requirements)); + + if (heap_offset % requirements.alignment) { - hr = vkd3d_allocate_image_memory(device, object->u.vk_image, - heap_properties, heap_flags, &object->vk_memory); + FIXME("Invalid heap offset %#"PRIx64".\n", heap_offset); + return E_INVALIDARG; } - if (FAILED(hr)) + if (!(requirements.memoryTypeBits & (1u << heap->vk_memory_type))) { - d3d12_resource_Release(&object->ID3D12Resource_iface); - return hr; + FIXME("Memory type %u cannot be bind to resource %p (allowed types %#x).\n", + heap->vk_memory_type, resource, requirements.memoryTypeBits); + return E_NOTIMPL; } - TRACE("Created committed resource %p.\n", object); + if (d3d12_resource_is_buffer(resource)) + vr = VK_CALL(vkBindBufferMemory(vk_device, resource->u.vk_buffer, heap->vk_memory, heap_offset)); + else + vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); - *resource = object; + if (vr < 0) + WARN("Failed to bind memory, vr %d.\n", vr); - return S_OK; + return hresult_from_vk_result(vr); } HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) { - const D3D12_HEAP_DESC *heap_desc = &heap->desc; + struct d3d12_resource *object; + HRESULT hr; - FIXME("Ignoring heap %p, offset %"PRIu64".\n", heap, heap_offset); + if (FAILED(hr = d3d12_resource_create(device, &heap->desc.Properties, heap->desc.Flags, + desc, initial_state, optimized_clear_value, &object))) + return hr; - return d3d12_committed_resource_create(device, &heap_desc->Properties, heap_desc->Flags, - desc, initial_state, optimized_clear_value, resource); + if (FAILED(hr = vkd3d_bind_heap_memory(device, object, heap, heap_offset))) + { + d3d12_resource_Release(&object->ID3D12Resource_iface); + return hr; + } + + TRACE("Created placed resource %p.\n", object); + + *resource = object; + + return S_OK; } HRESULT vkd3d_create_image_resource(ID3D12Device *device, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4865671dd0dc..aca0e5098b79 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -191,6 +191,7 @@ struct d3d12_heap D3D12_HEAP_DESC desc; VkDeviceMemory vk_memory; + uint32_t vk_memory_type; struct d3d12_device *device; }; -- 2.16.4

3 3