May 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 1/7] vkd3d: Use VK_SHARING_MODE_CONCURRENT only when queue family count > 1.
by Józef Kucia May 6, 2019

May 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> The Vulkan spec states: If sharingMode is VK_SHARING_MODE_CONCURRENT, queueFamilyIndexCount must be greater than 1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 5bb76bf0c3e0..36e470bdd0d5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -536,9 +536,18 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, return E_INVALIDARG; } - buffer_info.sharingMode = VK_SHARING_MODE_CONCURRENT; - buffer_info.queueFamilyIndexCount = device->queue_family_count; - buffer_info.pQueueFamilyIndices = device->queue_family_indices; + if (device->queue_family_count > 1) + { + buffer_info.sharingMode = VK_SHARING_MODE_CONCURRENT; + buffer_info.queueFamilyIndexCount = device->queue_family_count; + buffer_info.pQueueFamilyIndices = device->queue_family_indices; + } + else + { + buffer_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + buffer_info.queueFamilyIndexCount = 0; + buffer_info.pQueueFamilyIndices = NULL; + } if ((vr = VK_CALL(vkCreateBuffer(device->vk_device, &buffer_info, NULL, vk_buffer))) < 0) { @@ -626,7 +635,7 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, if (!(desc->Flags & D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE)) image_info.usage |= VK_IMAGE_USAGE_SAMPLED_BIT; - if (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS) + if ((desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS) && device->queue_family_count > 1) { TRACE("Creating image with VK_SHARING_MODE_CONCURRENT.\n"); image_info.sharingMode = VK_SHARING_MODE_CONCURRENT; -- 2.21.0

2 1

[PATCH 5/5] winex11: Only handle errors from GLX requests in GLXErrorHandler().
by Henri Verbeet May 6, 2019

May 6, 2019

Spurious errors that would otherwise be handled by ignore_error() may cause OpenGL context creation to fail. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a51a935ca4d..ee28a1d7902 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -182,6 +182,7 @@ static char *glExtensions; static const char *glxExtensions; static char wglExtensions[4096]; static int glxVersion[2]; +static int glx_opcode; struct wgl_pixel_format { @@ -336,7 +337,6 @@ static void (*pglXDestroyContext)( Display *dpy, GLXContext ctx ); static Bool (*pglXMakeCurrent)( Display *dpy, GLXDrawable drawable, GLXContext ctx); static void (*pglXCopyContext)( Display *dpy, GLXContext src, GLXContext dst, unsigned long mask ); static void (*pglXSwapBuffers)( Display *dpy, GLXDrawable drawable ); -static Bool (*pglXQueryExtension)( Display *dpy, int *errorb, int *event ); static Bool (*pglXQueryVersion)( Display *dpy, int *maj, int *min ); static Bool (*pglXIsDirect)( Display *dpy, GLXContext ctx ); static GLXContext (*pglXGetCurrentContext)( void ); @@ -412,6 +412,8 @@ static BOOL has_extension( const char *list, const char *ext ) static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { /* In the future we might want to find the exact X or GLX error to report back to the app */ + if (event->request_code != glx_opcode) + return 0; return 1; } @@ -594,7 +596,6 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) LOAD_FUNCPTR(glXIsDirect); LOAD_FUNCPTR(glXMakeCurrent); LOAD_FUNCPTR(glXSwapBuffers); - LOAD_FUNCPTR(glXQueryExtension); LOAD_FUNCPTR(glXQueryVersion); /* GLX 1.1 */ @@ -633,7 +634,8 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) if(!X11DRV_WineGL_InitOpenglInfo()) goto failed; - if (pglXQueryExtension(gdi_display, &error_base, &event_base)) { + if (XQueryExtension( gdi_display, "GLX", &glx_opcode, &event_base, &error_base )) + { TRACE("GLX is up and running error_base = %d\n", error_base); } else { ERR( "GLX extension is missing, disabling OpenGL.\n" ); -- 2.11.0

2 1

[PATCH 4/5] wined3d: Get rid of context_validate_onscreen_formats().
by Henri Verbeet May 6, 2019

May 6, 2019

This was used when using the onscreen depth/stencil buffer with FBOs. We no longer do that. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 30686f57200..0defbcc25a9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2683,47 +2683,6 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context->render_offscreen = offscreen; } -static BOOL match_depth_stencil_format(const struct wined3d_format *existing, - const struct wined3d_format *required) -{ - if (existing == required) - return TRUE; - if ((existing->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - != (required->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) - return FALSE; - if (existing->depth_size < required->depth_size) - return FALSE; - /* If stencil bits are used the exact amount is required - otherwise - * wrapping won't work correctly. */ - if (required->stencil_size && required->stencil_size != existing->stencil_size) - return FALSE; - return TRUE; -} - -/* Context activation is done by the caller. */ -static void context_validate_onscreen_formats(struct wined3d_context *context, - const struct wined3d_rendertarget_view *depth_stencil) -{ - /* Onscreen surfaces are always in a swapchain */ - struct wined3d_swapchain *swapchain = context->current_rt.texture->swapchain; - - if (context->render_offscreen || !depth_stencil) return; - if (match_depth_stencil_format(swapchain->ds_format, depth_stencil->format)) return; - - /* TODO: If the requested format would satisfy the needs of the existing one(reverse match), - * or no onscreen depth buffer was created, the OpenGL drawable could be changed to the new - * format. */ - WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); - - /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ - if (!(wined3d_texture_load_location(context->current_rt.texture, context->current_rt.sub_resource_idx, - context, WINED3D_LOCATION_TEXTURE_RGB))) - ERR("Failed to load location.\n"); - swapchain->render_to_fbo = TRUE; - swapchain_update_draw_bindings(swapchain); - context_set_render_offscreen(context, TRUE); -} - GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) { switch (wined3d_settings.offscreen_rendering_mode) @@ -3031,8 +2990,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win { struct wined3d_rendertarget_info ds_info = {{0}}; - context_validate_onscreen_formats(context, dsv); - if (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource)) { memset(context->blit_targets, 0, sizeof(context->blit_targets)); @@ -3946,11 +3903,6 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, context_set_render_offscreen(context, TRUE); } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) - { - context_validate_onscreen_formats(context, fb->depth_stencil); - } - /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ -- 2.11.0

2 1

[PATCH 3/5] wined3d: Get rid of the "target" parameter to wined3d_adapter_gl_create_context().
by Henri Verbeet May 6, 2019

May 6, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 3 +-- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a5fd8912603..da53edd953a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -288,8 +288,7 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) heap_free(device_vk); } -static BOOL adapter_vk_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +static BOOL adapter_vk_create_context(struct wined3d_context *context, const struct wined3d_format *ds_format) { return TRUE; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a4f4be5357c..30686f57200 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1967,12 +1967,11 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_format *ds_format) { - struct wined3d_texture *target = swapchain->front_buffer; struct wined3d_device *device = swapchain->device; struct wined3d_context_gl *context_gl; struct wined3d_context *context; - TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); + TRACE("swapchain %p.\n", swapchain); wined3d_from_cs(device->cs); @@ -1985,7 +1984,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, cons heap_free(context_gl); return NULL; } - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + if (!(device->adapter->adapter_ops->adapter_create_context(context, ds_format))) { wined3d_release_dc(context->win_handle, context->hdc); heap_free(context_gl); @@ -2004,13 +2003,13 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, cons return context; } -BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, const struct wined3d_format *ds_format) { struct wined3d_device *device = context->device; const struct wined3d_format *color_format; const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; + struct wined3d_resource *target; unsigned int target_bind_flags; BOOL aux_buffers = FALSE; HGLRC ctx, share_ctx; @@ -2057,8 +2056,9 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, sizeof(*context->texture_type)))) return FALSE; - color_format = target->resource.format; - target_bind_flags = target->resource.bind_flags; + target = &context->current_rt.texture->resource; + color_format = target->format; + target_bind_flags = target->bind_flags; /* In case of ORM_BACKBUFFER, make sure to request an alpha component for * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ @@ -2141,7 +2141,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, } } - context->render_offscreen = wined3d_resource_is_offscreen(&target->resource); + context->render_offscreen = wined3d_resource_is_offscreen(target); context->draw_buffers_mask = context_generate_rt_mask(GL_BACK); context->valid = 1; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b8c151dc971..c909e5185a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2256,7 +2256,7 @@ static void adapter_no3d_destroy_device(struct wined3d_device *device) } static BOOL wined3d_adapter_no3d_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) + const struct wined3d_format *ds_format) { return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 02177a96b7f..fbcda94537e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2711,8 +2711,7 @@ struct wined3d_adapter_ops BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device); void (*adapter_destroy_device)(struct wined3d_device *device); - BOOL (*adapter_create_context)(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format); + BOOL (*adapter_create_context)(struct wined3d_context *context, const struct wined3d_format *ds_format); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); BOOL (*adapter_check_format)(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, @@ -2767,9 +2766,10 @@ static inline const struct wined3d_adapter_gl *wined3d_adapter_gl_const(const st return CONTAINING_RECORD(adapter, struct wined3d_adapter_gl, a); } -struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; +struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; + const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; struct wined3d_adapter_vk { -- 2.11.0

2 1

[PATCH] d3d11: Set more format support flags.
by Józef Kucia May 6, 2019

May 6, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47096 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 588395b4b6a6..768fe4bc5503 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3342,6 +3342,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } wined3d_mutex_unlock(); + if (*format_support & (D3D11_FORMAT_SUPPORT_TEXTURE1D + | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D)) + { + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; + + if (*format_support & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) + { + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; + } + } + return S_OK; } -- 2.19.2

4 3

[PATCH 2/5] wined3d: Get rid of the "target" parameter to wined3d_context_init().
by Henri Verbeet May 6, 2019

May 6, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3b1832fe108..a4f4be5357c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1910,8 +1910,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; DWORD state; @@ -1952,7 +1951,7 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d context->device = device; context->swapchain = swapchain; - context->current_rt.texture = target; + context->current_rt.texture = swapchain->front_buffer; context->current_rt.sub_resource_idx = 0; context->tid = GetCurrentThreadId(); @@ -1981,7 +1980,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, cons return NULL; context = &context_gl->c; - if (!(wined3d_context_init(context, swapchain, target, ds_format))) + if (!(wined3d_context_init(context, swapchain))) { heap_free(context_gl); return NULL; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Get rid of the "target" parameter to context_create().
by Henri Verbeet May 6, 2019

May 6, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7e7ab09b76c..3b1832fe108 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1966,9 +1966,9 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d return TRUE; } -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_format *ds_format) { + struct wined3d_texture *target = swapchain->front_buffer; struct wined3d_device *device = swapchain->device; struct wined3d_context_gl *context_gl; struct wined3d_context *context; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4ac091f6924..7210682c45f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -739,7 +739,7 @@ static void wined3d_swapchain_cs_init(void *object) for (i = 0; i < ARRAY_SIZE(formats); ++i) { swapchain->ds_format = wined3d_get_format(adapter, formats[i], WINED3D_BIND_DEPTH_STENCIL); - if ((swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) + if ((swapchain->context[0] = context_create(swapchain, swapchain->ds_format))) break; TRACE("Depth stencil format %s is not supported, trying next format.\n", debug_d3dformat(formats[i])); } @@ -1085,7 +1085,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); - if (!(ctx = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) + if (!(ctx = context_create(swapchain, swapchain->ds_format))) { ERR("Failed to create a new context for the swapchain\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e698c792813..02177a96b7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2196,7 +2196,7 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void wined3d_context_destroy(struct wined3d_context *context) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH] winemac.drv: Allow mac IME to clear text in system input method
by Aric Stewart May 6, 2019

May 6, 2019

v2: correct Extra semicolon spotted by Zhiyi Zhang v3: updates from Ken Thomases Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 26 +++++++++++++++++++++++--- dlls/winemac.drv/ime.c | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-)

2 1

[PATCH 2/4] d3d11/tests: Add test for creating deferred contexts.
by Józef Kucia May 6, 2019

May 6, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2850d59757e5..b1148cd9494d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2185,6 +2185,57 @@ static void test_get_immediate_context(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_deferred_context(void) +{ + ULONG refcount, expected_refcount; + struct device_desc device_desc; + ID3D11DeviceContext *context; + ID3D11Device *device; + HRESULT hr; + + device_desc.feature_level = NULL; + device_desc.flags = D3D11_CREATE_DEVICE_SINGLETHREADED; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create single-threaded device.\n"); + return; + } + + hr = ID3D11Device_CreateDeferredContext(device, 0, &context); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Failed to create deferred context, hr %#x.\n", hr); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + expected_refcount = get_refcount(device) + 1; + hr = ID3D11Device_CreateDeferredContext(device, 0, &context); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (FAILED(hr)) + goto done; + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + refcount = get_refcount(context); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + check_interface(context, &IID_IUnknown, TRUE, FALSE); + check_interface(context, &IID_ID3D11DeviceChild, TRUE, FALSE); + check_interface(context, &IID_ID3D11DeviceContext, TRUE, FALSE); + check_interface(context, &IID_ID3D11Multithread, FALSE, FALSE); + + refcount = ID3D11DeviceContext_Release(context); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + +done: + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture1d(void) { ULONG refcount, expected_refcount; @@ -29205,6 +29256,7 @@ START_TEST(d3d11) queue_test(test_create_device); queue_for_each_feature_level(test_device_interfaces); queue_test(test_get_immediate_context); + queue_test(test_create_deferred_context); queue_test(test_create_texture1d); queue_test(test_texture1d_interfaces); queue_test(test_create_texture2d); -- 2.21.0

3 2

[PATCH 4/4] d3d10core/tests: Add test for ID3D11Multithread.
by Józef Kucia May 6, 2019

May 6, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 51 ++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b0ff09d3697b..32f943704af8 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1594,11 +1594,16 @@ static void test_feature_level(void) static void test_device_interfaces(void) { + ID3D11DeviceContext *immediate_context; + ID3D11Multithread *d3d11_multithread; + ULONG refcount, expected_refcount; + ID3D10Multithread *multithread; + ID3D11Device *d3d11_device; IDXGIAdapter *dxgi_adapter; IDXGIDevice *dxgi_device; ID3D10Device *device; IUnknown *iface; - ULONG refcount; + BOOL enabled; HRESULT hr; if (!(device = create_device())) @@ -1615,20 +1620,56 @@ static void test_device_interfaces(void) check_interface(device, &IID_ID3D11Device, TRUE, TRUE); /* Not available on all Windows versions. */ hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); + ok(hr == S_OK, "Device should implement IDXGIDevice.\n"); hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter, (void **)&dxgi_adapter); - ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter.\n"); + ok(hr == S_OK, "Device parent should implement IDXGIAdapter.\n"); hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory, (void **)&iface); - ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory.\n"); + ok(hr == S_OK, "Adapter parent should implement IDXGIFactory.\n"); IUnknown_Release(iface); IUnknown_Release(dxgi_adapter); hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter1, (void **)&dxgi_adapter); - ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter1.\n"); + ok(hr == S_OK, "Device parent should implement IDXGIAdapter1.\n"); hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory1, (void **)&iface); ok(hr == E_NOINTERFACE, "Adapter parent should not implement IDXGIFactory1.\n"); IUnknown_Release(dxgi_adapter); IUnknown_Release(dxgi_device); + hr = ID3D10Device_QueryInterface(device, &IID_ID3D11Device, (void **)&d3d11_device); + if (hr != S_OK) + goto done; + + expected_refcount = get_refcount(device) + 1; + + hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&multithread); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + + expected_refcount = refcount; + refcount = get_refcount(multithread); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + + ID3D11Device_GetImmediateContext(d3d11_device, &immediate_context); + hr = ID3D11DeviceContext_QueryInterface(immediate_context, + &IID_ID3D11Multithread, (void **)&d3d11_multithread); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + expected_refcount = get_refcount(immediate_context); + refcount = get_refcount(d3d11_multithread); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + + enabled = ID3D10Multithread_GetMultithreadProtected(multithread); + ok(enabled, "Multithread protection is %#x.\n", enabled); + enabled = ID3D11Multithread_GetMultithreadProtected(d3d11_multithread); + ok(enabled, "Multithread protection is %#x.\n", enabled); + + ID3D11Device_Release(d3d11_device); + ID3D11DeviceContext_Release(immediate_context); + ID3D10Multithread_Release(multithread); + ID3D11Multithread_Release(d3d11_multithread); + +done: refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } -- 2.21.0

3 2