- Wine-Devel - list.winehq.org

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Parse texture types.
by Zebediah Figura Oct. 6, 2021

Oct. 6, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 22 +++++++++++++++++++--- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f03777a65..2dba001ee 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,6 +261,21 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_OBJECT; + type->base_type = HLSL_TYPE_TEXTURE; + type->dimx = 4; + type->dimy = 1; + type->sampler_dim = dim; + list_add_tail(&ctx->types, &type->entry); + return type; +} + struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -329,7 +344,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return false; if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -734,8 +750,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) - return t1->sampler_dim - t2->sampler_dim; + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) if (t1->dimx != t2->dimx) return t1->dimx - t2->dimx; if (t1->dimy != t2->dimy) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 77b4ce928..65c6f34e0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -655,6 +655,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6f1794e79..b8149950d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2451,6 +2451,26 @@ type: { $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; } + | KW_TEXTURE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC); + } + | KW_TEXTURE1D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_1D); + } + | KW_TEXTURE2D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_2D); + } + | KW_TEXTURE3D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_3D); + } + | KW_TEXTURECUBE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_CUBE); + } | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); -- 2.33.0

3 6

[PATCH v2] wininet: Clear cached credentials after the first failed attempt.
by Alistair Leslie-Hughes Oct. 5, 2021

Oct. 5, 2021

Windows when using cached credentials will use them on the first challenge, if then a second 403 (ACCESS_DENIED) is received, the user is prompted again but this time with the password and save checkbox cleared. v2: Use a BOOL flag variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 21 ++++++++++++++++++++- dlls/wininet/internet.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a48c75865ac..969e2ee490f 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -152,9 +152,25 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, p = wcschr( szUserPass, ':' ); if( p ) { + struct WININET_ErrorDlgParams *params; + HWND hwnd; + + params = (struct WININET_ErrorDlgParams*) + GetWindowLongPtrW( hdlg, GWLP_USERDATA ); + *p = 0; SetWindowTextW( hUserItem, szUserPass ); - SetWindowTextW( hPassItem, p+1 ); + + if (!params->req->clear_auth) + { + SetWindowTextW( hPassItem, p+1 ); + + hwnd = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); + if (hwnd) + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + } + else + WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } return TRUE; @@ -264,6 +280,8 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); WININET_SetAuthorization( params->req, username, password, TRUE ); + params->req->clear_auth = TRUE; + EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; } @@ -340,6 +358,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } WININET_SetAuthorization( params->req, username, password, FALSE ); + params->req->clear_auth = TRUE; EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..9ece506ceac 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -361,6 +361,7 @@ typedef struct LPWSTR statusText; DWORD bytesToWrite; DWORD bytesWritten; + BOOL clear_auth; /* Flag to clear the password field on the authorization dialog */ CRITICAL_SECTION headers_section; /* section to protect the headers array */ HTTPHEADERW *custHeaders; -- 2.33.0

1 0

[PATCH] ntdll: Double dll name buffer size for relay traces.
by Nikolay Sivov Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Otherwise some of api-ms-* names are getting truncated. dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e00c1e0c31d..797d72aedb6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1343,7 +1343,7 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) */ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) { - WCHAR mod_name[32]; + WCHAR mod_name[64]; NTSTATUS status = STATUS_SUCCESS; DLLENTRYPROC entry = wm->ldr.EntryPoint; void *module = wm->ldr.DllBase; -- 2.33.0

1 0

[PATCH v2 4/6] ntdll: Expose ntdll_check_buffer_for_read and ntdll_check_buffer_for_write to Unix libs.
by Jacek Caban Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 -- dlls/ntdll/unix/virtual.c | 16 ++++++++-------- include/wine/unixlib.h | 2 ++ 5 files changed, 14 insertions(+), 14 deletions(-)

2 4

[PATCH vkd3d] vkd3d-shader/hlsl: Mark WriteToSubresource test as todo on NVIDIA.
by Giovanni Mascellani Oct. 5, 2021

Oct. 5, 2021

Similarly to ReadFromSubresource, WriteToSubresource is currently implemented only for images with linear tiling, which NVIDIA drivers currently do not support. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..1fa017ab 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32060,6 +32060,7 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); @@ -32102,17 +32103,20 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else @@ -32217,6 +32221,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } + todo_if(is_nvidia_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); release_resource_readback(&rb); -- 2.33.0

2 1

[PATCH 1/9] dbghelp/dwarf: better handling of SymTagExe and SymTagCompiland
by Eric Pouech Oct. 5, 2021

Oct. 5, 2021

- children of SymTagExe and SymTagCompiland can now be enumerated - SymTagCompiland's lexical parent is now reported to SymTagExe - native doesn't expose compiland's address, so don't expose it Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 4 ++++ dlls/dbghelp/type.c | 16 +++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0587ce13914..2fc5a7e5eca 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -169,6 +169,7 @@ struct symt_block struct symt_module /* in fact any of .exe, .dll... */ { struct symt symt; /* module */ + struct vector vchildren; /* compilation units */ struct module* module; }; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e2fde00456a..091ea173305 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -191,6 +191,7 @@ struct symt_module* symt_new_module(struct module* module) { sym->symt.tag = SymTagExe; sym->module = module; + vector_init(&sym->vchildren, sizeof(struct symt*), 8); } return sym; } @@ -199,6 +200,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) { struct symt_compiland* sym; + struct symt_compiland** p; TRACE_(dbghelp_symt)("Adding compiland symbol %s:%s\n", debugstr_w(module->modulename), source_get(module, src_idx)); @@ -210,6 +212,8 @@ struct symt_compiland* symt_new_compiland(struct module* module, sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL; + p = vector_add(&module->top->vchildren, &module->pool); + *p = sym; } return sym; } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 70719cf6b7c..4eb230e2755 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -158,11 +158,10 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) case SymTagThunk: *addr = ((const struct symt_thunk*)type)->address; break; - case SymTagCompiland: - *addr = ((const struct symt_compiland*)type)->address; - break; default: FIXME("Unsupported sym-tag %s for get-address\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagCompiland: return FALSE; } return TRUE; @@ -549,6 +548,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, switch (type->tag) { + case SymTagExe: v = &((const struct symt_module*)type)->vchildren; break; + case SymTagCompiland: v = &((const struct symt_compiland*)type)->vchildren; break; case SymTagUDT: v = &((const struct symt_udt*)type)->vchildren; break; case SymTagEnum: v = &((const struct symt_enum*)type)->vchildren; break; case SymTagFunctionType: v = &((const struct symt_function_signature*)type)->vchildren; break; @@ -594,6 +595,12 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_CHILDRENCOUNT: switch (type->tag) { + case SymTagExe: + X(DWORD) = vector_length(&((const struct symt_module*)type)->vchildren); + break; + case SymTagCompiland: + X(DWORD) = vector_length(&((const struct symt_compiland*)type)->vchildren); + break; case SymTagUDT: X(DWORD) = vector_length(&((const struct symt_udt*)type)->vchildren); break; @@ -697,6 +704,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_LEXICALPARENT: switch (type->tag) { + case SymTagCompiland: + X(DWORD) = symt_ptr2index(module, &((const struct symt_compiland*)type)->container->symt); + break; case SymTagBlock: X(DWORD) = symt_ptr2index(module, ((const struct symt_block*)type)->container); break;

2 9

[PATCH v2 1/5] wined3d: Do not emit an upload for NOOVERWRITE maps on deferred contexts.
by Zebediah Figura Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++------ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index dd8cae825fa..626dd0ac132 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -34,6 +34,7 @@ struct wined3d_deferred_upload unsigned int sub_resource_idx; uint8_t *sysmem; struct wined3d_box box; + uint32_t upload_flags; }; struct wined3d_command_list @@ -2429,9 +2430,9 @@ static void wined3d_device_context_upload_bo(struct wined3d_device_context *cont { struct wined3d_cs_update_sub_resource *op; - TRACE("context %p, resource %p, sub_resource_idx %u, box %s, bo %s, row_pitch %u, slice_pitch %u.\n", + TRACE("context %p, resource %p, sub_resource_idx %u, box %s, bo %s, flags %#x, row_pitch %u, slice_pitch %u.\n", context, resource, sub_resource_idx, debug_box(box), - debug_const_bo_address(&bo->addr), row_pitch, slice_pitch); + debug_const_bo_address(&bo->addr), bo->flags, row_pitch, slice_pitch); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; @@ -2518,7 +2519,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context unsigned int row_pitch, slice_pitch; wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_device_context_upload_bo(context, resource, sub_resource_idx, &box, &bo, row_pitch, slice_pitch); + if (bo.flags & UPLOAD_BO_UPLOAD_ON_UNMAP) + wined3d_device_context_upload_bo(context, resource, sub_resource_idx, &box, &bo, row_pitch, slice_pitch); return WINED3D_OK; } @@ -2749,6 +2751,7 @@ void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_conte op->box = *box; op->bo.addr.buffer_object = 0; op->bo.addr.addr = data; + op->bo.flags = 0; op->row_pitch = row_pitch; op->slice_pitch = slice_pitch; @@ -3475,7 +3478,7 @@ static void wined3d_deferred_context_push_constants(struct wined3d_device_contex FIXME("context %p, p %#x, start_idx %u, count %u, constants %p, stub!\n", context, p, start_idx, count, constants); } -static const struct wined3d_deferred_upload *deferred_context_get_upload(struct wined3d_deferred_context *deferred, +static struct wined3d_deferred_upload *deferred_context_get_upload(struct wined3d_deferred_context *deferred, struct wined3d_resource *resource, unsigned int sub_resource_idx) { SIZE_T i = deferred->upload_count; @@ -3519,13 +3522,13 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co if (flags & WINED3D_MAP_NOOVERWRITE) { - const struct wined3d_deferred_upload *upload; - if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) { + upload->upload_flags = 0; map_ptr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); bo->addr.buffer_object = 0; bo->addr.addr = map_ptr; + bo->flags = 0; return map_ptr; } @@ -3540,6 +3543,7 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co return NULL; upload = &deferred->uploads[deferred->upload_count++]; + upload->upload_flags = UPLOAD_BO_UPLOAD_ON_UNMAP; upload->resource = resource; wined3d_resource_incref(resource); upload->sub_resource_idx = sub_resource_idx; @@ -3549,6 +3553,7 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co bo->addr.buffer_object = 0; map_ptr = (uint8_t *)align((size_t)sysmem, RESOURCE_ALIGNMENT); bo->addr.addr = map_ptr; + bo->flags = UPLOAD_BO_UPLOAD_ON_UNMAP; return map_ptr; } @@ -3563,6 +3568,7 @@ static bool wined3d_deferred_context_get_upload_bo(struct wined3d_device_context *box = upload->box; bo->addr.buffer_object = 0; bo->addr.addr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + bo->flags = upload->upload_flags; return true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c801e5b3ce8..520eb968eb6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3324,9 +3324,12 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_description, enum wined3d_feature_level feature_level, UINT64 vram_bytes, UINT64 sysmem_bytes) DECLSPEC_HIDDEN; +#define UPLOAD_BO_UPLOAD_ON_UNMAP 0x1 + struct upload_bo { struct wined3d_const_bo_address addr; + uint32_t flags; }; struct wined3d_adapter_ops -- 2.33.0

3 10

[PATCH v4 1/4] wined3d: Introduce wined3d_view_load_location() helper.
by Jan Sikorski Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/view.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0adb0a115dc..dfca8fc53f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -332,6 +332,25 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_view_load_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -461,21 +480,7 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) { - struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx, layer_count; - struct wined3d_texture *texture; - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - wined3d_buffer_load_location(buffer_from_resource(resource), context, location); - return; - } - - texture = texture_from_resource(resource); - sub_resource_idx = view->sub_resource_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) - wined3d_texture_load_location(texture, sub_resource_idx, context, location); + wined3d_view_load_location(view->resource, &view->desc, context, location); } void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) -- 2.30.2

3 6

[PATCH] d2d1/tests: Add tests for crop effect.
by Ziqing Hui Oct. 5, 2021

Oct. 5, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4beba7c963a..cf37efdc7e8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10045,6 +10045,95 @@ static void test_effect_2d_affine(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_crop(BOOL d3d11) +{ + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D_RECT_F output_bounds; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + ID2D1Bitmap1 *bitmap; + DWORD image[16 * 16]; + ID2D1Effect *effect; + ID2D1Image *output; + unsigned int i; + HRESULT hr; + + const struct crop_effect_test + { + D2D_VECTOR_4F crop_rect; /* {x: left, y: top, z: right, w: bottom} */ + D2D_RECT_F bounds; + } + crop_effect_tests[] = + { + {{0.0f, 0.0f, 8.0f, 8.0f}, {0.0f, 0.0f, 8.0f, 8.0f}}, + {{4.0f, 4.0f, 8.0f, 8.0f}, {4.0f, 4.0f, 8.0f, 8.0f}}, + {{10.0f, 10.0f, 20.0f, 20.0f}, {10.0f, 10.0f, 16.0f, 16.0f}}, + {{-10.0f, 10.0f, 20.0f, 12.0f}, {0.0f, 10.0f, 16.0f, 12.0f}}, + {{3.0f, -2.0f, 5.0f, 1.0f}, {3.0f, 0.0f, 5.0f, 1.0f}}, + {{-1.0f, -1.0f, 20.0f, 20.0f}, {0.0f, 0.0f, 16.0f, 16.0f}}, + {{-5.0f, -5.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, + }; + memset(image, 0xff, sizeof(image)); + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Crop, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(crop_effect_tests); ++i) + { + const struct crop_effect_test *test = &crop_effect_tests[i]; + winetest_push_context("Test %u", i); + + set_size_u(&input_size, 16, 16); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, image, + sizeof(*image) * 16, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + hr = ID2D1Effect_SetValue(effect, D2D1_CROP_PROP_RECT, D2D1_PROPERTY_TYPE_VECTOR4, + (const BYTE *)&test->crop_rect, sizeof(test->crop_rect)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Effect_GetOutput(effect, &output); + + set_rect(&output_bounds, -1.0f, -1.0f, -1.0f, -1.0f); + ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + todo_wine + ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 0), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + output_bounds.left, output_bounds.top, output_bounds.right, output_bounds.bottom, + test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -10108,6 +10197,7 @@ START_TEST(d2d1) queue_test(test_mt_factory); queue_test(test_effect); queue_test(test_effect_2d_affine); + queue_test(test_effect_crop); run_queued_tests(); } -- 2.25.1

2 1

[PATCH 1/4] wined3d: Fix the center offset in get_projection_matrix.
by Stefan Dösinger Oct. 5, 2021

Oct. 5, 2021

If we have clip control, viewport_miscpart_cc applies both the half pixel offset and the filling convention nudge. We always have integer pixel centers in this <= d3d9-only codepath. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Taking d3d10+ pixel centers out of consideration here keeps the next patch simpler because we don't have to account for the situation where we have to apply the nudge only because we don't have clip control but also somehow have GL-style pixel centers. It seems like a non-obvious set of conditions for catching a case we know won't is dead code. Do add an ERR though because it actually hardwires client lib knowledge into wined3d. --- dlls/wined3d/utils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4019dd4d812..0a1e0707359 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5550,12 +5550,16 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ + /* Projection matrices are <= d3d9, which all have integer pixel centers. */ + if (!(d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER)) + ERR("Did not expect to enter this codepath without WINED3D_PIXEL_CENTER_INTEGER.\n"); + clip_control = d3d_info->clip_control; flip = !clip_control && context->render_offscreen; - if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + if (!clip_control) center_offset = 63.0f / 64.0f; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; if (context->last_was_rhw) { -- 2.32.0

3 6