wine-devel June 2022

wine-devel@winehq.org

68 participants
754 discussions

[PATCH vkd3d] vkd3d-shader/spirv: Do not print a warning for VKD3D_SHADER_COMPILE_OPTION_API_VERSION.
by Zebediah Figura 07 Jun '22

07 Jun '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7190a9dcb..bce3521ba 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2397,6 +2397,8 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve default: WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); + + case VKD3D_SHADER_COMPILE_OPTION_API_VERSION: break; } } -- 2.36.1

2 1

[PATCH vkd3d 1/3] vkd3d-shader: Allow writing log output via a custom callback.
by Zebediah Figura 07 Jun '22

07 Jun '22

When using PE vkd3d through Wine, debug output may be swallowed by writing to Win32 stderr. Avoid this by providing a way to hook up vkd3d log output to Wine output. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/private/vkd3d_debug.h | 1 + include/vkd3d_shader.h | 15 ++++++++++++++ include/vkd3d_types.h | 4 ++++ libs/vkd3d-common/debug.c | 28 +++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 5 +++++ 6 files changed, 52 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 8ab653aef..579c33d36 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -47,6 +47,7 @@ enum vkd3d_dbg_level enum vkd3d_dbg_level vkd3d_dbg_get_level(void); void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback); const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 05d235f9d..1e5a332ef 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1806,6 +1806,18 @@ VKD3D_SHADER_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_sig VKD3D_SHADER_API int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** + * Set a callback to be called when vkd3d-shader outputs debug logging. + * + * If NULL, or if this function has not been called, libvkd3d-shader will print + * all enabled log output to stderr. + * + * \param callback Callback function to set. + * + * \since 1.4 + */ +VKD3D_SHADER_API void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback); + #endif /* VKD3D_SHADER_NO_PROTOTYPES */ /** Type of vkd3d_shader_get_version(). */ @@ -1859,6 +1871,9 @@ typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signa typedef void (*PFN_vkd3d_shader_preprocess)(struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); +/** Type of vkd3d_shader_set_log_callback(). \since 1.4 */ +typedef void (*PFN_vkd3d_shader_set_log_callback)(PFN_vkd3d_log callback); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 7014f4c25..4a7aca236 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_TYPES_H #define __VKD3D_TYPES_H +#include <stdarg.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -53,6 +55,8 @@ enum vkd3d_result VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; +typedef void (*PFN_vkd3d_log)(const char *format, va_list args); + #ifdef _WIN32 # define VKD3D_IMPORT __declspec(dllimport) # define VKD3D_EXPORT __declspec(dllexport) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 4868f3fba..0b9e765ac 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -68,6 +68,25 @@ enum vkd3d_dbg_level vkd3d_dbg_get_level(void) return level; } +static PFN_vkd3d_log log_callback; + +static void vkd3d_dbg_voutput(const char *fmt, va_list args) +{ + if (log_callback) + log_callback(fmt, args); + else + vfprintf(stderr, fmt, args); +} + +static void vkd3d_dbg_output(const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_dbg_voutput(fmt, args); + va_end(args); +} + void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) { va_list args; @@ -77,12 +96,17 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch assert(level < ARRAY_SIZE(debug_level_names)); - fprintf(stderr, "%s:%s: ", debug_level_names[level], function); + vkd3d_dbg_output("%s:%s ", debug_level_names[level], function); va_start(args, fmt); - vfprintf(stderr, fmt, args); + vkd3d_dbg_voutput(fmt, args); va_end(args); } +void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback) +{ + log_callback = callback; +} + static char *get_buffer(void) { static char buffers[VKD3D_DEBUG_BUFFER_COUNT][VKD3D_DEBUG_BUFFER_SIZE]; diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 2e49fe248..cac96972a 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -17,6 +17,7 @@ global: vkd3d_shader_preprocess; vkd3d_shader_scan; vkd3d_shader_serialize_root_signature; + vkd3d_shader_set_log_callback; local: *; }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6fd32435a..7d0157fca 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1550,3 +1550,8 @@ int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info vkd3d_shader_message_context_cleanup(&message_context); return ret; } + +void vkd3d_shader_set_log_callback(PFN_vkd3d_log callback) +{ + vkd3d_dbg_set_log_callback(callback); +} -- 2.36.1

3 10

[PATCH vkd3d] include: Add ID3D12Debug interface declarations in vkd3d_d3d12sdklayers.idl.
by Biswapriyo Nath 07 Jun '22

07 Jun '22

2 1

[PATCH 0/7] MR195: winhttp: Abort web socket receive operations when the socket handle is closed
by Paul Gofman (＠gofman) 07 Jun '22

07 Jun '22

I think somewhat similar should happen with normal winhttp requests (I was doing some brief tests around that back then) and that should hopefully be easy to add incrementally after this patchset. Then, sends for websockets should most likely also be cancelled the same way although that is a bit harder to test as most of the time sends are processed right away before returing from WinHttpWebSocketSend (although should be possible as out of tree test which might be flaky). The patches here address cancelling web socket receive operation (including receiving web socket close status). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/195

6 12

[PATCH 0/6] MR178: ntdll: Preparation for RtlSetUserValueHeap use in kernelbase.
by Rémi Bernon (＠rbernon) 07 Jun '22

07 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/178

3 9

[v3 PATCH] d2d1: Add partial support for image brushes.
by Nikolay Sivov 07 Jun '22

07 Jun '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: simplified helpers a bit. dlls/d2d1/brush.c | 68 +++++++++++++++++++++++++++++++++++------- dlls/d2d1/tests/d2d1.c | 46 ++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..22116759b10 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1450,7 +1450,23 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) return TRUE; case D2D_BRUSH_TYPE_BITMAP: - bitmap = brush->u.bitmap.bitmap; + case D2D_BRUSH_TYPE_IMAGE: + { + ID2D1Bitmap *image_bitmap = NULL; + + if (brush->type == D2D_BRUSH_TYPE_BITMAP) + bitmap = brush->u.bitmap.bitmap; + else + { + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&image_bitmap))) + { + FIXME("Only image brushes with bitmaps are supported.\n"); + return FALSE; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(image_bitmap); + cb->type = D2D_BRUSH_TYPE_BITMAP; + } /* Scale for bitmap size and dpi. */ b = brush->transform; @@ -1477,7 +1493,11 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) cb->u.bitmap.ignore_alpha = bitmap->format.alphaMode == D2D1_ALPHA_MODE_IGNORE; + if (image_bitmap) + ID2D1Bitmap_Release(image_bitmap); + return TRUE; + } default: FIXME("Unhandled brush type %#x.\n", brush->type); @@ -1485,31 +1505,32 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) } } -static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, - unsigned int brush_idx) +static void d2d_brush_bind_bitmap(struct d2d_bitmap *bitmap, struct d2d_device_context *context, + D2D1_EXTEND_MODE extend_mode_x, D2D1_EXTEND_MODE extend_mode_y, + D2D1_INTERPOLATION_MODE interpolation_mode, unsigned int brush_idx) { ID3D11SamplerState **sampler_state; ID3D11DeviceContext *d3d_context; HRESULT hr; ID3D11Device1_GetImmediateContext(context->d3d_device, &d3d_context); - ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &brush->u.bitmap.bitmap->srv); + ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &bitmap->srv); sampler_state = &context->sampler_states - [brush->u.bitmap.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] - [brush->u.bitmap.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] - [brush->u.bitmap.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; + [interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] + [extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; if (!*sampler_state) { D3D11_SAMPLER_DESC sampler_desc; - if (brush->u.bitmap.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + if (interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; else sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; - sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); - sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); + sampler_desc.AddressU = texture_address_mode_from_extend_mode(extend_mode_x); + sampler_desc.AddressV = texture_address_mode_from_extend_mode(extend_mode_y); sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; @@ -1529,6 +1550,26 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con ID3D11DeviceContext_Release(d3d_context); } +static void d2d_brush_bind_image(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) +{ + ID2D1Bitmap *image_bitmap; + struct d2d_bitmap *bitmap; + + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&image_bitmap))) + { + FIXME("Only image brushes with bitmaps are supported.\n"); + return; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(image_bitmap); + + d2d_brush_bind_bitmap(bitmap, context, brush->u.image.extend_mode_x, brush->u.image.extend_mode_y, + brush->u.image.interpolation_mode, brush_idx); + + ID2D1Bitmap_Release(image_bitmap); +} + void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) { switch (brush->type) @@ -1545,7 +1586,12 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context break; case D2D_BRUSH_TYPE_BITMAP: - d2d_brush_bind_bitmap(brush, context, brush_idx); + d2d_brush_bind_bitmap(brush->u.bitmap.bitmap, context, brush->u.bitmap.extend_mode_x, + brush->u.bitmap.extend_mode_y, brush->u.bitmap.interpolation_mode, brush_idx); + break; + + case D2D_BRUSH_TYPE_IMAGE: + d2d_brush_bind_image(brush, context, brush_idx); break; default: diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..752e34bf4da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2509,11 +2509,13 @@ static void test_image_brush(BOOL d3d11) D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BRUSH_PROPERTIES brush_desc; ID2D1Image *image, *tmp_image; + D2D1_RECT_F dst_rect; struct d2d1_test_context ctx; D2D1_EXTEND_MODE extend_mode; D2D1_MATRIX_3X2_F matrix; ID2D1ImageBrush *brush; ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; D2D1_SIZE_U size; D2D1_RECT_F rect; ULONG refcount; @@ -2585,6 +2587,50 @@ static void test_image_brush(BOOL d3d11) ID2D1ImageBrush_Release(brush); + /* FillRectangle */ + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 4.0f, 4.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "89917481db82e6d683a75f068d3984fe2703cce5"); + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 1.0f, 1.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "23544adf9695a51428c194a1cffd531be3416e65"); + todo_wine + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + /* Custom brush description and image pointer. */ brush_desc.opacity = 2.0f; set_matrix_identity(&brush_desc.transform); -- 2.35.1

1 0

[PATCH] msvcp90: Fix segfault in bad_alloc exception default constructor.
by Torge Matthies 07 Jun '22

07 Jun '22

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- EXCEPTION_NAME needs a pointer variable passed in, not an array. I removed the cast from the macro so that in the future a warning is displayed if this happens again. dlls/msvcp90/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7f1dfd2188a1..effe57063a14 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -36,7 +36,7 @@ int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; #define EXCEPTION_STR(name) (*name) -#define EXCEPTION_NAME(str) ((exception_name)&str) +#define EXCEPTION_NAME(str) (&str) #else typedef const char *exception_name; #define EXCEPTION_STR(name) (name) @@ -96,7 +96,7 @@ exception* __thiscall exception_copy_ctor(exception *this, const exception *rhs) this->name = rhs->name; this->do_free = FALSE; } else - MSVCP_exception_ctor(this, EXCEPTION_NAME(rhs->name)); + MSVCP_exception_ctor(this, (exception_name)EXCEPTION_NAME(rhs->name)); TRACE("name = %s\n", this->name); return this; } @@ -214,7 +214,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, exception_name name) DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_default_ctor, 4) bad_alloc* __thiscall MSVCP_bad_alloc_default_ctor(bad_alloc *this) { - static const char name[] = "bad allocation"; + static const char *name = "bad allocation"; return MSVCP_bad_alloc_ctor(this, EXCEPTION_NAME(name)); } -- 2.36.1

2 1

[PATCH 0/1] MR194: mmdevapi: Remove android from default driver list.
by Jacek Caban (＠jacek) 07 Jun '22

07 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/194

3 2

[PATCH 0/3] MR198: ntdll: Fix unwinding on ARM in PE mode
by Martin Storsjö (＠mstorsjo) 07 Jun '22

07 Jun '22

Clang can generate SEH unwind info in PE mode on ARM now (since the very latest git versions of Clang 15). Add SEH assembly directives to let the unwinder step past handwritten assembly functions/trampolines. Also fix a minor bug exposed by a testcase that I had missed to run before, and apply the same fix consistently to arm64 (where the same issue hadn't been exposed before). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/198

2 3

[PATCH v2] d2d1: Add support for painting image brush as a bitmap.
by Dmitry Timoshkov 07 Jun '22

07 Jun '22

v2: Add a test for sourceRectangle, drop ::FillGeometry() change. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/brush.c | 85 +++++++++++++++++++++++++++++++++++++----- dlls/d2d1/tests/d2d1.c | 46 +++++++++++++++++++++++ 2 files changed, 121 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..7febafc375c 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1450,7 +1450,23 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) return TRUE; case D2D_BRUSH_TYPE_BITMAP: - bitmap = brush->u.bitmap.bitmap; + case D2D_BRUSH_TYPE_IMAGE: + { + ID2D1Bitmap *src_bitmap; + + if (brush->type == D2D_BRUSH_TYPE_BITMAP) + bitmap = brush->u.bitmap.bitmap; + else + { + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&src_bitmap))) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return FALSE; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(src_bitmap); + cb->type = D2D_BRUSH_TYPE_BITMAP; + } /* Scale for bitmap size and dpi. */ b = brush->transform; @@ -1477,7 +1493,11 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) cb->u.bitmap.ignore_alpha = bitmap->format.alphaMode == D2D1_ALPHA_MODE_IGNORE; + if (brush->type == D2D_BRUSH_TYPE_IMAGE) + ID2D1Bitmap_Release(src_bitmap); + return TRUE; + } default: FIXME("Unhandled brush type %#x.\n", brush->type); @@ -1485,31 +1505,31 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) } } -static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, - unsigned int brush_idx) +static void d2d_brush_bind(struct d2d_bitmap *bitmap, struct d2d_device_context *context, + const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, unsigned int brush_idx) { ID3D11SamplerState **sampler_state; ID3D11DeviceContext *d3d_context; HRESULT hr; ID3D11Device1_GetImmediateContext(context->d3d_device, &d3d_context); - ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &brush->u.bitmap.bitmap->srv); + ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &bitmap->srv); sampler_state = &context->sampler_states - [brush->u.bitmap.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] - [brush->u.bitmap.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] - [brush->u.bitmap.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; + [image_brush_desc->interpolationMode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [image_brush_desc->extendModeX % D2D_SAMPLER_EXTEND_MODE_COUNT] + [image_brush_desc->extendModeY % D2D_SAMPLER_EXTEND_MODE_COUNT]; if (!*sampler_state) { D3D11_SAMPLER_DESC sampler_desc; - if (brush->u.bitmap.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + if (image_brush_desc->interpolationMode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; else sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; - sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); - sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); + sampler_desc.AddressU = texture_address_mode_from_extend_mode(image_brush_desc->extendModeX); + sampler_desc.AddressV = texture_address_mode_from_extend_mode(image_brush_desc->extendModeY); sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; @@ -1529,6 +1549,47 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con ID3D11DeviceContext_Release(d3d_context); } +static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) +{ + D2D1_IMAGE_BRUSH_PROPERTIES image_brush_desc; + + image_brush_desc.sourceRectangle.left = 0.0f; + image_brush_desc.sourceRectangle.top = 0.0f; + image_brush_desc.sourceRectangle.right = brush->u.bitmap.bitmap->pixel_size.width; + image_brush_desc.sourceRectangle.bottom = brush->u.bitmap.bitmap->pixel_size.height; + image_brush_desc.extendModeX = brush->u.bitmap.extend_mode_x; + image_brush_desc.extendModeY = brush->u.bitmap.extend_mode_y; + image_brush_desc.interpolationMode = brush->u.bitmap.interpolation_mode; + + d2d_brush_bind(brush->u.bitmap.bitmap, context, &image_brush_desc, brush_idx); +} + +static void d2d_brush_bind_image(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) +{ + ID2D1Bitmap *src_bitmap; + struct d2d_bitmap *bitmap; + D2D1_IMAGE_BRUSH_PROPERTIES image_brush_desc; + + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&src_bitmap))) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(src_bitmap); + + image_brush_desc.sourceRectangle = brush->u.image.source_rect; + image_brush_desc.extendModeX = brush->u.bitmap.extend_mode_x; + image_brush_desc.extendModeY = brush->u.bitmap.extend_mode_y; + image_brush_desc.interpolationMode = brush->u.bitmap.interpolation_mode; + + d2d_brush_bind(bitmap, context, &image_brush_desc, brush_idx); + + ID2D1Bitmap_Release(src_bitmap); +} + void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) { switch (brush->type) @@ -1548,6 +1609,10 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context d2d_brush_bind_bitmap(brush, context, brush_idx); break; + case D2D_BRUSH_TYPE_IMAGE: + d2d_brush_bind_image(brush, context, brush_idx); + break; + default: FIXME("Unhandled brush type %#x.\n", brush->type); break; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..752e34bf4da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2509,11 +2509,13 @@ static void test_image_brush(BOOL d3d11) D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BRUSH_PROPERTIES brush_desc; ID2D1Image *image, *tmp_image; + D2D1_RECT_F dst_rect; struct d2d1_test_context ctx; D2D1_EXTEND_MODE extend_mode; D2D1_MATRIX_3X2_F matrix; ID2D1ImageBrush *brush; ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; D2D1_SIZE_U size; D2D1_RECT_F rect; ULONG refcount; @@ -2585,6 +2587,50 @@ static void test_image_brush(BOOL d3d11) ID2D1ImageBrush_Release(brush); + /* FillRectangle */ + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 4.0f, 4.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "89917481db82e6d683a75f068d3984fe2703cce5"); + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 1.0f, 1.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "23544adf9695a51428c194a1cffd531be3416e65"); + todo_wine + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + /* Custom brush description and image pointer. */ brush_desc.opacity = 2.0f; set_matrix_identity(&brush_desc.transform); -- 2.36.1

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2022