wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Piotr Caban : d3dx10: Exit early on volume textures in D3DX10CreateTextureFromMemory.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 547c292a80ad6eaecde2e31413a7646a1e0531e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547c292a80ad6eaecde2e314… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 11 19:54:18 2022 +0200 d3dx10: Exit early on volume textures in D3DX10CreateTextureFromMemory. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/texture.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index d5066b9793b..bba08f11beb 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -714,6 +714,13 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s *hresult = E_FAIL; return E_FAIL; } + if (img_info.ArraySize != 1) + { + FIXME("img_info.ArraySize = %u not supported.\n", img_info.ArraySize); + if (hresult) + *hresult = E_NOTIMPL; + return E_NOTIMPL; + } if (FAILED(hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto end;

1 0

Piotr Caban : d3dx10/tests: Add D3DX10CreateTextureFromMemory HRESULT argument tests.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 802cbe14f99752ea8113612b0d2dd9f33a30d8ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=802cbe14f99752ea8113612b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 18:47:59 2022 +0200 d3dx10/tests: Add D3DX10CreateTextureFromMemory HRESULT argument tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 79 ++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 560bc7a8f17..026eaf0dbb6 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2158,8 +2158,8 @@ static void test_create_texture(void) HMODULE resource_module; ID3D10Device *device; WCHAR path[MAX_PATH]; + HRESULT hr, hr2; unsigned int i; - HRESULT hr; device = create_device(); if (!device) @@ -2173,35 +2173,47 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromMemory tests */ resource = (ID3D10Resource *)0xdeadbeef; - hr = D3DX10CreateTextureFromMemory(NULL, test_bmp_1bpp, sizeof(test_bmp_1bpp), NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(NULL, test_bmp_1bpp, sizeof(test_bmp_1bpp), NULL, NULL, &resource, &hr2); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); resource = (ID3D10Resource *)0xdeadbeef; - hr = D3DX10CreateTextureFromMemory(device, NULL, 0, NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(device, NULL, 0, NULL, NULL, &resource, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); resource = (ID3D10Resource *)0xdeadbeef; - hr = D3DX10CreateTextureFromMemory(device, NULL, sizeof(test_bmp_1bpp), NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(device, NULL, sizeof(test_bmp_1bpp), NULL, NULL, &resource, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); resource = (ID3D10Resource *)0xdeadbeef; - hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, 0, NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, 0, NULL, NULL, &resource, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); resource = (ID3D10Resource *)0xdeadbeef; - hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, sizeof(test_bmp_1bpp) - 1, NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, sizeof(test_bmp_1bpp) - 1, NULL, NULL, &resource, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); for (i = 0; i < ARRAY_SIZE(test_image); ++i) { winetest_push_context("Test %u", i); - hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, &hr2); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); @@ -2217,21 +2229,31 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromFile tests */ - hr = D3DX10CreateTextureFromFileW(device, NULL, NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromFileW(device, NULL, NULL, NULL, &resource, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateTextureFromFileW(device, L"deadbeef", NULL, NULL, &resource, NULL); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromFileW(device, L"deadbeef", NULL, NULL, &resource, &hr2); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateTextureFromFileA(device, NULL, NULL, NULL, &resource, NULL); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromFileA(device, NULL, NULL, NULL, &resource, &hr2); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateTextureFromFileA(device, "deadbeef", NULL, NULL, &resource, NULL); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromFileA(device, "deadbeef", NULL, NULL, &resource, &hr2); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); for (i = 0; i < ARRAY_SIZE(test_image); ++i) { winetest_push_context("Test %u", i); create_file(test_filename, test_image[i].data, test_image[i].size, path); - hr = D3DX10CreateTextureFromFileW(device, path, NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromFileW(device, path, NULL, NULL, &resource, &hr2); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); @@ -2242,7 +2264,9 @@ static void test_create_texture(void) ID3D10Resource_Release(resource); } - hr = D3DX10CreateTextureFromFileA(device, get_str_a(path), NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromFileA(device, get_str_a(path), NULL, NULL, &resource, &hr2); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); @@ -2259,25 +2283,40 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromResource tests */ - hr = D3DX10CreateTextureFromResourceW(device, NULL, NULL, NULL, NULL, &resource, NULL); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromResourceW(device, NULL, NULL, NULL, NULL, &resource, &hr2); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateTextureFromResourceW(device, NULL, L"deadbeef", NULL, NULL, &resource, NULL); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromResourceW(device, NULL, L"deadbeef", NULL, NULL, &resource, &hr2); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateTextureFromResourceA(device, NULL, NULL, NULL, NULL, &resource, NULL); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromResourceA(device, NULL, NULL, NULL, NULL, &resource, &hr2); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, NULL); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromResourceA(device, NULL, "deadbeef", NULL, NULL, &resource, &hr2); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); for (i = 0; i < ARRAY_SIZE(test_image); ++i) { winetest_push_context("Test %u", i); resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); + hr2 = 0xdeadbeef; + hr = D3DX10CreateTextureFromResourceW(device, resource_module, L"deadbeef", NULL, NULL, &resource, &hr2); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr2 == 0xdeadbeef, "Got unexpected hr2 %#x.\n", hr2); + + hr2 = 0xdeadbeef; hr = D3DX10CreateTextureFromResourceW(device, resource_module, - test_resource_name, NULL, NULL, &resource, NULL); + test_resource_name, NULL, NULL, &resource, &hr2); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); if (hr == S_OK) { check_resource_info(resource, test_image + i, __LINE__); @@ -2285,11 +2324,13 @@ static void test_create_texture(void) ID3D10Resource_Release(resource); } + hr2 = 0xdeadbeef; hr = D3DX10CreateTextureFromResourceA(device, resource_module, - get_str_a(test_resource_name), NULL, NULL, &resource, NULL); + get_str_a(test_resource_name), NULL, NULL, &resource, &hr2); todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), "Got unexpected hr %#x.\n", hr); + ok(hr == hr2, "Got unexpected hr2 %#x.\n", hr2); if (hr == S_OK) { check_resource_info(resource, test_image + i, __LINE__);

1 0

Piotr Caban : d3dx10: Don't ignore HRESULT parameter in D3DX10CreateTextureFromMemory.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 56debb4918380ba5de3502cece966d971ddbd89f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56debb4918380ba5de3502ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 19:44:35 2022 +0200 d3dx10: Don't ignore HRESULT parameter in D3DX10CreateTextureFromMemory. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 5 +++++ dlls/d3dx10_43/texture.c | 32 +++++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 0c6c4e5c8ce..560bc7a8f17 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2172,6 +2172,11 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromMemory tests */ + resource = (ID3D10Resource *)0xdeadbeef; + hr = D3DX10CreateTextureFromMemory(NULL, test_bmp_1bpp, sizeof(test_bmp_1bpp), NULL, NULL, &resource, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); + resource = (ID3D10Resource *)0xdeadbeef; hr = D3DX10CreateTextureFromMemory(device, NULL, 0, NULL, NULL, &resource, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 9c7762bc617..d5066b9793b 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -581,7 +581,9 @@ HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *sr TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_a(src_file), load_info, pump, texture, hresult); - if (!src_file || !texture) + if (!device) + return E_INVALIDARG; + if (!src_file) return E_FAIL; if (!(str_len = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0))) @@ -608,11 +610,17 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s TRACE("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, debugstr_w(src_file), load_info, pump, texture, hresult); - if (!src_file || !texture) + if (!device) + return E_INVALIDARG; + if (!src_file) return E_FAIL; if (FAILED((hr = load_file(src_file, &buffer, &size)))) + { + if (hresult) + *hresult = hr; return hr; + } hr = D3DX10CreateTextureFromMemory(device, buffer, size, load_info, pump, texture, hresult); @@ -631,8 +639,8 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE mo TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_a(resource), load_info, pump, texture, hresult); - if (!resource || !texture) - return D3DX10_ERR_INVALID_DATA; + if (!device) + return E_INVALIDARG; hr = load_resourceA(module, resource, &buffer, &size); if (FAILED(hr)) @@ -651,8 +659,8 @@ HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE mo TRACE("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p.\n", device, module, debugstr_w(resource), load_info, pump, texture, hresult); - if (!resource || !texture) - return D3DX10_ERR_INVALID_DATA; + if (!device) + return E_INVALIDARG; hr = load_resourceW(module, resource, &buffer, &size); if (FAILED(hr)) @@ -684,7 +692,9 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s TRACE("device %p, src_data %p, src_data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n", device, src_data, src_data_size, load_info, pump, texture, hresult); - if (!src_data || !src_data_size || !texture) + if (!device) + return E_INVALIDARG; + if (!src_data) return E_FAIL; if (load_info) FIXME("load_info is ignored.\n"); @@ -692,10 +702,16 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s FIXME("Thread pump is not supported yet.\n"); if (FAILED(D3DX10GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL))) + { + if (hresult) + *hresult = E_FAIL; return E_FAIL; + } if (img_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) { FIXME("Cube map is not supported.\n"); + if (hresult) + *hresult = E_FAIL; return E_FAIL; } @@ -807,5 +823,7 @@ end: if (factory) IWICImagingFactory_Release(factory); + if (hresult) + *hresult = hr; return hr; }

1 0

Nikolay Sivov : d3d11: Create dxgi resource objects for buffers.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 5beba20e8f2168dd998f2a8d205cfcdc3ed80fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beba20e8f2168dd998f2a8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 21:47:49 2022 +0300 d3d11: Create dxgi resource objects for buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/buffer.c | 61 +++++++++++++++++++++++++++++++++++++--------- dlls/d3d11/d3d11_private.h | 4 ++- dlls/d3d11/tests/d3d11.c | 1 - dlls/d3d11/texture.c | 2 +- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 352559322d7..6447c3c7a53 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -31,6 +31,7 @@ static inline struct d3d_buffer *impl_from_ID3D11Buffer(ID3D11Buffer *iface) static HRESULT STDMETHODCALLTYPE d3d11_buffer_QueryInterface(ID3D11Buffer *iface, REFIID riid, void **out) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + HRESULT hr; TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -53,10 +54,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_buffer_QueryInterface(ID3D11Buffer *iface return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + if (FAILED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, riid, out))) + { + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(riid), hr); + *out = NULL; + } - *out = NULL; - return E_NOINTERFACE; + return hr; } static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) @@ -109,30 +113,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_buffer_GetPrivateData(ID3D11Buffer *iface REFGUID guid, UINT *data_size, void *data) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&buffer->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateData(ID3D11Buffer *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&buffer->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_buffer_SetPrivateDataInterface(ID3D11Buffer *iface, REFGUID guid, const IUnknown *data) { struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&buffer->private_store, guid, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(buffer->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static void STDMETHODCALLTYPE d3d11_buffer_GetType(ID3D11Buffer *iface, @@ -246,7 +274,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&buffer->private_store, guid, data_size, data); + return d3d11_buffer_GetPrivateData(&buffer->ID3D11Buffer_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface, @@ -257,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&buffer->private_store, guid, data_size, data); + return d3d11_buffer_SetPrivateData(&buffer->ID3D11Buffer_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, @@ -267,7 +295,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buff TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&buffer->private_store, guid, data); + return d3d11_buffer_SetPrivateDataInterface(&buffer->ID3D11Buffer_iface, guid, data); } /* ID3D10Resource methods */ @@ -367,7 +395,7 @@ static void STDMETHODCALLTYPE d3d_buffer_wined3d_object_released(void *parent) { struct d3d_buffer *buffer = parent; - wined3d_private_store_cleanup(&buffer->private_store); + if (buffer->dxgi_resource) IUnknown_Release(buffer->dxgi_resource); heap_free(parent); } @@ -446,14 +474,23 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; wined3d_mutex_lock(); - wined3d_private_store_init(&buffer->private_store); if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &wined3d_desc, (const struct wined3d_sub_resource_data *)data, buffer, &d3d_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) { WARN("Failed to create wined3d buffer, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&buffer->private_store); + wined3d_mutex_unlock(); + return hr; + } + + hr = d3d_device_create_dxgi_resource((IUnknown *)&device->ID3D10Device1_iface, + wined3d_buffer_get_resource(buffer->wined3d_buffer), (IUnknown *)&buffer->ID3D10Buffer_iface, + FALSE, &buffer->dxgi_resource); + if (FAILED(hr)) + { + ERR("Failed to create DXGI resource, returning %#.lx\n", hr); + wined3d_buffer_decref(buffer->wined3d_buffer); wined3d_mutex_unlock(); return hr; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 8b3f1ab5717..6728f36a473 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -72,6 +72,8 @@ DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; DWORD wined3d_clear_flags_from_d3d11_clear_flags(UINT clear_flags) DECLSPEC_HIDDEN; unsigned int wined3d_access_from_d3d11(D3D11_USAGE usage, UINT cpu_access) DECLSPEC_HIDDEN; +HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, + IUnknown *outer, BOOL needs_surface, IUnknown **dxgi_resource) DECLSPEC_HIDDEN; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; @@ -188,7 +190,7 @@ struct d3d_buffer ID3D10Buffer ID3D10Buffer_iface; LONG refcount; - struct wined3d_private_store private_store; + IUnknown *dxgi_resource; struct wined3d_buffer *wined3d_buffer; D3D11_BUFFER_DESC desc; ID3D11Device2 *device; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3628a0bd573..345a87c4194 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3603,7 +3603,6 @@ static void test_create_buffer(void) continue; } - todo_wine check_interface(buffer, &IID_IDXGIResource, TRUE, FALSE); if (!(desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index fb4c1cdc597..7be689d1f0f 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -413,7 +413,7 @@ static const struct wined3d_parent_ops d3d_texture1d_wined3d_parent_ops = d3d_texture1d_wined3d_object_released, }; -static HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, +HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, IUnknown *outer, BOOL needs_surface, IUnknown **dxgi_resource) { IWineDXGIDevice *wine_device;

1 0

Nikolay Sivov : d3d11: Create dxgi resource object for 3D textures.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 204126ec4c2bf25e8e9e86793e09be05e4ed3717 URL: https://source.winehq.org/git/wine.git/?a=commit;h=204126ec4c2bf25e8e9e8679… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 20:44:15 2022 +0300 d3d11: Create dxgi resource object for 3D textures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/tests/d3d11.c | 2 -- dlls/d3d11/texture.c | 70 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cc236699871..8b3f1ab5717 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -170,7 +170,7 @@ struct d3d_texture3d ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; - struct wined3d_private_store private_store; + IUnknown *dxgi_resource; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE3D_DESC desc; ID3D11Device2 *device; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0c741283da5..3628a0bd573 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3286,9 +3286,7 @@ static void test_texture3d_interfaces(void) hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); - todo_wine check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); - todo_wine test_dxgi_resource(texture); hr = check_interface(texture, &IID_ID3D10Texture3D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture3D_Release(texture); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 775b7df43f1..fb4c1cdc597 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -1044,6 +1044,7 @@ static inline struct d3d_texture3d *impl_from_ID3D11Texture3D(ID3D11Texture3D *i static HRESULT STDMETHODCALLTYPE d3d11_texture3d_QueryInterface(ID3D11Texture3D *iface, REFIID riid, void **object) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + HRESULT hr; TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -1065,10 +1066,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture3d_QueryInterface(ID3D11Texture3D return S_OK; } - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + TRACE("Forwarding to dxgi resource.\n"); - *object = NULL; - return E_NOINTERFACE; + if (FAILED(hr = IUnknown_QueryInterface(texture->dxgi_resource, riid, object))) + { + WARN("%s not implemented, returning %#lx.\n", debugstr_guid(riid), hr); + *object = NULL; + } + + return hr; } static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) @@ -1091,7 +1097,8 @@ static void STDMETHODCALLTYPE d3d_texture3d_wined3d_object_released(void *parent { struct d3d_texture3d *texture = parent; - wined3d_private_store_cleanup(&texture->private_store); + if (texture->dxgi_resource) + IUnknown_Release(texture->dxgi_resource); heap_free(parent); } @@ -1129,30 +1136,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture3d_GetPrivateData(ID3D11Texture3D REFGUID guid, UINT *data_size, void *data) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateData(ID3D11Texture3D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateDataInterface(ID3D11Texture3D *iface, REFGUID guid, const IUnknown *data) { struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + IDXGIResource *dxgi_resource; + HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&texture->private_store, guid, data); + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) + { + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); + } + + return hr; } static void STDMETHODCALLTYPE d3d11_texture3d_GetType(ID3D11Texture3D *iface, @@ -1251,10 +1282,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D { struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); - TRACE("iface %p, guid %s, data_size %p, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture3d_GetPrivateData(&texture->ID3D11Texture3D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface, @@ -1262,10 +1292,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D { struct d3d_texture3d *texture = impl_from_ID3D10Texture3D(iface); - TRACE("iface %p, guid %s, data_size %u, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + return d3d11_texture3d_SetPrivateData(&texture->ID3D11Texture3D_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, @@ -1275,7 +1304,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10T TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - return d3d_set_private_data_interface(&texture->private_store, guid, data); + return d3d11_texture3d_SetPrivateDataInterface(&texture->ID3D11Texture3D_iface, guid, data); } static void STDMETHODCALLTYPE d3d10_texture3d_GetType(ID3D10Texture3D *iface, @@ -1413,7 +1442,6 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; wined3d_mutex_lock(); - wined3d_private_store_init(&texture->private_store); texture->desc = *desc; wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; @@ -1439,12 +1467,22 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi &d3d_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&texture->private_store); wined3d_mutex_unlock(); if (hr == WINED3DERR_INVALIDCALL) hr = E_INVALIDARG; return hr; } + + hr = d3d_device_create_dxgi_resource((IUnknown *)&device->ID3D10Device1_iface, + wined3d_texture_get_resource(texture->wined3d_texture), (IUnknown *)&texture->ID3D10Texture3D_iface, + FALSE, &texture->dxgi_resource); + if (FAILED(hr)) + { + ERR("Failed to create DXGI resource, returning %#.lx\n", hr); + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + return hr; + } wined3d_mutex_unlock(); texture->desc.MipLevels = levels;

1 0

Nikolay Sivov : d3d11: Always use dxgi resource private store for 1D and 2D textures.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 9b220b8079f882cca80351ec5ee1dd8c153d1950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b220b8079f882cca80351ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 20:00:59 2022 +0300 d3d11: Always use dxgi resource private store for 1D and 2D textures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/texture.c | 78 ++++++++++++++++++---------------------------- 2 files changed, 30 insertions(+), 50 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4e4efcae098..cc236699871 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -129,7 +129,6 @@ struct d3d_texture1d ID3D10Texture1D ID3D10Texture1D_iface; LONG refcount; - struct wined3d_private_store private_store; IUnknown *dxgi_resource; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE1D_DESC desc; @@ -148,7 +147,6 @@ struct d3d_texture2d ID3D10Texture2D ID3D10Texture2D_iface; LONG refcount; - struct wined3d_private_store private_store; IUnknown *dxgi_resource; struct wined3d_texture *wined3d_texture; D3D11_TEXTURE2D_DESC desc; diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 513a656aebe..775b7df43f1 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -115,60 +115,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture1d_GetPrivateData(ID3D11Texture1D REFGUID guid, UINT *data_size, void *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateData(ID3D11Texture1D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture1d_SetPrivateDataInterface(ID3D11Texture1D *iface, REFGUID guid, const IUnknown *data) { struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data_interface(&texture->private_store, guid, data); + return hr; } static void STDMETHODCALLTYPE d3d11_texture1d_GetType(ID3D11Texture1D *iface, @@ -258,7 +252,6 @@ static void STDMETHODCALLTYPE d3d_texture1d_wined3d_object_released(void *parent if (texture->dxgi_resource) IUnknown_Release(texture->dxgi_resource); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); } @@ -460,7 +453,6 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE texture->ID3D11Texture1D_iface.lpVtbl = &d3d11_texture1d_vtbl; texture->ID3D10Texture1D_iface.lpVtbl = &d3d10_texture1d_vtbl; texture->refcount = 1; - wined3d_private_store_init(&texture->private_store); texture->desc = *desc; levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(desc->Width) + 1; texture->desc.MipLevels = levels; @@ -489,7 +481,6 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE texture, &d3d_texture1d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL) @@ -605,60 +596,54 @@ static HRESULT STDMETHODCALLTYPE d3d11_texture2d_GetPrivateData(ID3D11Texture2D REFGUID guid, UINT *data_size, void *data) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_GetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_get_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateData(ID3D11Texture2D *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateData(dxgi_surface, guid, data_size, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateData(dxgi_resource, guid, data_size, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data(&texture->private_store, guid, data_size, data); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_texture2d_SetPrivateDataInterface(ID3D11Texture2D *iface, REFGUID guid, const IUnknown *data) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); - IDXGISurface *dxgi_surface; + IDXGIResource *dxgi_resource; HRESULT hr; TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (texture->dxgi_resource - && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGISurface, (void **)&dxgi_surface))) + if (SUCCEEDED(hr = IUnknown_QueryInterface(texture->dxgi_resource, &IID_IDXGIResource, (void **)&dxgi_resource))) { - hr = IDXGISurface_SetPrivateDataInterface(dxgi_surface, guid, data); - IDXGISurface_Release(dxgi_surface); - return hr; + hr = IDXGIResource_SetPrivateDataInterface(dxgi_resource, guid, data); + IDXGIResource_Release(dxgi_resource); } - return d3d_set_private_data_interface(&texture->private_store, guid, data); + return hr; } static void STDMETHODCALLTYPE d3d11_texture2d_GetType(ID3D11Texture2D *iface, @@ -762,7 +747,6 @@ static void STDMETHODCALLTYPE d3d_texture2d_wined3d_object_released(void *parent struct d3d_texture2d *texture = parent; if (texture->dxgi_resource) IUnknown_Release(texture->dxgi_resource); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); } @@ -994,7 +978,6 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; texture->refcount = 1; wined3d_mutex_lock(); - wined3d_private_store_init(&texture->private_store); texture->desc = *desc; wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; @@ -1022,7 +1005,6 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE texture, &d3d_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); - wined3d_private_store_cleanup(&texture->private_store); heap_free(texture); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL)

1 0

Nikolay Sivov : d3d11: Add a helper to create DXGI resource objects.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 0492f8cf0dc6ed4103e6675c0f1287d01ca63092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0492f8cf0dc6ed4103e6675c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 18:40:24 2022 +0300 d3d11: Add a helper to create DXGI resource objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/texture.c | 58 +++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index b3f4d7132be..513a656aebe 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -420,12 +420,35 @@ static const struct wined3d_parent_ops d3d_texture1d_wined3d_parent_ops = d3d_texture1d_wined3d_object_released, }; +static HRESULT d3d_device_create_dxgi_resource(IUnknown *device, struct wined3d_resource *wined3d_resource, + IUnknown *outer, BOOL needs_surface, IUnknown **dxgi_resource) +{ + IWineDXGIDevice *wine_device; + HRESULT hr; + + if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&wine_device))) + { + ERR("Device should implement IWineDXGIDevice.\n"); + return E_FAIL; + } + + hr = IWineDXGIDevice_create_resource(wine_device, wined3d_resource, 0, NULL, outer, + needs_surface, (void **)dxgi_resource); + IWineDXGIDevice_Release(wine_device); + if (FAILED(hr)) + { + ERR("Failed to create DXGI resource, returning %#.lx\n", hr); + *dxgi_resource = NULL; + } + + return hr; +} + HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture1d **out) { struct wined3d_resource_desc wined3d_desc; struct d3d_texture1d *texture; - IWineDXGIDevice *wine_device; unsigned int levels; BOOL needs_surface; DWORD flags = 0; @@ -474,23 +497,13 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE return hr; } - if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, - (void **)&wine_device))) - { - ERR("Device should implement IWineDXGIDevice.\n"); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - return E_FAIL; - } - needs_surface = desc->MipLevels == 1 && desc->ArraySize == 1; - hr = IWineDXGIDevice_create_resource(wine_device, wined3d_texture_get_resource(texture->wined3d_texture), - 0, NULL, (IUnknown *)&texture->ID3D10Texture1D_iface, needs_surface, (void **)&texture->dxgi_resource); - IWineDXGIDevice_Release(wine_device); + hr = d3d_device_create_dxgi_resource((IUnknown *)&device->ID3D10Device1_iface, + wined3d_texture_get_resource(texture->wined3d_texture), (IUnknown *)&texture->ID3D10Texture1D_iface, + needs_surface, &texture->dxgi_resource); if (FAILED(hr)) { ERR("Failed to create DXGI resource, returning %#.lx\n", hr); - texture->dxgi_resource = NULL; wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); return hr; @@ -963,7 +976,6 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE { struct wined3d_resource_desc wined3d_desc; struct d3d_texture2d *texture; - IWineDXGIDevice *wine_device; unsigned int levels; BOOL needs_surface; DWORD flags = 0; @@ -1019,23 +1031,13 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE } texture->desc.MipLevels = levels; - if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, - (void **)&wine_device))) - { - ERR("Device should implement IWineDXGIDevice.\n"); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - return E_FAIL; - } - needs_surface = desc->MipLevels == 1 && desc->ArraySize == 1; - hr = IWineDXGIDevice_create_resource(wine_device, wined3d_texture_get_resource(texture->wined3d_texture), - 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, needs_surface, (void **)&texture->dxgi_resource); - IWineDXGIDevice_Release(wine_device); + hr = d3d_device_create_dxgi_resource((IUnknown *)&device->ID3D10Device1_iface, + wined3d_texture_get_resource(texture->wined3d_texture), (IUnknown *)&texture->ID3D10Texture2D_iface, + needs_surface, &texture->dxgi_resource); if (FAILED(hr)) { ERR("Failed to create DXGI resource, returning %#.lx\n", hr); - texture->dxgi_resource = NULL; wined3d_texture_decref(texture->wined3d_texture); wined3d_mutex_unlock(); return hr;

1 0

Nikolay Sivov : dxgi: Create DXGI resource object, optionally supporting surface interfaces.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 184ff3bfbb4be3e3fbcfaaba3ec7095d2d885882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=184ff3bfbb4be3e3fbcfaaba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 11 19:36:20 2022 +0300 dxgi: Create DXGI resource object, optionally supporting surface interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 4 +- dlls/d3d11/tests/d3d11.c | 7 - dlls/d3d11/texture.c | 130 +++++++------- dlls/dxgi/Makefile.in | 2 +- dlls/dxgi/device.c | 24 +-- dlls/dxgi/dxgi_private.h | 11 +- dlls/dxgi/resource.c | 423 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/surface.c | 296 ------------------------------- dlls/dxgi/tests/dxgi.c | 34 ++-- include/wine/winedxgi.idl | 7 +- 10 files changed, 526 insertions(+), 412 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=184ff3bfbb4be3e3fbcf…

1 0

Nikolay Sivov : dxgi/tests: Add a IDXGIResource support test for CreateSurface().
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 9a78bd87c4ecd823d8c182c0855be75aaa6685e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a78bd87c4ecd823d8c182c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 13:57:12 2022 +0300 dxgi/tests: Add a IDXGIResource support test for CreateSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 33e9ead31ad..d205c457153 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1265,6 +1265,8 @@ static void test_create_surface(void) hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (strcmp(winetest_platform, "wine")) + check_interface(surface, &IID_IDXGIResource, TRUE, FALSE); check_interface(surface, &IID_ID3D10Texture2D, TRUE, FALSE); /* Not available on all Windows versions. */ check_interface(surface, &IID_ID3D11Texture2D, TRUE, TRUE);

1 0

Nikolay Sivov : d3d11/tests: Add some tests for IDXGIResource support.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: bf8171a3a93ea91fa6aa494359866bcf7e24c307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8171a3a93ea91fa6aa4943… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 13:43:05 2022 +0300 d3d11/tests: Add some tests for IDXGIResource support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a43e2bb0cc5..9c72de054c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2499,6 +2499,63 @@ static void test_create_texture1d(void) ok(!refcount, "Device has %lu references left.\n", refcount); } +#define test_dxgi_resource(a) test_dxgi_resource_(__LINE__, a) +static void test_dxgi_resource_(unsigned int line, void *iface) +{ + IDXGIResource *resource, *resource2; + IDXGISurface *surface, *surface2; + IUnknown *object = iface, *unk; + DWORD data; + HRESULT hr; + UINT size; + + hr = IUnknown_QueryInterface(object, &IID_IDXGIResource, (void **)&resource); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (FAILED(hr)) return; + + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IDXGISurface, (void **)&surface))) + { + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGIDeviceSubObject, (void **)&unk); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)((IUnknown *)resource == unk, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGIObject, (void **)&unk); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)((IUnknown *)resource == unk, "Unexpected interface pointer.\n"); + IUnknown_Release(unk); + + hr = IDXGISurface_QueryInterface(surface, &IID_IDXGIResource, (void **)&resource2); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(resource2 == resource, "Unexpected resource pointer.\n"); + IDXGIResource_Release(resource2); + + hr = IDXGIResource_QueryInterface(resource, &IID_IDXGISurface, (void **)&surface2); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(surface2 == surface, "Unexpected surface pointer.\n"); + IDXGISurface_Release(surface2); + + hr = IDXGISurface_GetParent(surface, &IID_IDXGIResource, (void **)&resource2); + ok_(__FILE__, line)(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); + hr = IDXGIResource_GetParent(resource, &IID_IDXGISurface, (void **)&surface2); + ok_(__FILE__, line)(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); + + data = 123; + hr = IDXGIResource_SetPrivateData(resource, &IID_IUnknown, sizeof(data), &data); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + size = sizeof(data); + data = 0; + hr = IDXGISurface_GetPrivateData(surface, &IID_IUnknown, &size, &data); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok_(__FILE__, line)(data == 123, "Unexpected data %#lx.\n", data); + + IDXGISurface_Release(surface); + } + + IDXGIResource_Release(resource); +} + static void test_texture1d_interfaces(void) { ID3D10Texture1D *d3d10_texture; @@ -2548,7 +2605,7 @@ static void test_texture1d_interfaces(void) } desc.Width = 512; - desc.MipLevels = 0; + desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.Usage = D3D11_USAGE_DEFAULT; @@ -2558,7 +2615,18 @@ static void test_texture1d_interfaces(void) hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + test_dxgi_resource(texture); + ID3D11Texture1D_Release(texture); + + desc.MipLevels = 0; + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine + test_dxgi_resource(texture); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); hr = check_interface(texture, &IID_ID3D10Texture1D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture1D_Release(texture); if (FAILED(hr)) @@ -2934,7 +3002,7 @@ static void test_texture2d_interfaces(void) desc.Width = 512; desc.Height = 512; - desc.MipLevels = 0; + desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 1; @@ -2944,9 +3012,23 @@ static void test_texture2d_interfaces(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_interface(texture, &IID_IDXGISurface, TRUE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); + todo_wine + test_dxgi_resource(texture); + ID3D11Texture2D_Release(texture); + + desc.MipLevels = 0; hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); + todo_wine + test_dxgi_resource(texture); hr = check_interface(texture, &IID_ID3D10Texture2D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture2D_Release(texture); if (FAILED(hr)) @@ -3211,6 +3293,10 @@ static void test_texture3d_interfaces(void) hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_interface(texture, &IID_IDXGISurface, FALSE, FALSE); + todo_wine + check_interface(texture, &IID_IDXGIResource, TRUE, FALSE); + todo_wine + test_dxgi_resource(texture); hr = check_interface(texture, &IID_ID3D10Texture3D, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Texture3D_Release(texture); if (FAILED(hr)) @@ -3526,6 +3612,9 @@ static void test_create_buffer(void) continue; } + todo_wine + check_interface(buffer, &IID_IDXGIResource, TRUE, FALSE); + if (!(desc.MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)) desc.StructureByteStride = 0;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022