February 2017 - Wine-commits

Matteo Bruni : wined3d: Don't query aux buffers count on core profile.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: e99937ef51fa31b44abba050acf168a83e7d88d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99937ef51fa31b44abba050a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:40 2017 +0100 wined3d: Don't query aux buffers count on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e8cc3fc..61c9367 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1908,7 +1908,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } } - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); TRACE("Setting up the screen\n");

1 0

Matteo Bruni : ddraw/tests: Fix IDirect3DDevice typo.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: a65f16bf64faadc738b004d08a67de229d8f34b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65f16bf64faadc738b004d08… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:42 2017 +0100 ddraw/tests: Fix IDirect3DDevice typo. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c408024..278b9c6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8295,11 +8295,11 @@ static void test_shademode(void) hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); - hr = IDirect3DDevice2_BeginScene(device); + hr = IDirect3DDevice_BeginScene(device); set_execute_data(execute_buffer, 4, sizeof(quad_strip), inst_length); hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); - hr = IDirect3DDevice2_EndScene(device); + hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color0 = get_surface_color(rt, 100, 100); /* Inside first triangle */

1 0

Matteo Bruni : d3dx10: Make use of data_size when tracing data string.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 5bcdee38c0392c09140a05f3834399571d6b802e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcdee38c0392c09140a05f38… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:43 2017 +0100 d3dx10: Make use of data_size when tracing data string. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index fb988a4..c638904 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -226,8 +226,9 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", - debugstr_a(data), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), - debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); + debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, + debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, + error_messages, hresult); if (pump) FIXME("Unimplemented ID3DX10ThreadPump handling.\n");

1 0

Matteo Bruni : d3dx11: Make use of data_size when tracing data string.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 45aef81cbe5aecc75a36fdf821c66355adff52de URL: http://source.winehq.org/git/wine.git/?a=commit;h=45aef81cbe5aecc75a36fdf82… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:44 2017 +0100 d3dx11: Make use of data_size when tracing data string. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index ea7072a..ece13e9 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -224,8 +224,9 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", - debugstr_a(data), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), - debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); + debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, + debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, + error_messages, hresult); if (pump) FIXME("Unimplemented ID3DX11ThreadPump handling.\n");

1 0

Alistair Leslie-Hughes : dxgi: Silence a noisy fixme.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: a55cf3586d5f8f1b16954dc50fc4500c2f2b9ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55cf3586d5f8f1b16954dc50… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 04:38:22 2017 +0000 dxgi: Silence a noisy fixme. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 0cf8084..737ba29 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -268,7 +268,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput static HRESULT STDMETHODCALLTYPE dxgi_output_WaitForVBlank(IDXGIOutput *iface) { - FIXME("iface %p stub!\n", iface); + static BOOL once = FALSE; + + if (!once++) + FIXME("iface %p stub!\n", iface); + else + TRACE("iface %p stub!\n", iface); return E_NOTIMPL; }

1 0

Nikolay Sivov : dxgi/tests: Switch to D3D10.1.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 1502436ea7b615f588fc243b62a417adb8a5bb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1502436ea7b615f588fc243b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 11:26:25 2017 +0300 dxgi/tests: Switch to D3D10.1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/device.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index d706f16..2676bc9 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = d3d10 dxgi user32 +IMPORTS = d3d10_1 dxgi user32 C_SRCS = \ device.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 0b3891f..9fe63b5 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -306,22 +306,25 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ static IDXGIDevice *create_device(void) { IDXGIDevice *dxgi_device; - ID3D10Device *device; + ID3D10Device1 *device; HRESULT hr; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, + 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) goto success; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL, + 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) goto success; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, + 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) goto success; return NULL; success: - hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); - ID3D10Device_Release(device); + ID3D10Device1_Release(device); return dxgi_device; }

1 0

Nikolay Sivov : dxgi/tests: Basic test for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 0b4ca2519870ce45b9b16411762b30e30602d50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4ca2519870ce45b9b164117… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 11:26:26 2017 +0300 dxgi/tests: Basic test for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 23 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 9fe63b5..b092d5e 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -303,20 +303,20 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } -static IDXGIDevice *create_device(void) +static IDXGIDevice *create_device(UINT flags) { IDXGIDevice *dxgi_device; ID3D10Device1 *device; HRESULT hr; if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, - 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) + flags, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) goto success; if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL, - 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) + flags, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) goto success; if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, - 0, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) + flags, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) goto success; return NULL; @@ -339,7 +339,7 @@ static void test_adapter_desc(void) ULONG refcount; HRESULT hr; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; @@ -407,7 +407,7 @@ static void test_check_interface_support(void) ULONG refcount; HRESULT hr; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return; @@ -462,7 +462,7 @@ static void test_create_surface(void) ULONG refcount; HRESULT hr; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; @@ -508,7 +508,7 @@ static void test_parents(void) ULONG refcount; HRESULT hr; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; @@ -576,7 +576,7 @@ static void test_output(void) UINT mode_count, mode_count_comp, i; DXGI_MODE_DESC *modes; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; @@ -683,7 +683,7 @@ static void test_find_closest_matching_mode(void) ULONG refcount; HRESULT hr; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return; @@ -867,13 +867,14 @@ static void test_create_swapchain(void) struct swapchain_fullscreen_state initial_state, expected_state; unsigned int i, expected_width, expected_height; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + IDXGIDevice *device, *bgra_device; ULONG refcount, expected_refcount; + IUnknown *obj, *obj2, *parent; RECT *expected_client_rect; IDXGISwapChain *swapchain; - IUnknown *obj, *parent; + IDXGISurface1 *surface; IDXGIAdapter *adapter; IDXGIFactory *factory; - IDXGIDevice *device; IDXGIOutput *target; BOOL fullscreen; HRESULT hr; @@ -887,7 +888,7 @@ static void test_create_swapchain(void) { 0, 0, TRUE, FALSE}, }; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; @@ -1004,6 +1005,55 @@ static void test_create_swapchain(void) check_window_fullscreen_state(creation_desc.OutputWindow, &initial_state.fullscreen_state); + /* Test GDI-compatible swapchain */ + bgra_device = create_device(D3D10_CREATE_DEVICE_BGRA_SUPPORT); + ok(!!bgra_device, "Failed to create BGRA capable device.\n"); + + hr = IDXGIDevice_QueryInterface(bgra_device, &IID_IUnknown, (void **)&obj2); + ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown.\n"); + + hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface); + if (SUCCEEDED(hr)) + { + HDC hdc; + + hr = IDXGISurface1_GetDC(surface, FALSE, &hdc); + ok(FAILED(hr), "Expected GetDC() to fail, %#x\n", hr); + + IDXGISurface1_Release(surface); + IDXGISwapChain_Release(swapchain); + + creation_desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + creation_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; + + hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + creation_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + creation_desc.Flags = 0; + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get front buffer, hr %#x.\n", hr); + + hr = IDXGISurface1_GetDC(surface, FALSE, &hdc); + todo_wine + ok(SUCCEEDED(hr), "Expected GetDC() to succeed, %#x\n", hr); + IDXGISurface1_ReleaseDC(surface, NULL); + + IDXGISurface1_Release(surface); + IDXGISwapChain_Release(swapchain); + } + else + { + win_skip("IDXGISurface1 is not supported, skipping GetDC() tests.\n"); + IDXGISwapChain_Release(swapchain); + } + IUnknown_Release(obj2); + IDXGIDevice_Release(bgra_device); + creation_desc.Windowed = FALSE; for (i = 0; i < sizeof(refresh_list) / sizeof(*refresh_list); ++i) @@ -1231,7 +1281,7 @@ static void test_get_containing_output(void) HRESULT hr; BOOL ret; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return; @@ -1585,7 +1635,7 @@ static void test_set_fullscreen(void) ULONG refcount; HRESULT hr; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return; @@ -1678,7 +1728,7 @@ static void test_default_fullscreen_target_output(void) HRESULT hr; BOOL ret; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return; @@ -1958,7 +2008,7 @@ static void test_resize_target(void) {{10, 10}, FALSE, TRUE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, }; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return; @@ -2095,7 +2145,7 @@ static void test_inexact_modes(void) {799, 601}, }; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return; @@ -2333,13 +2383,13 @@ static void test_private_data(void) {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b} }; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; } - test_object = create_device(); + test_object = create_device(0); /* SetPrivateData with a pointer of NULL has the purpose of FreePrivateData in previous * d3d versions. A successful clear returns S_OK. A redundant clear S_FALSE. Setting a @@ -2462,7 +2512,7 @@ static void test_swapchain_resize(void) HRESULT hr; BOOL ret; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; @@ -2832,7 +2882,7 @@ static void test_swapchain_parameters(void) {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, }; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device, skipping tests.\n"); return; @@ -2953,7 +3003,7 @@ static void test_maximum_frame_latency(void) ULONG refcount; HRESULT hr; - if (!(device = create_device())) + if (!(device = create_device(0))) { skip("Failed to create device.\n"); return;

1 0

Józef Kucia : wined3d: Use more suitable bind target for SRV/UAV buffers.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 2249527922504ae0e379da738b3ef5986c037b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2249527922504ae0e379da738… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 8 11:54:13 2017 +0100 wined3d: Use more suitable bind target for SRV/UAV buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index de5ab17..5e434f3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1353,11 +1353,16 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_sub_resource_unmap, }; -static GLenum buffer_type_hint_from_bind_flags(unsigned int bind_flags) +static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_info, + unsigned int bind_flags) { if (bind_flags == WINED3D_BIND_INDEX_BUFFER) return GL_ELEMENT_ARRAY_BUFFER; + if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS) + && gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + return GL_TEXTURE_BUFFER; + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) return GL_UNIFORM_BUFFER; @@ -1395,7 +1400,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(bind_flags); + buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, bind_flags); buffer->bind_flags = bind_flags; buffer->locations = WINED3D_LOCATION_SYSMEM;

1 0

Józef Kucia : d3d11/tests: Add test for interleaved Draw() and Dispatch() calls.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: dc92de848b95234b1b5f10f6d8e0e982489d652e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc92de848b95234b1b5f10f6d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 8 11:54:14 2017 +0100 d3d11/tests: Add test for interleaved Draw() and Dispatch() calls. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e966d4..ca27354 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12631,6 +12631,187 @@ static void test_cs_uav_store(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_ps_cs_uav_binding(void) +{ + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + ID3D11UnorderedAccessView *cs_uav, *ps_uav; + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D11Texture2D *cs_texture, *ps_texture; + struct d3d11_test_context test_context; + static const float zero[4] = {0.0f}; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11Buffer *cs_cb, *ps_cb; + struct vec4 input = {1.0f}; + ID3D11ComputeShader *cs; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD cs_code[] = + { +#if 0 + RWTexture2D<float> u; + + float value; + + [numthreads(1, 1, 1)] + void main() + { + uint x, y, width, height; + u.GetDimensions(width, height); + for (y = 0; y < height; ++y) + { + for (x = 0; x < width; ++x) + u[uint2(x, y)] = value; + } + } +#endif + 0x43425844, 0x6503503a, 0x4cd524e6, 0x2473915d, 0x93cf1201, 0x00000001, 0x000001c8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000174, 0x00050050, 0x0000005d, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000000, 0x00005555, + 0x02000068, 0x00000003, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, 0x8900103d, 0x800000c2, + 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000000, 0x05000036, + 0x00100042, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100082, 0x00000000, + 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, 0x03040003, 0x0010003a, 0x00000000, 0x05000036, + 0x001000e2, 0x00000001, 0x00100aa6, 0x00000000, 0x05000036, 0x00100082, 0x00000000, 0x00004001, + 0x00000000, 0x01000030, 0x07000050, 0x00100012, 0x00000002, 0x0010003a, 0x00000000, 0x0010000a, + 0x00000000, 0x03040003, 0x0010000a, 0x00000002, 0x05000036, 0x00100012, 0x00000001, 0x0010003a, + 0x00000000, 0x080000a4, 0x0011e0f2, 0x00000000, 0x00100e46, 0x00000001, 0x00208006, 0x00000000, + 0x00000000, 0x0700001e, 0x00100082, 0x00000000, 0x0010003a, 0x00000000, 0x00004001, 0x00000001, + 0x01000016, 0x0700001e, 0x00100042, 0x00000000, 0x0010002a, 0x00000000, 0x00004001, 0x00000001, + 0x01000016, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + RWTexture2D<float> u : register(u1); + + float value; + + void main() + { + uint x, y, width, height; + u.GetDimensions(width, height); + for (y = 0; y < height; ++y) + { + for (x = 0; x < width; ++x) + u[uint2(x, y)] = value; + } + } +#endif + 0x43425844, 0x2e14423b, 0x62c015c8, 0x5ea5ab9f, 0x514f1e22, 0x00000001, 0x000001b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000164, 0x00000050, 0x00000059, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400189c, 0x0011e000, 0x00000001, 0x00005555, + 0x02000068, 0x00000003, 0x8900103d, 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, + 0x00000000, 0x0011ee46, 0x00000001, 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0x00000000, + 0x01000030, 0x07000050, 0x00100082, 0x00000000, 0x0010002a, 0x00000000, 0x0010001a, 0x00000000, + 0x03040003, 0x0010003a, 0x00000000, 0x05000036, 0x001000e2, 0x00000001, 0x00100aa6, 0x00000000, + 0x05000036, 0x00100082, 0x00000000, 0x00004001, 0x00000000, 0x01000030, 0x07000050, 0x00100012, + 0x00000002, 0x0010003a, 0x00000000, 0x0010000a, 0x00000000, 0x03040003, 0x0010000a, 0x00000002, + 0x05000036, 0x00100012, 0x00000001, 0x0010003a, 0x00000000, 0x080000a4, 0x0011e0f2, 0x00000001, + 0x00100e46, 0x00000001, 0x00208006, 0x00000000, 0x00000000, 0x0700001e, 0x00100082, 0x00000000, + 0x0010003a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0700001e, 0x00100042, 0x00000000, + 0x0010002a, 0x00000000, 0x00004001, 0x00000001, 0x01000016, 0x0100003e, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + ps_cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(input), &input.x); + cs_cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(input), &input.x); + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &cs_texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &ps_texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + uav_desc.Format = texture_desc.Format; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D; + U(uav_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)cs_texture, &uav_desc, &cs_uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)ps_texture, &uav_desc, &ps_uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_CSSetConstantBuffers(context, 0, 1, &cs_cb); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &cs_uav, NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &ps_cb); + /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, + 1, &test_context.backbuffer_rtv, NULL, 1, 1, &ps_uav, NULL); + + ID3D11DeviceContext_ClearUnorderedAccessViewFloat(context, cs_uav, zero); + check_texture_float(cs_texture, 0.0f, 2); + ID3D11DeviceContext_ClearUnorderedAccessViewFloat(context, ps_uav, zero); + check_texture_float(ps_texture, 0.0f, 2); + + hr = ID3D11Device_CreateComputeShader(device, cs_code, sizeof(cs_code), NULL, &cs); + ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + todo_wine check_texture_float(cs_texture, 1.0f, 2); + check_texture_float(ps_texture, 0.0f, 2); + draw_quad(&test_context); + todo_wine check_texture_float(cs_texture, 1.0f, 2); + todo_wine check_texture_float(ps_texture, 1.0f, 2); + + input.x = 0.5f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + todo_wine check_texture_float(cs_texture, 0.5f, 2); + todo_wine check_texture_float(ps_texture, 1.0f, 2); + input.x = 2.0f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); + draw_quad(&test_context); + todo_wine check_texture_float(cs_texture, 0.5f, 2); + todo_wine check_texture_float(ps_texture, 2.0f, 2); + + input.x = 8.0f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); + input.x = 4.0f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + todo_wine check_texture_float(cs_texture, 8.0f, 2); + todo_wine check_texture_float(ps_texture, 2.0f, 2); + draw_quad(&test_context); + todo_wine check_texture_float(cs_texture, 8.0f, 2); + todo_wine check_texture_float(ps_texture, 4.0f, 2); + + ID3D11ComputeShader_Release(cs); + ID3D11PixelShader_Release(ps); + ID3D11Buffer_Release(cs_cb); + ID3D11Buffer_Release(ps_cb); + ID3D11Texture2D_Release(cs_texture); + ID3D11Texture2D_Release(ps_texture); + ID3D11UnorderedAccessView_Release(cs_uav); + ID3D11UnorderedAccessView_Release(ps_uav); + ID3D11DeviceContext_Release(context); + release_test_context(&test_context); +} + static void test_sm4_ret_instruction(void) { struct d3d11_test_context test_context; @@ -13440,6 +13621,7 @@ START_TEST(d3d11) test_stencil_separate(); test_uav_load(); test_cs_uav_store(); + test_ps_cs_uav_binding(); test_sm4_ret_instruction(); test_primitive_restart(); test_sm5_bufinfo_instruction();

1 0

Józef Kucia : wined3d: Implement SM5 store_uav_typed instruction.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 94a214b2bbf8f486619bc0d1d88003b2f6f3b85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a214b2bbf8f486619bc0d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 8 11:54:15 2017 +0100 wined3d: Implement SM5 store_uav_typed instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 +++++----- dlls/wined3d/glsl_shader.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ca27354..da5b02c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12776,18 +12776,18 @@ static void test_ps_cs_uav_binding(void) check_texture_float(ps_texture, 0.0f, 2); draw_quad(&test_context); todo_wine check_texture_float(cs_texture, 1.0f, 2); - todo_wine check_texture_float(ps_texture, 1.0f, 2); + check_texture_float(ps_texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); todo_wine check_texture_float(cs_texture, 0.5f, 2); - todo_wine check_texture_float(ps_texture, 1.0f, 2); + check_texture_float(ps_texture, 1.0f, 2); input.x = 2.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); draw_quad(&test_context); todo_wine check_texture_float(cs_texture, 0.5f, 2); - todo_wine check_texture_float(ps_texture, 2.0f, 2); + check_texture_float(ps_texture, 2.0f, 2); input.x = 8.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); @@ -12795,10 +12795,10 @@ static void test_ps_cs_uav_binding(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); todo_wine check_texture_float(cs_texture, 8.0f, 2); - todo_wine check_texture_float(ps_texture, 2.0f, 2); + check_texture_float(ps_texture, 2.0f, 2); draw_quad(&test_context); todo_wine check_texture_float(cs_texture, 8.0f, 2); - todo_wine check_texture_float(ps_texture, 4.0f, 2); + check_texture_float(ps_texture, 4.0f, 2); ID3D11ComputeShader_Release(cs); ID3D11PixelShader_Release(ps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e47d18b..2663403 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4922,7 +4922,7 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) if (resource_type >= ARRAY_SIZE(resource_type_info)) { ERR("Unexpected resource type %#x.\n", resource_type); - resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + return; } data_type = reg_maps->uav_resource_info[uav_idx].data_type; coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; @@ -4968,6 +4968,38 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } +static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; + struct glsl_src_param image_coord_param, image_data_param; + enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type data_type; + unsigned int uav_idx; + DWORD coord_mask; + + uav_idx = ins->dst[0].reg.idx[0].offset; + if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", uav_idx); + return; + } + resource_type = reg_maps->uav_resource_info[uav_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + data_type = reg_maps->uav_resource_info[uav_idx].data_type; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); + shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); + shader_addline(ins->ctx->buffer, "imageStore(%s_image%u, %s, %s);\n", + shader_glsl_get_prefix(version->type), uav_idx, + image_coord_param.param_str, image_data_param.param_str); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -9094,7 +9126,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_STRUCTURED */ NULL, - /* WINED3DSIH_STORE_UAV_TYPED */ NULL, + /* WINED3DSIH_STORE_UAV_TYPED */ shader_glsl_store_uav, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ shader_glsl_switch,

1 0