September 2018 - Wine-devel

[PATCH 2/2] d3d11: Add D3D11On12CreateDevice() stub.
by Józef Kucia 17 Sep '18

17 Sep '18

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

2 1

[v2 PATCH 1/4] d2d1: Implement GetSurface() for bitmaps.
by Nikolay Sivov 17 Sep '18

17 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8b5b6aa0a9..01dc829a1c 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -70,6 +70,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { ID3D10ShaderResourceView_Release(bitmap->view); + if (bitmap->surface) + IDXGISurface_Release(bitmap->surface); ID2D1Factory_Release(bitmap->factory); heap_free(bitmap); } @@ -188,9 +190,15 @@ static D2D1_BITMAP_OPTIONS STDMETHODCALLTYPE d2d_bitmap_GetOptions(ID2D1Bitmap1 static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXGISurface **surface) { - FIXME("iface %p, surface %p stub!\n", iface, surface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); - return E_NOTIMPL; + TRACE("iface %p, surface %p.\n", iface, surface); + + *surface = bitmap->surface; + if (*surface) + IDXGISurface_AddRef(*surface); + + return *surface ? S_OK : D2DERR_INVALID_CALL; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options, @@ -263,18 +271,26 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) return FALSE; } -static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, +static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context *context, ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; - ID2D1Factory_AddRef(bitmap->factory = factory); + ID2D1Factory_AddRef(bitmap->factory = context->factory); ID3D10ShaderResourceView_AddRef(bitmap->view = view); bitmap->pixel_size = size; bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; bitmap->options = desc->bitmapOptions; + if (d2d_device_context_is_dxgi_target(context)) + { + ID3D10Resource *resource; + + ID3D10ShaderResourceView_GetResource(bitmap->view, &resource); + ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface, (void **)&bitmap->surface); + ID3D10Resource_Release(resource); + } if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -283,7 +299,7 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, ID2D1Factory *factory, } } -HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, +HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D3D10_SUBRESOURCE_DATA resource_data; @@ -314,14 +330,14 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch; - if (FAILED(hr = ID3D10Device_CreateTexture2D(device, &texture_desc, + if (FAILED(hr = ID3D10Device_CreateTexture2D(context->device, &texture_desc, src_data ? &resource_data : NULL, &texture))) { ERR("Failed to create texture, hr %#x.\n", hr); return hr; } - hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &view); + hr = ID3D10Device_CreateShaderResourceView(context->device, (ID3D10Resource *)texture, NULL, &view); ID3D10Texture2D_Release(texture); if (FAILED(hr)) { @@ -331,7 +347,7 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - d2d_bitmap_init(*bitmap, factory, view, size, desc); + d2d_bitmap_init(*bitmap, context, view, size, desc); TRACE("Created bitmap %p.\n", *bitmap); } @@ -340,11 +356,10 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE return *bitmap ? S_OK : E_OUTOFMEMORY; } -HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *target_device, - REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) +HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, void *data, + const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D2D1_BITMAP_PROPERTIES1 d; - ID2D1Factory *factory; if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { @@ -352,8 +367,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ ID3D10Device *device; HRESULT hr = S_OK; - ID2D1DeviceContext_GetFactory(context, &factory); - if (src_impl->factory != factory) + if (src_impl->factory != context->factory) { hr = D2DERR_WRONG_FACTORY; goto failed; @@ -361,7 +375,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ ID3D10ShaderResourceView_GetDevice(src_impl->view, &device); ID3D10Device_Release(device); - if (device != target_device) + if (device != context->device) { hr = D2DERR_UNSUPPORTED_OPERATION; goto failed; @@ -391,11 +405,10 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ goto failed; } - d2d_bitmap_init(*bitmap, factory, src_impl->view, src_impl->pixel_size, desc); + d2d_bitmap_init(*bitmap, context, src_impl->view, src_impl->pixel_size, desc); TRACE("Created bitmap %p.\n", *bitmap); failed: - ID2D1Factory_Release(factory); return hr; } @@ -417,13 +430,13 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ ID3D10Resource_GetDevice(resource, &device); ID3D10Device_Release(device); - if (device != target_device) + if (device != context->device) { ID3D10Resource_Release(resource); return D2DERR_UNSUPPORTED_OPERATION; } - hr = ID3D10Device_CreateShaderResourceView(target_device, resource, NULL, &view); + hr = ID3D10Device_CreateShaderResourceView(context->device, resource, NULL, &view); ID3D10Resource_Release(resource); if (FAILED(hr)) { @@ -455,22 +468,17 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ if (d.dpiX == 0.0f || d.dpiY == 0.0f) { - float dpi_x, dpi_y; - - ID2D1DeviceContext_GetDpi(context, &dpi_x, &dpi_y); if (d.dpiX == 0.0f) - d.dpiX = dpi_x; + d.dpiX = context->desc.dpiX; if (d.dpiY == 0.0f) - d.dpiY = dpi_y; + d.dpiY = context->desc.dpiY; } pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - ID2D1DeviceContext_GetFactory(context, &factory); - d2d_bitmap_init(*bitmap, factory, view, pixel_size, &d); + d2d_bitmap_init(*bitmap, context, view, pixel_size, &d); ID3D10ShaderResourceView_Release(view); - ID2D1Factory_Release(factory); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; @@ -481,7 +489,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *targ return E_INVALIDARG; } -HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, +HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { const D2D1_PIXEL_FORMAT *d2d_format; @@ -581,7 +589,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d return hr; } - hr = d2d_bitmap_create(factory, device, size, data, pitch, &bitmap_desc, bitmap); + hr = d2d_bitmap_create(context, size, data, pitch, &bitmap_desc, bitmap); heap_free(data); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5b96a6050d..3fed59fa72 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -160,6 +160,11 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac void **render_target) DECLSPEC_HIDDEN; HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *render_target, IDXGISurface1 *surface) DECLSPEC_HIDDEN; +static inline BOOL d2d_device_context_is_dxgi_target(const struct d2d_device_context *context) +{ + return !context->ops; +} + struct d2d_wic_render_target { IUnknown IUnknown_iface; @@ -339,6 +344,7 @@ struct d2d_bitmap ID2D1Factory *factory; ID3D10ShaderResourceView *view; + IDXGISurface *surface; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; @@ -346,11 +352,11 @@ struct d2d_bitmap D2D1_BITMAP_OPTIONS options; }; -HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, +HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *device, REFIID iid, void *data, +HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, +HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 649fcc4311..041cb33c90 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -343,8 +343,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceCont bitmap_desc.colorContext = NULL; } - if (SUCCEEDED(hr = d2d_bitmap_create(context->factory, context->device, - size, src_data, pitch, desc ? &bitmap_desc : NULL, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create(context, size, src_data, pitch, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -368,8 +367,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID bitmap_desc.colorContext = NULL; } - if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(context->factory, context->device, - bitmap_source, desc ? &bitmap_desc : NULL, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create_from_wic_bitmap(context, bitmap_source, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; @@ -393,8 +391,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1Devi bitmap_desc.colorContext = NULL; } - if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, context->device, - iid, data, desc ? &bitmap_desc : NULL, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create_shared(context, iid, data, desc ? &bitmap_desc : NULL, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1753d6282f..6419df23d8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -774,29 +774,31 @@ static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) } #define check_bitmap_surface(b, s, o) check_bitmap_surface_(__LINE__, b, s, o) -static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL has_surface, DWORD expected_options) +static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL has_surface, DWORD expected_options) { D2D1_BITMAP_OPTIONS options; IDXGISurface *surface; + ID2D1Bitmap1 *bitmap1; HRESULT hr; - options = ID2D1Bitmap1_GetOptions(bitmap); + hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); + if (FAILED(hr)) + return; + + options = ID2D1Bitmap1_GetOptions(bitmap1); ok_(__FILE__, line)(options == expected_options, "Unexpected bitmap options %#x, expected %#x.\n", options, expected_options); surface = (void *)0xdeadbeef; - hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); + hr = ID2D1Bitmap1_GetSurface(bitmap1, &surface); if (has_surface) { D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; - todo_wine ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); ok_(__FILE__, line)(!!surface, "Expected surface instance.\n"); - if (SUCCEEDED(hr)) - { /* Correlate with resource configuration. */ hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get texture pointer, hr %#x.\n", hr); @@ -813,14 +815,13 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap1 *bitmap, BOOL IDXGISurface_Release(surface); } - } else { - todo_wine { ok_(__FILE__, line)(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ok_(__FILE__, line)(!surface, "Unexpected surface instance.\n"); } - } + + ID2D1Bitmap1_Release(bitmap1); } static inline struct geometry_sink *impl_from_ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySink *iface) @@ -4132,12 +4133,14 @@ static void test_shared_bitmap(void) hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory1, surface1, &desc, &rt1); ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = ID2D1RenderTarget_CreateBitmap(rt1, size, NULL, 0, &bitmap_desc, &bitmap1); + check_bitmap_surface(bitmap1, TRUE, 0); ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory1, surface2, &desc, &rt2); ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2); ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + check_bitmap_surface(bitmap2, TRUE, 0); ID2D1Bitmap_Release(bitmap2); hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IUnknown, bitmap1, NULL, &bitmap2); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -4206,6 +4209,7 @@ static void test_shared_bitmap(void) ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_ID2D1Bitmap, bitmap1, NULL, &bitmap2); ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + check_bitmap_surface(bitmap2, FALSE, 0); ID2D1Bitmap_Release(bitmap2); ID2D1RenderTarget_Release(rt2); @@ -4231,18 +4235,12 @@ static void test_shared_bitmap(void) if (SUCCEEDED(hr)) { - ID2D1Bitmap1 *bitmap3; - size = ID2D1Bitmap_GetPixelSize(bitmap2); hr = IDXGISurface_GetDesc(surface2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); ok(size.width == surface_desc.Width && size.height == surface_desc.Height, "Got wrong bitmap size.\n"); - hr = ID2D1Bitmap_QueryInterface(bitmap2, &IID_ID2D1Bitmap1, (void **)&bitmap3); - ok(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 pointer, hr %#x.\n", hr); - - check_bitmap_surface(bitmap3, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); - ID2D1Bitmap1_Release(bitmap3); + check_bitmap_surface(bitmap2, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); ID2D1Bitmap_Release(bitmap2); @@ -6661,8 +6659,9 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B { D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1RenderTarget *compatible_rt; + IWICImagingFactory *wic_factory; ID2D1DeviceContext *context; - ID2D1Bitmap1 *bitmap1; + IWICBitmap *wic_bitmap; ID2D1Bitmap *bitmap; D2D1_SIZE_U size; HRESULT hr; @@ -6672,6 +6671,7 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B 0x7f7f0000, }; + /* Raw data bitmap. */ set_size_u(&size, 1, 1); bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; @@ -6680,14 +6680,31 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); - hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); + check_bitmap_surface_(line, bitmap, has_surface, options); - check_bitmap_surface_(line, bitmap1, has_surface, options); + ID2D1Bitmap_Release(bitmap); + + /* WIC bitmap. */ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&wic_factory); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create WIC imaging factory, hr %#x.\n", hr); + + hr = IWICImagingFactory_CreateBitmap(wic_factory, 16, 16, + &GUID_WICPixelFormat32bppPBGRA, WICBitmapCacheOnDemand, &wic_bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create WIC bitmap, hr %#x.\n", hr); + IWICImagingFactory_Release(wic_factory); + + hr = ID2D1RenderTarget_CreateBitmapFromWicBitmap(rt, (IWICBitmapSource *)wic_bitmap, NULL, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap from WIC source, hr %#x.\n", hr); + + check_bitmap_surface_(line, bitmap, has_surface, options); - ID2D1Bitmap1_Release(bitmap1); ID2D1Bitmap_Release(bitmap); + CoUninitialize(); + if (FAILED(ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&context))) { /* Compatible target follows its parent. */ @@ -6698,13 +6715,9 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B hr = ID2D1RenderTarget_CreateBitmap(compatible_rt, size, bitmap_data, sizeof(*bitmap_data), &bitmap_desc, &bitmap); ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); - hr = ID2D1Bitmap_QueryInterface(bitmap, &IID_ID2D1Bitmap1, (void **)&bitmap1); - ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to get ID2D1Bitmap1 interface, hr %#x.\n", hr); - - check_bitmap_surface_(line, bitmap1, has_surface, options); + check_bitmap_surface_(line, bitmap, has_surface, options); ID2D1RenderTarget_Release(compatible_rt); - ID2D1Bitmap1_Release(bitmap1); ID2D1Bitmap_Release(bitmap); } else @@ -6776,7 +6789,7 @@ if (SUCCEEDED(hr)) hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); - check_bitmap_surface(bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); + check_bitmap_surface((ID2D1Bitmap *)bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE); ID2D1DeviceContext_Release(device_context); -- 2.18.0

3 6

[PATCH 1/2] include: Add d3d11on12 header.
by Józef Kucia 17 Sep '18

17 Sep '18

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

2 1

Wrap-up of wineconf
by Hugh McMaster 17 Sep '18

17 Sep '18

Hi all, Are there any summaries or presentations from Wineconf available for those of us who couldn't attend? (And even those who could...) Hugh

5 6

[PATCH 7/7] wined3d: Cleanup get_flexible_vertex_size().
by Józef Kucia 17 Sep '18

17 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 667b90b51bb5..96e7a3dbfaa6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3016,17 +3016,16 @@ 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) +static unsigned int wined3d_get_flexible_vertex_size(DWORD fvf) { - DWORD size = 0; - int i; - int numTextures = (d3dvtVertexType & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; + unsigned int texcoord_count = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; + unsigned int i, size = 0; - 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) + if (fvf & WINED3DFVF_NORMAL) size += 3 * sizeof(float); + if (fvf & WINED3DFVF_DIFFUSE) size += sizeof(DWORD); + if (fvf & WINED3DFVF_SPECULAR) size += sizeof(DWORD); + if (fvf & WINED3DFVF_PSIZE) size += sizeof(DWORD); + switch (fvf & WINED3DFVF_POSITION_MASK) { case WINED3DFVF_XYZ: size += 3 * sizeof(float); break; case WINED3DFVF_XYZRHW: size += 4 * sizeof(float); break; @@ -3036,11 +3035,11 @@ static DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) 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); + default: FIXME("Unexpected position mask %#x.\n", fvf & WINED3DFVF_POSITION_MASK); } - for (i = 0; i < numTextures; i++) + for (i = 0; i < texcoord_count; ++i) { - size += GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, i) * sizeof(float); + size += GET_TEXCOORD_SIZE_FROM_FVF(fvf, i) * sizeof(float); } return size; @@ -3049,14 +3048,13 @@ static DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) /* 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, - const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD flags, - DWORD DestFVF) + const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD flags, DWORD dst_fvf) { struct wined3d_matrix mat, proj_mat, view_mat, world_mat; struct wined3d_map_desc map_desc; struct wined3d_box box = {0}; struct wined3d_viewport vp; - UINT vertex_size; + unsigned int vertex_size; unsigned int i; BYTE *dest_ptr; BOOL doClip; @@ -3094,7 +3092,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO else doClip = FALSE; - vertex_size = get_flexible_vertex_size(DestFVF); + vertex_size = wined3d_get_flexible_vertex_size(dst_fvf); box.left = dwDestIndex * vertex_size; box.right = box.left + dwCount * vertex_size; if (FAILED(hr = wined3d_resource_map(&dest->resource, 0, &map_desc, &box, WINED3D_MAP_WRITE))) @@ -3134,13 +3132,13 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO multiply_matrix(&mat,&view_mat,&world_mat); multiply_matrix(&mat,&proj_mat,&mat); - numTextures = (DestFVF & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; + numTextures = (dst_fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; for (i = 0; i < dwCount; i+= 1) { unsigned int tex_index; - if ( ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZ ) || - ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) ) { + if ( ((dst_fvf & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZ ) || + ((dst_fvf & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW ) ) { /* The position first */ const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_POSITION]; const float *p = (const float *)(element->data.addr + i * element->stride); @@ -3235,14 +3233,14 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO dest_ptr += 3 * sizeof(float); - if ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW) + if ((dst_fvf & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW) dest_ptr += sizeof(float); } - if (DestFVF & WINED3DFVF_PSIZE) + if (dst_fvf & WINED3DFVF_PSIZE) dest_ptr += sizeof(DWORD); - if (DestFVF & WINED3DFVF_NORMAL) + if (dst_fvf & WINED3DFVF_NORMAL) { const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_NORMAL]; const float *normal = (const float *)(element->data.addr + i * element->stride); @@ -3251,7 +3249,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO copy_and_next(dest_ptr, normal, 3 * sizeof(float)); } - if (DestFVF & WINED3DFVF_DIFFUSE) + if (dst_fvf & WINED3DFVF_DIFFUSE) { const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_DIFFUSE]; const DWORD *color_d = (const DWORD *)(element->data.addr + i * element->stride); @@ -3273,7 +3271,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO } } - if (DestFVF & WINED3DFVF_SPECULAR) + if (dst_fvf & WINED3DFVF_SPECULAR) { /* What's the color value in the feedback buffer? */ const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_SPECULAR]; @@ -3303,11 +3301,11 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO if (!(stream_info->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + tex_index)))) { ERR("No source texture, but destination requests one\n"); - dest_ptr += GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float); + dest_ptr += GET_TEXCOORD_SIZE_FROM_FVF(dst_fvf, tex_index) * sizeof(float); } else { - copy_and_next(dest_ptr, tex_coord, GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float)); + copy_and_next(dest_ptr, tex_coord, GET_TEXCOORD_SIZE_FROM_FVF(dst_fvf, tex_index) * sizeof(float)); } } } -- 2.16.4

2 1

[PATCH 6/7] wined3d: Move get_flexible_vertex_size() to device.c.
by Józef Kucia 17 Sep '18

17 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 f6a0b39cecd6..667b90b51bb5 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 b19f18fea45a..db27270ba8a0 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 aea874f84eab..19341a59b751 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 -- 2.16.4

2 1

[PATCH 5/7] wined3d: Initialise typeless formats after all formats properties are initialised.
by Józef Kucia 17 Sep '18

17 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 0d87ffda914e..b19f18fea45a 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: -- 2.16.4

2 1

[PATCH 2/7] wined3d: Add missing formats to debug_d3dformat().
by Józef Kucia 17 Sep '18

17 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b4a3c1dca291..904baef8b2dc 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); -- 2.16.4

2 1

[PATCH 4/7] wined3d: Initialise typeless_id for typeless formats early.
by Józef Kucia 17 Sep '18

17 Sep '18

Allows us to use wined3d_format_is_typeless() while initialising formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 eb4001df6e73..0d87ffda914e 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]); -- 2.16.4

2 1

[PATCH 3/7] wined3d: Store additional flags directly in wined3d_format_block_info.
by Józef Kucia 17 Sep '18

17 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 904baef8b2dc..eb4001df6e73 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; -- 2.16.4

2 1