May 2021 - Wine-devel - list.winehq.org

[PATCH 2/5] d3d10core/tests: Add some tests for copying between depth/stencil and colour formats.
by Henri Verbeet 06 May '21

06 May '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d23857a14bf..def80870fd5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16112,6 +16112,8 @@ static void test_format_compatibility(void) DXGI_FORMAT dst_format; size_t texel_size; BOOL success; + BOOL src_ds; + BOOL dst_ds; } test_data[] = { @@ -16140,6 +16142,10 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + {DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_R16_UNORM, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_D16_UNORM, 2, FALSE, FALSE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, FALSE, FALSE, TRUE}, }; static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = @@ -16161,7 +16167,6 @@ static void test_format_compatibility(void) texture_desc.ArraySize = 1; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; - texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; @@ -16172,7 +16177,8 @@ static void test_format_compatibility(void) texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); texture_desc.Format = test_data[i].src_format; - texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + texture_desc.Usage = test_data[i].src_ds ? D3D10_USAGE_DEFAULT : D3D10_USAGE_IMMUTABLE; + texture_desc.BindFlags = test_data[i].src_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE; resource_data.pSysMem = bitmap_data; resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; @@ -16183,6 +16189,7 @@ static void test_format_compatibility(void) texture_desc.Format = test_data[i].dst_format; texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = test_data[i].dst_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE; resource_data.pSysMem = initial_data; @@ -16201,7 +16208,9 @@ static void test_format_compatibility(void) texel_dwords = test_data[i].texel_size / sizeof(DWORD); get_texture_readback(dst_texture, 0, &rb); - for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + /* While partial depth/stencil <-> colour copies are unsupported in + * d3d11, they're just broken in d3d10. */ + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !test_data[i].src_ds; ++j) { x = j % 4; y = j / 4; @@ -16222,8 +16231,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_ds) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); -- 2.20.1

2 1

[PATCH 1/5] d3d11/tests: Add some tests for copying between depth/stencil and colour formats.
by Henri Verbeet 06 May '21

06 May '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 95d7c847720..c1834540484 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28184,6 +28184,8 @@ static void test_format_compatibility(void) DXGI_FORMAT dst_format; size_t texel_size; BOOL success; + BOOL src_ds; + BOOL dst_ds; } test_data[] = { @@ -28213,6 +28215,10 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + {DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_R16_UNORM, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_D16_UNORM, 2, TRUE, FALSE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, FALSE, TRUE}, }; static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = @@ -28235,7 +28241,6 @@ static void test_format_compatibility(void) texture_desc.ArraySize = 1; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; - texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; @@ -28247,7 +28252,8 @@ static void test_format_compatibility(void) texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); texture_desc.Format = test_data[i].src_format; - texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + texture_desc.Usage = test_data[i].src_ds ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE; + texture_desc.BindFlags = test_data[i].src_ds ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = bitmap_data; resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; @@ -28258,6 +28264,7 @@ static void test_format_compatibility(void) texture_desc.Format = test_data[i].dst_format; texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = test_data[i].dst_ds ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = initial_data; @@ -28282,10 +28289,11 @@ static void test_format_compatibility(void) x = j % 4; y = j / 4; colour = get_readback_color(&rb, x, y, 0); - expected = test_data[i].success && x >= texel_dwords && y - ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + expected = test_data[i].success && !test_data[i].src_ds && !test_data[i].dst_ds + && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + todo_wine_if((test_data[i].src_ds || test_data[i].dst_ds) && colour) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -28298,8 +28306,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_ds || test_data[i].dst_ds) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); -- 2.20.1

2 1

[v3 PATCH] msxml3: Refcount the domdoc/xmldoc properties.
by Nikolay Sivov 06 May '21

06 May '21

From: Francois Gouget <fgouget(a)codeweavers.com> Multiple domdoc and xmlDoc objects may need to share a common properties object but may be released independently. So add a reference count on the properties object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43377 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: minor changes to new helpers, hopefully didn't break anything. Let's see if that fixes corruption on bot runs. dlls/msxml3/domdoc.c | 47 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cf4f0433218..c67e570a8ea 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -80,6 +80,7 @@ static const WCHAR PropertyNormalizeAttributeValuesW[] = {'N','o','r','m','a','l * We need to preserve this when reloading a document, * and also need access to it from the libxml backend. */ typedef struct { + LONG refs; MSXML_VERSION version; VARIANT_BOOL preserving; IXMLDOMSchemaCollection2* schemaCache; @@ -290,6 +291,7 @@ static domdoc_properties *create_properties(MSXML_VERSION version) { domdoc_properties *properties = heap_alloc(sizeof(domdoc_properties)); + properties->refs = 1; list_init(&properties->selectNsList); properties->preserving = VARIANT_FALSE; properties->schemaCache = NULL; @@ -316,6 +318,7 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) if (pcopy) { + pcopy->refs = 1; pcopy->version = properties->version; pcopy->preserving = properties->preserving; pcopy->schemaCache = properties->schemaCache; @@ -345,9 +348,31 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) return pcopy; } -static void free_properties(domdoc_properties* properties) +static domdoc_properties * properties_add_ref(domdoc_properties *properties) +{ + LONG ref; + + if (!properties) return NULL; + + ref = InterlockedIncrement(&properties->refs); + TRACE("%p, %d.\n", properties, ref); + return properties; +} + +static void properties_release(domdoc_properties *properties) { - if (properties) + LONG ref; + + if (!properties) return; + + ref = InterlockedDecrement(&properties->refs); + + TRACE("%p, %d.\n", properties, ref); + + if (ref < 0) + WARN("negative refcount, expect troubles\n"); + + if (ref == 0) { if (properties->schemaCache) IXMLDOMSchemaCollection2_Release(properties->schemaCache); @@ -622,7 +647,7 @@ LONG xmldoc_release_refs(xmlDocPtr doc, LONG refs) xmlFreeNode( orphan->node ); heap_free( orphan ); } - free_properties(priv->properties); + properties_release(priv->properties); heap_free(doc->_private); xmlFreeDoc(doc); @@ -679,10 +704,16 @@ static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml ) if(This->node.node) { + properties_release(properties_from_xmlDocPtr(get_doc(This))); priv_from_xmlDocPtr(get_doc(This))->properties = NULL; if (xmldoc_release(get_doc(This)) != 0) + { + /* The xmlDocPtr object can no longer use the properties of this + * domdoc object. So give it its own copy. + */ priv_from_xmlDocPtr(get_doc(This))->properties = copy_properties(This->properties); + } } This->node.node = (xmlNodePtr) xml; @@ -690,7 +721,10 @@ static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml ) if(This->node.node) { xmldoc_add_ref(get_doc(This)); - priv_from_xmlDocPtr(get_doc(This))->properties = This->properties; + /* Only attach new xmlDocPtr objects, i.e. ones for which properties + * is still NULL. + */ + priv_from_xmlDocPtr(get_doc(This))->properties = properties_add_ref(This->properties); } return S_OK; @@ -975,6 +1009,7 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); + properties_release(This->properties); release_namespaces(This); heap_free(This); } @@ -3675,7 +3710,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->async = VARIANT_TRUE; doc->validating = 0; doc->resolving = 0; - doc->properties = properties_from_xmlDocPtr(xmldoc); + doc->properties = properties_add_ref(properties_from_xmlDocPtr(xmldoc)); doc->error = S_OK; doc->site = NULL; doc->base_uri = NULL; @@ -3714,7 +3749,7 @@ HRESULT DOMDocument_create(MSXML_VERSION version, void **ppObj) hr = get_domdoc_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); if(FAILED(hr)) { - free_properties(properties_from_xmlDocPtr(xmldoc)); + properties_release(properties_from_xmlDocPtr(xmldoc)); heap_free(xmldoc->_private); xmlFreeDoc(xmldoc); return hr; -- 2.30.2

1 0

[PATCH 1/5] wined3d: Acquire resources through wined3d_device_context_ops.
by Zebediah Figura 06 May '21

06 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 80 ++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b99e3bbac30..d70792084e8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -480,6 +480,12 @@ static inline void wined3d_device_context_finish(struct wined3d_device_context * context->ops->finish(context, queue_id); } +static inline void wined3d_device_context_acquire_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource) +{ + context->ops->acquire_resource(context, resource); +} + static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -765,15 +771,16 @@ void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_c op->rect_count = 1; op->rects[0] = *rect; - wined3d_resource_acquire(view->resource); + wined3d_device_context_acquire_resource(context, view->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) wined3d_device_context_finish(context, WINED3D_CS_QUEUE_DEFAULT); } -static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) +static void acquire_shader_resources(struct wined3d_device_context *context, unsigned int shader_mask) { + const struct wined3d_state *state = context->state; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; struct wined3d_shader *shader; @@ -790,7 +797,7 @@ static void acquire_shader_resources(const struct wined3d_state *state, unsigned for (j = 0; j < WINED3D_MAX_CBS; ++j) { if (state->cb[i][j]) - wined3d_resource_acquire(&state->cb[i][j]->resource); + wined3d_device_context_acquire_resource(context, &state->cb[i][j]->resource); } for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) @@ -800,7 +807,7 @@ static void acquire_shader_resources(const struct wined3d_state *state, unsigned if (!(view = state->shader_resource_view[i][entry->resource_idx])) continue; - wined3d_resource_acquire(view->resource); + wined3d_device_context_acquire_resource(context, view->resource); } } } @@ -838,8 +845,8 @@ static void release_shader_resources(const struct wined3d_state *state, unsigned } } -static void acquire_unordered_access_resources(const struct wined3d_shader *shader, - struct wined3d_unordered_access_view * const *views) +static void acquire_unordered_access_resources(struct wined3d_device_context *context, + const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { unsigned int i; @@ -854,7 +861,7 @@ static void acquire_unordered_access_resources(const struct wined3d_shader *shad if (!views[i]) continue; - wined3d_resource_acquire(views[i]->resource); + wined3d_device_context_acquire_resource(context, views[i]->resource); } } @@ -896,10 +903,12 @@ static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); } -static void acquire_compute_pipeline_resources(const struct wined3d_state *state) +static void acquire_compute_pipeline_resources(struct wined3d_device_context *context) { - acquire_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], + const struct wined3d_state *state = context->state; + + acquire_shader_resources(context, 1u << WINED3D_SHADER_TYPE_COMPUTE); + acquire_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); } @@ -915,7 +924,7 @@ void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *contex op->parameters.u.direct.group_count_y = group_count_y; op->parameters.u.direct.group_count_z = group_count_z; - acquire_compute_pipeline_resources(context->state); + acquire_compute_pipeline_resources(context); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -931,8 +940,8 @@ void CDECL wined3d_device_context_dispatch_indirect(struct wined3d_device_contex op->parameters.u.indirect.buffer = buffer; op->parameters.u.indirect.offset = offset; - acquire_compute_pipeline_resources(context->state); - wined3d_resource_acquire(&buffer->resource); + acquire_compute_pipeline_resources(context); + wined3d_device_context_acquire_resource(context, &buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -1024,37 +1033,38 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, +static void acquire_graphics_pipeline_resources(struct wined3d_device_context *context, BOOL indexed, const struct wined3d_d3d_info *d3d_info) { + const struct wined3d_state *state = context->state; unsigned int i; if (indexed) - wined3d_resource_acquire(&state->index_buffer->resource); + wined3d_device_context_acquire_resource(context, &state->index_buffer->resource); for (i = 0; i < ARRAY_SIZE(state->streams); ++i) { if (state->streams[i].buffer) - wined3d_resource_acquire(&state->streams[i].buffer->resource); + wined3d_device_context_acquire_resource(context, &state->streams[i].buffer->resource); } for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { if (state->stream_output[i].buffer) - wined3d_resource_acquire(&state->stream_output[i].buffer->resource); + wined3d_device_context_acquire_resource(context, &state->stream_output[i].buffer->resource); } for (i = 0; i < ARRAY_SIZE(state->textures); ++i) { if (state->textures[i]) - wined3d_resource_acquire(&state->textures[i]->resource); + wined3d_device_context_acquire_resource(context, &state->textures[i]->resource); } for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb.render_targets[i]) - wined3d_resource_acquire(state->fb.render_targets[i]->resource); + wined3d_device_context_acquire_resource(context, state->fb.render_targets[i]->resource); } if (state->fb.depth_stencil) - wined3d_resource_acquire(state->fb.depth_stencil->resource); - acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], + wined3d_device_context_acquire_resource(context, state->fb.depth_stencil->resource); + acquire_shader_resources(context, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + acquire_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } @@ -1064,7 +1074,6 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, bool indexed) { const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; - const struct wined3d_state *state = context->state; struct wined3d_cs_draw *op; op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); @@ -1079,7 +1088,7 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, d3d_info); + acquire_graphics_pipeline_resources(context, indexed, d3d_info); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -1100,8 +1109,8 @@ void CDECL wined3d_device_context_draw_indirect(struct wined3d_device_context *c op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, d3d_info); - wined3d_resource_acquire(&buffer->resource); + acquire_graphics_pipeline_resources(context, indexed, d3d_info); + wined3d_device_context_acquire_resource(context, &buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2461,9 +2470,9 @@ void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context memset(&op->fx, 0, sizeof(op->fx)); op->filter = filter; - wined3d_resource_acquire(dst_resource); + wined3d_device_context_acquire_resource(context, dst_resource); if (src_resource) - wined3d_resource_acquire(src_resource); + wined3d_device_context_acquire_resource(context, src_resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) @@ -2544,7 +2553,7 @@ void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_conte op->data.slice_pitch = slice_pitch; op->data.data = data; - wined3d_resource_acquire(resource); + wined3d_device_context_acquire_resource(context, resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. @@ -2611,7 +2620,7 @@ void wined3d_device_context_emit_clear_uav_uint(struct wined3d_device_context *c op->view = view; op->clear_value = *clear_value; - wined3d_resource_acquire(view->resource); + wined3d_device_context_acquire_resource(context, view->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2640,7 +2649,7 @@ void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context op->offset = offset; op->view = uav; - wined3d_resource_acquire(&dst_buffer->resource); + wined3d_device_context_acquire_resource(context, &dst_buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2667,7 +2676,7 @@ void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context op->opcode = WINED3D_CS_OP_GENERATE_MIPMAPS; op->view = view; - wined3d_resource_acquire(view->resource); + wined3d_device_context_acquire_resource(context, view->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2683,6 +2692,11 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } +static void wined3d_cs_acquire_resource(struct wined3d_device_context *context, struct wined3d_resource *resource) +{ + wined3d_resource_acquire(resource); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_NOP */ wined3d_cs_exec_nop, @@ -2801,6 +2815,7 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_unmap, wined3d_cs_issue_query, wined3d_cs_flush, + wined3d_cs_acquire_resource, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2926,6 +2941,7 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_unmap, wined3d_cs_issue_query, wined3d_cs_flush, + wined3d_cs_acquire_resource, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ef6e89f1f1..f4060224de9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4696,6 +4696,7 @@ struct wined3d_device_context_ops unsigned int sub_resource_idx); void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); void (*flush)(struct wined3d_device_context *context); + void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); }; struct wined3d_device_context -- 2.30.2

3 10

[PATCH] dxgi: Introduce a helper to convert between dxgi and wined3d display rotation types.
by Zhiyi Zhang 06 May '21

06 May '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/output.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 632b44526c1..f341388766c 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -28,6 +28,11 @@ static inline DXGI_MODE_SCANLINE_ORDER dxgi_mode_scanline_order_from_wined3d(enu return (DXGI_MODE_SCANLINE_ORDER)ordering; } +static inline DXGI_MODE_ROTATION dxgi_mode_rotation_from_wined3d(enum wined3d_display_rotation rotation) +{ + return (DXGI_MODE_ROTATION)rotation; +} + static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_display_mode *wined3d_mode) { mode->Width = wined3d_mode->width; @@ -318,7 +323,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = rotation; + desc->Rotation = dxgi_mode_rotation_from_wined3d(rotation); desc->Monitor = wined3d_desc.monitor; return S_OK; @@ -631,7 +636,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = rotation; + desc->Rotation = dxgi_mode_rotation_from_wined3d(rotation); desc->Monitor = wined3d_desc.monitor; /* FIXME: fill this from monitor EDID */ -- 2.30.2

2 1

[PATCH 5/5] wined3d: Reject raw blits between depth/stencil and colour resources in the GLSL blitter.
by Henri Verbeet 06 May '21

06 May '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/tests/d3d11.c | 5 ++--- dlls/wined3d/glsl_shader.c | 11 +++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6c381f62840..cc30b439d2b 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16232,7 +16232,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].dst_ds || test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) + todo_wine_if(test_data[i].dst_ds) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 36c3995e7ad..7f8799637d7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28306,9 +28306,8 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(!test_data[i].dst_ds && test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45e7ecd4850..3876e71af58 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13000,13 +13000,20 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi const struct wined3d_resource *dst_resource = &dst_texture->t.resource; const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; + bool src_ds, dst_ds; BOOL decompress; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->depth_size || dst_format->stencil_size) + src_ds = src_format->depth_size || src_format->stencil_size; + dst_ds = dst_format->depth_size || dst_format->stencil_size; + /* We could in principle support raw depth/stencil <-> colour blits as + * well in some cases, but note that typeless formats like e.g. + * R16_TYPELESS may use a normalised GL format for depth/stencil + * resources, and a floating-point format for colour resources, */ + if (src_ds && dst_ds) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; - else + else if (!src_ds && !dst_ds) blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } -- 2.20.1

1 0

[PATCH 4/5] wined3d: Reject blits between depth/stencil and colour attachments in the FBO blitter.
by Henri Verbeet 06 May '21

06 May '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f3a48faf5ca..c5df4e55a70 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -269,6 +269,7 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win { const struct wined3d_format *src_format = src_resource->format; const struct wined3d_format *dst_format = dst_resource->format; + bool src_ds, dst_ds; if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return false; @@ -280,6 +281,16 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return false; + /* We can't copy between depth/stencil and colour attachments. One notable + * way we can end up here is when copying between typeless resources with + * formats like R16_TYPELESS, which can end up using either a + * depth/stencil or a colour format on the OpenGL side, depending on the + * resource's bind flags. */ + src_ds = src_format->depth_size || src_format->stencil_size; + dst_ds = dst_format->depth_size || dst_format->stencil_size; + if (src_ds != dst_ds) + return false; + switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: -- 2.20.1

1 0

[PATCH 1/4] quartz/tests: Test the close button of the video window.
by Akihiro Sagawa 06 May '21

06 May '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 35 +++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 35 +++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 35 +++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+)

2 1

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 06 May '21

06 May '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 268 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 174 insertions(+), 94 deletions(-)

1 0

[PATCH] urlmon/tests: Allow x64 to be last in the user agent.
by Francois Gouget 06 May '21

06 May '21

Windows would normally have .Net strings that follow but Wine does not in 64-bit mode. Still the formatting makes sense so allow it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes a test failure in Wine in wow64 mode. https://test.winehq.org/data/patterns.html#urlmon:misc https://testbot.winehq.org/JobDetails.pl?Key=89589 An alternative would be to turn it into a todo if i == 1. --- dlls/urlmon/tests/misc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2b3df65d5fc..5b179b55770 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1544,7 +1544,9 @@ static void test_user_agent(void) }else if(sizeof(void*) == 8) { p += check_prefix(p, "Win64; "); #ifdef __x86_64__ - p += check_prefix(p, "x64; "); + p += check_prefix(p, "x64"); + if (*p == ';') + p += check_prefix(p, "; "); #endif } if(i != 1) { -- 2.20.1

2 2