[v2 PATCH] dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: handle surface creation failure on some systems. dlls/dxgi/tests/dxgi.c | 78 +++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/utils.c | 4 ++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f04cd2be06..c33b9981f9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -44,6 +44,10 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -624,6 +628,40 @@ success: return dxgi_device; } +static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + ID3D11Device *d3d_device; + IDXGIDevice *device = NULL; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ID3D11Device_Release(d3d_device); + } + + return device; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -1079,6 +1117,7 @@ static void test_check_interface_support(void) static void test_create_surface(void) { + ID3D11Texture2D *texture2d; DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; @@ -1109,6 +1148,40 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* DXGI_USAGE_UNORDERED_ACCESS */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create D3D11 device.\n"); + return; + } + + surface = NULL; + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); + ok(SUCCEEDED(hr) || broken(hr == E_INVALIDARG), "Failed to create a dxgi surface, hr %#x\n", hr); + + if (surface) + { + ID3D11UnorderedAccessView *uav; + ID3D11Device *d3d_device; + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d); + ok(hr == S_OK, "Failed to get texture interface, hr %#x.\n", hr); + + ID3D11Texture2D_GetDevice(texture2d, &d3d_device); + + hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + + ID3D11Device_Release(d3d_device); + ID3D11Texture2D_Release(texture2d); + + IDXGISurface_Release(surface); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } static void test_parents(void) @@ -6483,7 +6556,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module, gdi32_module; + HMODULE dxgi_module, d3d11_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -6498,6 +6571,9 @@ START_TEST(dxgi) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + d3d11_module = LoadLibraryA("d3d11.dll"); + pD3D11CreateDevice = (void *)GetProcAddress(d3d11_module, "D3D11CreateDevice"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, ®istry_mode), "Failed to get display mode.\n"); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aece3a6af1..a32c7ee129 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -503,8 +503,10 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (dxgi_usage & DXGI_USAGE_UNORDERED_ACCESS) + wined3d_bind_flags |= WINED3D_BIND_UNORDERED_ACCESS; - dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_UNORDERED_ACCESS); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); return wined3d_bind_flags; -- 2.26.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=71392 Your paranoid android. === w1064v1809 (32 bit report) === dxgi: dxgi.c:2573: Test failed: Got unexpected hr 0x887a0022. dxgi.c:2576: Test failed: Got unexpected fullscreen 0. dxgi.c:2579: Test failed: Got unexpected hr 0x887a0022. dxgi.c:2582: Test failed: Got unexpected fullscreen 0. === w1064v1809_2scr (32 bit report) === dxgi: dxgi.c:5301: Test failed: Got unexpected message 0x31f, hwnd 000402BE, wparam 0x1, lparam 0.
On Fri, 8 May 2020 at 00:45, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
+static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + ID3D11Device *d3d_device; + IDXGIDevice *device = NULL; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ID3D11Device_Release(d3d_device); + } + + return device; +} Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.)
On 5/8/20 8:40 PM, Henri Verbeet wrote:
On Fri, 8 May 2020 at 00:45, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
+static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + ID3D11Device *d3d_device; + IDXGIDevice *device = NULL; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ID3D11Device_Release(d3d_device); + } + + return device; +} Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.) D3D10CreateDevice1() doesn't work for me with feature level 11, both with 10_1 sdk and 11 sdk flag.How do I create this without d3d11 functions?
On Fri, 8 May 2020 at 22:20, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 8:40 PM, Henri Verbeet wrote:
Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.) D3D10CreateDevice1() doesn't work for me with feature level 11, both with 10_1 sdk and 11 sdk flag.How do I create this without d3d11 functions?
Maybe it's not possible, and we should validate the feature level in the d3d10core and d3d10_1 functions. (I don't think we currently do in Wine.) Still, if it depends on the feature level, D3D11CreateDevice() with D3D_FEATURE_LEVEL_10_0/D3D_FEATURE_LEVEL_10_1 would not work either.
On 5/8/20 9:10 PM, Henri Verbeet wrote:
On Fri, 8 May 2020 at 22:20, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 8:40 PM, Henri Verbeet wrote:
Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.) D3D10CreateDevice1() doesn't work for me with feature level 11, both with 10_1 sdk and 11 sdk flag.How do I create this without d3d11 functions? Maybe it's not possible, and we should validate the feature level in the d3d10core and d3d10_1 functions. (I don't think we currently do in Wine.) Still, if it depends on the feature level, D3D11CreateDevice() with D3D_FEATURE_LEVEL_10_0/D3D_FEATURE_LEVEL_10_1 would not work either. I mean I tried on Windows. What we do with in wine is separate from passing flags through.
Your point is that I should use strict feature level 11 with d3d11 function, excluding 10.1/10 when creating device? Or is using d3d11 function bad for some reason?
On Fri, 8 May 2020 at 22:44, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 9:10 PM, Henri Verbeet wrote:
On Fri, 8 May 2020 at 22:20, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 8:40 PM, Henri Verbeet wrote:
Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.) D3D10CreateDevice1() doesn't work for me with feature level 11, both with 10_1 sdk and 11 sdk flag.How do I create this without d3d11 functions? Maybe it's not possible, and we should validate the feature level in the d3d10core and d3d10_1 functions. (I don't think we currently do in Wine.) Still, if it depends on the feature level, D3D11CreateDevice() with D3D_FEATURE_LEVEL_10_0/D3D_FEATURE_LEVEL_10_1 would not work either. I mean I tried on Windows. What we do with in wine is separate from passing flags through.
Your point is that I should use strict feature level 11 with d3d11 function, excluding 10.1/10 when creating device? Or is using d3d11 function bad for some reason?
Well, it depends on how it works. If it only works with feature level 11, then yes, we should require that. If it also works with feature level 10 or 10.1, it seems odd that it would require the device to be created with D3D11CreateDevice().
On 5/8/20 9:32 PM, Henri Verbeet wrote:
On Fri, 8 May 2020 at 22:44, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 9:10 PM, Henri Verbeet wrote:
On Fri, 8 May 2020 at 22:20, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 8:40 PM, Henri Verbeet wrote:
Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.) D3D10CreateDevice1() doesn't work for me with feature level 11, both with 10_1 sdk and 11 sdk flag.How do I create this without d3d11 functions? Maybe it's not possible, and we should validate the feature level in the d3d10core and d3d10_1 functions. (I don't think we currently do in Wine.) Still, if it depends on the feature level, D3D11CreateDevice() with D3D_FEATURE_LEVEL_10_0/D3D_FEATURE_LEVEL_10_1 would not work either. I mean I tried on Windows. What we do with in wine is separate from passing flags through.
Your point is that I should use strict feature level 11 with d3d11 function, excluding 10.1/10 when creating device? Or is using d3d11 function bad for some reason? Well, it depends on how it works. If it only works with feature level 11, then yes, we should require that. If it also works with feature level 10 or 10.1, it seems odd that it would require the device to be created with D3D11CreateDevice(). For device (10.0) used in existing tests it doesn't work, I tried that before adding d3d11 one. It returns E_INVALIDARG for UAV flag.
Feature level validation, if it should happen, should already apply to CreateTexture2D(D3D11_BIND_UNORDERED_ACCESS), is there a reason to believe that CreateSurface() is any different? Internally it looks like it takes similar path up to wined3d.
On 5/8/20 9:32 PM, Henri Verbeet wrote:
On Fri, 8 May 2020 at 22:44, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 9:10 PM, Henri Verbeet wrote:
On Fri, 8 May 2020 at 22:20, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 8:40 PM, Henri Verbeet wrote:
Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.) D3D10CreateDevice1() doesn't work for me with feature level 11, both with 10_1 sdk and 11 sdk flag.How do I create this without d3d11 functions? Maybe it's not possible, and we should validate the feature level in the d3d10core and d3d10_1 functions. (I don't think we currently do in Wine.) Still, if it depends on the feature level, D3D11CreateDevice() with D3D_FEATURE_LEVEL_10_0/D3D_FEATURE_LEVEL_10_1 would not work either. I mean I tried on Windows. What we do with in wine is separate from passing flags through.
Your point is that I should use strict feature level 11 with d3d11 function, excluding 10.1/10 when creating device? Or is using d3d11 function bad for some reason? Well, it depends on how it works. If it only works with feature level 11, then yes, we should require that. If it also works with feature level 10 or 10.1, it seems odd that it would require the device to be created with D3D11CreateDevice(). Both D3D10CreateDevice1 and D3D11CreateDevice fail on UAV flag, if created for level 10/10.1, so that's consistent. I'll update to use just level 11.
May 8, 2020 1:10 PM, "Henri Verbeet" <hverbeet(a)gmail.com> wrote:
On Fri, 8 May 2020 at 22:20, Nikolay Sivov <nsivov(a)codeweavers.com> wrote:
On 5/8/20 8:40 PM, Henri Verbeet wrote: Does DXGI_USAGE_UNORDERED_ACCESS really need a device created with D3D11CreateDevice()? (As opposed to e.g. just D3D_FEATURE_LEVEL_11_0.) D3D10CreateDevice1() doesn't work for me with feature level 11, both with 10_1 sdk and 11 sdk flag.How do I create this without d3d11 functions?
Maybe it's not possible, and we should validate the feature level in the d3d10core and d3d10_1 functions. (I don't think we currently do in Wine.) Still, if it depends on the feature level, D3D11CreateDevice() with D3D_FEATURE_LEVEL_10_0/D3D_FEATURE_LEVEL_10_1 would not work either.
Actually, D3D_FEATURE_LEVEL_10_1 might work if cs_4_1 is supported. Chip
participants (4)
-
Chip Davis -
Henri Verbeet -
Marvin -
Nikolay Sivov