March 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Add a helper to trace video format name.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: d0a43d1830bfc7de0256c827593b094fcc05a16f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a43d1830bfc7de0256c827… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:36 2020 +0300 mfplat: Add a helper to trace video format name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 5 ++--- dlls/mfplat/mfplat_private.h | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 64ec436a1e..71bae4c42f 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -642,7 +642,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - TRACE("%u, %u, %#x, %d, %p.\n", width, height, fourcc, bottom_up, buffer); + TRACE("%u, %u, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer); return create_2d_buffer(width, height, fourcc, bottom_up, buffer); } diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a5c954161d..ffe9e36d15 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1510,7 +1510,7 @@ HRESULT WINAPI MFShutdown(void) */ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines) { - TRACE("(%p, %d, %p, %d, %u, %u)\n", dest, deststride, src, srcstride, width, lines); + TRACE("%p, %d, %p, %d, %u, %u.\n", dest, deststride, src, srcstride, width, lines); while (lines--) { diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 8c4716e5e1..77753cc499 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -19,7 +19,6 @@ #define COBJMACROS #include "mfplat_private.h" -#include "d3d9types.h" #include "initguid.h" #include "ks.h" @@ -1837,7 +1836,7 @@ HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *s struct uncompressed_video_format *format; GUID subtype; - TRACE("%#x, %u, %p.\n", fourcc, width, stride); + TRACE("%s, %u, %p.\n", debugstr_fourcc(fourcc), width, stride); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; @@ -1902,7 +1901,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si unsigned int stride; GUID subtype; - TRACE("%#x, %u, %u, %p.\n", fourcc, width, height, size); + TRACE("%s, %u, %u, %p.\n", debugstr_fourcc(fourcc), width, height, size); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 0c374f116b..15d81a65b9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -23,6 +23,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "d3d9types.h" #include "wine/heap.h" #include "wine/debug.h" @@ -145,3 +146,39 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {vt %#x}", v, v->vt); } } + +static inline const char *debugstr_fourcc(DWORD format) +{ + static const struct format_name + { + unsigned int format; + const char *name; + } formats[] = + { + { D3DFMT_R8G8B8, "R8G8B8" }, + { D3DFMT_A8R8G8B8, "A8R8G8B8" }, + { D3DFMT_X8R8G8B8, "X8R8G8B8" }, + { D3DFMT_R5G6B5, "R5G6B5" }, + { D3DFMT_X1R5G5B5, "X1R5G6B5" }, + { D3DFMT_A2B10G10R10, "A2B10G10R10" }, + { D3DFMT_P8, "P8" }, + { D3DFMT_L8, "L8" }, + { D3DFMT_D16, "D16" }, + { D3DFMT_L16, "L16" }, + { D3DFMT_A16B16G16R16F, "A16B16G16R16F" }, + }; + int i; + + if ((format & 0xff) == format) + { + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + if (formats[i].format == format) + return wine_dbg_sprintf("%s", wine_dbgstr_an(formats[i].name, -1)); + } + + return wine_dbg_sprintf("%#x", format); + } + + return wine_dbgstr_an((char *)&format, 4); +}

1 0

Nikolay Sivov : mf: Forward more Audio Session events from the session.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 69885afbed63d1375117732bcdbe658d1dbbc8ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=69885afbed63d1375117732b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:37 2020 +0300 mf: Forward more Audio Session events from the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 69d1fdf569..2204149dca 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2613,6 +2613,14 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_deliver_sample(session, (IMFMediaStream *)event_source, &value); LeaveCriticalSection(&session->cs); + break; + case MEAudioSessionGroupingParamChanged: + case MEAudioSessionIconChanged: + case MEAudioSessionNameChanged: + case MEAudioSessionVolumeChanged: + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + break; case MEAudioSessionDeviceRemoved: case MEAudioSessionDisconnected:

1 0

Nikolay Sivov : mf: Set presentation clock for all node types.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 92d6a8bf8f96d35fc5c94ee26bcf83bfaa406dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=92d6a8bf8f96d35fc5c94ee2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 18 16:57:38 2020 +0300 mf: Set presentation clock for all node types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2204149dca..db1e5e4fe5 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -164,7 +164,7 @@ struct topo_node enum presentation_flags { SESSION_FLAG_SOURCES_SUBSCRIBED = 0x1, - SESSION_FLAG_SINKS_SUBSCRIBED = 0x2, + SESSION_FLAG_PRESENTATION_CLOCK_SET = 0x2, SESSION_FLAG_FINALIZE_SINKS = 0x4, }; @@ -1911,9 +1911,21 @@ static enum object_state session_get_object_state_for_event(MediaEventType event } } +static void session_set_consumed_clock(IUnknown *object, IMFPresentationClock *clock) +{ + IMFClockConsumer *consumer; + + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFClockConsumer, (void **)&consumer))) + { + IMFClockConsumer_SetPresentationClock(consumer, clock); + IMFClockConsumer_Release(consumer); + } +} + static HRESULT session_start_clock(struct media_session *session) { IMFPresentationTimeSource *time_source = NULL; + struct media_source *source; LONGLONG start_offset = 0; struct media_sink *sink; struct topo_node *node; @@ -1925,8 +1937,9 @@ static HRESULT session_start_clock(struct media_session *session) IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_NOTIFY_START_OF_STREAM, 0); } - if (!(session->presentation.flags & SESSION_FLAG_SINKS_SUBSCRIBED)) + if (!(session->presentation.flags & SESSION_FLAG_PRESENTATION_CLOCK_SET)) { + /* Attempt to get time source from the sinks. */ LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { if (SUCCEEDED(IMFMediaSink_QueryInterface(sink->sink, &IID_IMFPresentationTimeSource, @@ -1957,6 +1970,12 @@ static HRESULT session_start_clock(struct media_session *session) } } + /* Set clock for all topology nodes. */ + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + session_set_consumed_clock((IUnknown *)source->source, session->clock); + } + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) { if (sink->event_generator && FAILED(hr = IMFMediaEventGenerator_BeginGetEvent(sink->event_generator, @@ -1969,7 +1988,15 @@ static HRESULT session_start_clock(struct media_session *session) WARN("Failed to set presentation clock for the sink, hr %#x.\n", hr); } - session->presentation.flags |= SESSION_FLAG_SINKS_SUBSCRIBED; + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type != MF_TOPOLOGY_TRANSFORM_NODE) + continue; + + session_set_consumed_clock(node->object.object, session->clock); + } + + session->presentation.flags |= SESSION_FLAG_PRESENTATION_CLOCK_SET; } if (IsEqualGUID(&session->presentation.time_format, &GUID_NULL))

1 0

Zebediah Figura : wined3d: Implement dual source blending.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: df569853bf6ed84ae4a362c8a8b89049092d72ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=df569853bf6ed84ae4a362c8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 17 19:30:38 2020 -0500 wined3d: Implement dual source blending. Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 24 ++++++++++++++++++++---- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 5 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9e3dfaa50..633d5176ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3444,6 +3444,8 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= (1u << gl_info->limits.buffers) - 1; + if (state->blend_state && state->blend_state->dual_source) + rt_mask = 1; mask = rt_mask; while (mask) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a2fbce553..26dde1087a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7772,7 +7772,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { const struct wined3d_shader_signature *output_signature = &shader->output_signature; - shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (args->dual_source_blend) + shader_addline(buffer, "vec4 ps_out[2];\n"); + else + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); if (output_signature->element_count) { for (i = 0; i < output_signature->element_count; ++i) @@ -7787,7 +7790,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ continue; } if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", output->semantic_idx); + else + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + } shader_addline(buffer, "out %s4 color_out%u;\n", component_type_info[output->component_type].glsl_vector_type, output->semantic_idx); } @@ -7800,7 +7808,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { i = wined3d_bit_scan(&mask); if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", i); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", i); + else + shader_addline(buffer, "layout(location = %u) ", i); + } shader_addline(buffer, "out vec4 color_out%u;\n", i); } } @@ -10385,7 +10398,10 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) { string_buffer_sprintf(tmp_name, "color_out%u", i); - GL_EXTCALL(glBindFragDataLocation(program_id, i, tmp_name->buffer)); + if (state->blend_state && state->blend_state->dual_source) + GL_EXTCALL(glBindFragDataLocationIndexed(program_id, 0, i, tmp_name->buffer)); + else + GL_EXTCALL(glBindFragDataLocation(program_id, i, tmp_name->buffer)); checkGLcall("glBindFragDataLocation"); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ef1a96e2..3e2a756757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4167,6 +4167,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } + + args->dual_source_blend = state->blend_state && state->blend_state->dual_source; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6289317936..fb55bfe0f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,6 +74,11 @@ void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *st return state->parent; } +static BOOL is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, const struct wined3d_blend_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) @@ -92,6 +97,12 @@ HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + TRACE("Created blend state %p.\n", object); *state = object; @@ -650,6 +661,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -658,6 +670,13 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); @@ -708,6 +727,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -716,6 +736,13 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9240b0e455..f8ee3c6446 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,7 +1394,8 @@ struct ps_compile_args DWORD alpha_test_func : 3; DWORD render_offscreen : 1; DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ - DWORD padding : 18; + DWORD dual_source_blend : 1; + DWORD padding : 17; }; enum fog_src_type @@ -1954,7 +1955,7 @@ struct wined3d_context DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1971,7 +1972,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD namedArraysLoaded : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3140,6 +3142,7 @@ struct wined3d_blend_state { LONG refcount; struct wined3d_blend_state_desc desc; + BOOL dual_source; void *parent; const struct wined3d_parent_ops *parent_ops;

1 0

Zebediah Figura : d3d10core/tests: Add a test for dual source blending.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 0d6d104513a99bb9cf539a5e1a586a2fb0713864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d6d104513a99bb9cf539a5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 17 19:30:39 2020 -0500 d3d10core/tests: Add a test for dual source blending. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 3d35ed53c8..b5b5715282 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18286,6 +18286,73 @@ static void test_independent_blend(void) release_test_context(&test_context); } +static void test_dual_source_blend(void) +{ + struct d3d10core_test_context test_context; + ID3D10BlendState *blend_state; + D3D10_BLEND_DESC blend_desc; + ID3D10PixelShader *ps; + ID3D10Device *device; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1) + { + t0 = float4(0.5, 0.5, 0.0, 1.0); + t1 = float4(0.0, 0.5, 0.5, 0.0); + } +#endif + 0x43425844, 0x87120d01, 0xa0014738, 0x3a32d86c, 0x9d757441, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000060, 0x000000ac, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, + 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, + 0x00004002, 0x00000000, 0x3f000000, 0x3f000000, 0x00000000, 0x0100003e + }; + + static const float clear_color[] = {0.7f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.BlendEnable[0] = TRUE; + blend_desc.SrcBlend = D3D10_BLEND_SRC1_COLOR; + blend_desc.DestBlend = D3D10_BLEND_SRC1_COLOR; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, clear_color); + draw_quad(&test_context); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(compare_color(color, 0x80804000, 1), "Got unexpected color 0x%08x.\n", color); + + ID3D10BlendState_Release(blend_state); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18406,6 +18473,7 @@ START_TEST(d3d10core) queue_test(test_desktop_window); queue_test(test_color_mask); queue_test(test_independent_blend); + queue_test(test_dual_source_blend); run_queued_tests();

1 0

Zebediah Figura : d3d11/tests: Add a test for dual source blending.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 31e60139d37d0c973c8e8dabdc8b86c30e96f292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e60139d37d0c973c8e8dab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 17 19:30:40 2020 -0500 d3d11/tests: Add a test for dual source blending. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 12d805d88e..729f57f443 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29993,6 +29993,76 @@ static void test_independent_blend(void) release_test_context(&test_context); } +static void test_dual_source_blend(void) +{ + struct d3d11_test_context test_context; + ID3D11BlendState *blend_state; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1) + { + t0 = float4(0.5, 0.5, 0.0, 1.0); + t1 = float4(0.0, 0.5, 0.5, 0.0); + } +#endif + 0x43425844, 0x87120d01, 0xa0014738, 0x3a32d86c, 0x9d757441, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000060, 0x000000ac, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, + 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, + 0x00004002, 0x00000000, 0x3f000000, 0x3f000000, 0x00000000, 0x0100003e + }; + + static const D3D11_BLEND_DESC blend_desc = + { + .RenderTarget[0].BlendEnable = TRUE, + .RenderTarget[0].SrcBlend = D3D11_BLEND_SRC1_COLOR, + .RenderTarget[0].DestBlend = D3D11_BLEND_SRC1_COLOR, + .RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD, + .RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE, + .RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO, + .RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD, + .RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL, + }; + + static const float clear_color[] = {0.7f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, clear_color); + draw_quad(&test_context); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(compare_color(color, 0x80804000, 1), "Got unexpected color 0x%08x.\n", color); + + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30155,6 +30225,7 @@ START_TEST(d3d11) queue_test(test_sample_attached_rtv); queue_test(test_color_mask); queue_test(test_independent_blend); + queue_test(test_dual_source_blend); run_queued_tests(); }

1 0

Zhiyi Zhang : d3d8/tests: Test device caps on multiple adapters.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: e106a460f56a3e9d1d07c4cb169028611fef114f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e106a460f56a3e9d1d07c4cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:14 2020 +0800 d3d8/tests: Test device caps on multiple adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 235 ++++++++++++++++++++++++++++------------------- 1 file changed, 138 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e106a460f56a3e9d1d07…

1 0

Zhiyi Zhang : d3d9/tests: Test device caps on multiple adapters.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 96f37f7af9cbfa5576d6d12d3b297b6b0b51ebda URL: https://source.winehq.org/git/wine.git/?a=commit;h=96f37f7af9cbfa5576d6d12d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:26 2020 +0800 d3d9/tests: Test device caps on multiple adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 312 +++++++++++++++++++++++++++++------------------ 1 file changed, 192 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96f37f7af9cbfa5576d6…

1 0

Zhiyi Zhang : d3d8/tests: Fix a test failure with Win10 WARP.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 05dd1e1804e91eb71218a161885feae7632ac66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=05dd1e1804e91eb71218a161… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:54 2020 +0800 d3d8/tests: Fix a test failure with Win10 WARP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index dd1e479cb2..42eee28217 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6497,6 +6497,7 @@ out: static void test_update_volumetexture(void) { + D3DADAPTER_IDENTIFIER8 identifier; IDirect3DDevice8 *device; IDirect3D8 *d3d8; HWND window; @@ -6506,6 +6507,7 @@ static void test_update_volumetexture(void) D3DLOCKED_BOX locked_box; ULONG refcount; D3DCAPS8 caps; + BOOL is_warp; static const struct { D3DPOOL src_pool, dst_pool; @@ -6554,6 +6556,9 @@ static void test_update_volumetexture(void) window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); + hr = IDirect3D8_GetAdapterIdentifier(d3d8, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + is_warp = adapter_is_warp(&identifier); if (!(device = create_device(d3d8, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -6624,7 +6629,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || (is_warp && (i == 6 || i == 7)), /* Fails with Win10 WARP driver */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture8_Release(src); IDirect3DVolumeTexture8_Release(dst);

1 0

Alexandre Julliard : kernelbase: Use linguistic case table for LCMAP_LINGUISTIC_CASING.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: b780e5f5b1bd018629bfa31431e216c7579fe9aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b780e5f5b1bd018629bfa314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 18 12:00:02 2020 +0100 kernelbase: Use linguistic case table for LCMAP_LINGUISTIC_CASING. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 42 +++++++-------- dlls/kernelbase/locale.c | 121 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 129 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b780e5f5b1bd018629bf…

1 0