February 2017 - Wine-Commits

Matteo Bruni : ddraw/tests: Fix IDirect3DDevice typo.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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

Nikolay Sivov : dxgi/tests: Switch to D3D10.1.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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

Matteo Bruni : d3dx11: Make use of data_size when tracing data string.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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

Francois Gouget : inetcomm/tests: A spelling fix in an ok() message.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 6b2dbe6cf6e30d9833f32d2c933be9175cc3eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2dbe6cf6e30d9833f32d2c9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 12:09:51 2017 +0100 inetcomm/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 5701af6..c2026bc 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -1579,7 +1579,7 @@ static void test_mhtml_protocol(void) hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); - ok(hres == S_OK, "Coult not get IInternetProtocol iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); IUnknown_Release(unk2); IUnknown_Release(unk);

1 0

Matteo Bruni : wined3d: Don't query aux buffers count on core profile.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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

Henri Verbeet : wined3d: Allow decompression blits on system memory resources in ffp_blit_supported ().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 807733f1c99e2cf2dede66af8381685e35c8b277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807733f1c99e2cf2dede66af8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:35 2017 +0100 wined3d: Allow decompression blits on system memory resources in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b4e2025..222159b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2930,7 +2930,11 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + BOOL decompress; + + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM)) { TRACE("Source or destination is in system memory.\n"); return FALSE;

1 0

Henri Verbeet : wined3d: Trace the blit parameters in wined3d_select_blitter().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: f4580e2a574d1183950f05c1826194bf6b638eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4580e2a574d1183950f05c18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:33 2017 +0100 wined3d: Trace the blit parameters in wined3d_select_blitter(). Mostly for convenience, in principle these can be reconstructed from the rest of the debug output. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 30a80e5..64a6b9d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5810,6 +5810,12 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g }; unsigned int i; + TRACE("gl_info %p, d3d_info %p, blit_op %#x, src_rect %s, src_usage %s, src_pool %s, src_format %s, " + "dst_rect %s, dst_usage %s, dst_pool %s, dst_format %s.\n", gl_info, d3d_info, blit_op, + wine_dbgstr_rect(src_rect), debug_d3dusage(src_usage), debug_d3dpool(src_pool), + src_format ? debug_d3dformat(src_format->id) : "(null)", wine_dbgstr_rect(dst_rect), + debug_d3dusage(dst_usage), debug_d3dpool(dst_pool), debug_d3dformat(dst_format->id)); + for (i = 0; i < sizeof(blitters) / sizeof(*blitters); ++i) { if (blitters[i]->blit_supported(gl_info, d3d_info, blit_op,

1 0

Henri Verbeet : wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported ().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: f576e5c02857a506e63c33e3303e2a0a4bc24e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f576e5c02857a506e63c33e33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:34 2017 +0100 wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported(). In general we prefer to do blits between system memory resources on the CPU, but decompressing DXTn formats in particular is problematic. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f9906b2..85ed462 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7713,6 +7713,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { enum complex_fixup src_fixup; + BOOL decompress; if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; @@ -7735,7 +7736,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup);

1 0

Nikolay Sivov : dxgi/tests: Basic test for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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 Feb. 8, 2017

Feb. 8, 2017

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