February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Use amt_to_wg_format() in decodebin_parser_source_query_accept().
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: d028217a56f61631ad577f51a7b0b5083bbfc825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d028217a56f61631ad577f51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:57 2021 -0600 winegstreamer: Use amt_to_wg_format() in decodebin_parser_source_query_accept(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 070e2eca7f7..e6abc50e41b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -889,15 +889,6 @@ static GstCaps *wg_format_to_caps(const struct wg_format *format) return NULL; } -static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) -{ - struct wg_format wg_format; - - if (!amt_to_wg_format(mt, &wg_format)) - return NULL; - return wg_format_to_caps(&wg_format); -} - static bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) { if (a->major_type != b->major_type) @@ -2261,13 +2252,10 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) static HRESULT decodebin_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { - /* At least make sure we can convert it to GstCaps. */ - GstCaps *caps = amt_to_gst_caps(mt); + struct wg_format format; - if (!caps) - return S_FALSE; - gst_caps_unref(caps); - return S_OK; + /* At least make sure we can convert it to wg_format. */ + return amt_to_wg_format(mt, &format) ? S_OK : S_FALSE; } static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin,

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in query_sink().
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 29cea50d27bf611d1dc64520c1b6bd9c0241b315 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29cea50d27bf611d1dc64520… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:58 2021 -0600 winegstreamer: Avoid using Wine debug functions in query_sink(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e6abc50e41b..8fc1e8608a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -920,7 +920,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) struct parser_source *pin = gst_pad_get_element_private(pad); struct wg_parser_stream *stream = pin->wg_stream; - TRACE("pin %p, type \"%s\".\n", pin, gst_query_type_get_name(query->type)); + GST_LOG("pin %p, type \"%s\".", pin, gst_query_type_get_name(query->type)); switch (query->type) { @@ -966,7 +966,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) if (!ret && WARN_ON(gstreamer)) { gchar *str = gst_caps_to_string(caps); - WARN("Rejecting caps \"%s\".\n", debugstr_a(str)); + GST_WARNING("Rejecting caps \"%s\".", str); g_free(str); } gst_query_set_accept_caps_result(query, ret);

1 0

Zebediah Figura : winegstreamer: Don't force query_sink() onto a Wine thread.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: d355fa798857d34e8a69fc2e51c4eee3175bbe7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d355fa798857d34e8a69fc2e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:59 2021 -0600 winegstreamer: Don't force query_sink() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 9 +-------- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 90c34b1cb39..312c12fd194 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,19 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) -{ - struct cb_data cbdata = { QUERY_SINK }; - - cbdata.u.query_sink_data.pad = pad; - cbdata.u.query_sink_data.parent = parent; - cbdata.u.query_sink_data.query = query; - - call_cb(&cbdata); - - return cbdata.u.query_sink_data.ret; -} - GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) { diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index cbd9a630885..f6f1ffb526b 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -31,7 +31,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, - QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, BYTESTREAM_QUERY, @@ -94,12 +93,6 @@ struct cb_data { GstPad *pad; gpointer user; } pad_removed_data; - struct query_sink_data { - GstPad *pad; - GstObject *parent; - GstQuery *query; - gboolean ret; - } query_sink_data; } u; int finished; @@ -115,7 +108,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean bytestream_query_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean bytestream_pad_mode_activate_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8fc1e8608a1..e1309e97c4c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2858,7 +2858,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name gst_pad_set_element_private(stream->my_sink, pin); gst_pad_set_chain_function(stream->my_sink, got_data_sink); gst_pad_set_event_function(stream->my_sink, event_sink); - gst_pad_set_query_function(stream->my_sink, query_sink_wrapper); + gst_pad_set_query_function(stream->my_sink, query_sink); filter->sources[filter->source_count++] = pin; parser->streams[parser->stream_count++] = stream; @@ -2927,13 +2927,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case QUERY_SINK: - { - struct query_sink_data *data = &cbdata->u.query_sink_data; - cbdata->u.query_sink_data.ret = query_sink(data->pad, data->parent, - data->query); - break; - } default: { assert(0);

1 0

Brendan Shanks : dinput: Fix Xbox One controller D-pad on Mac.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 46980e799b844c090efe865d74d43a68520a94f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46980e799b844c090efe865d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 9 14:38:57 2021 -0800 dinput: Fix Xbox One controller D-pad on Mac. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 4ec72465500..b91b9d14b12 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -840,10 +840,10 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) return; val = IOHIDValueGetIntegerValue(valueRef); oldVal = device->generic.js.rgdwPOV[pov_idx]; - if (val >= 8) + if ((val > device->generic.props[idx].lDevMax) || (val < device->generic.props[idx].lDevMin)) newVal = -1; else - newVal = val * 4500; + newVal = (val - device->generic.props[idx].lDevMin) * 4500; device->generic.js.rgdwPOV[pov_idx] = newVal; TRACE("valueRef %s val %d oldVal %d newVal %d\n", debugstr_cf(valueRef), val, oldVal, newVal); if (oldVal != newVal)

1 0

Brendan Shanks : dinput: Enable Xbox One controller View and Xbox buttons on Mac.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 4cec31aaad4ae6f584418b0ceeef5a1fab6783ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cec31aaad4ae6f584418b0c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 9 14:38:58 2021 -0800 dinput: Enable Xbox One controller View and Xbox buttons on Mac. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index b91b9d14b12..58f6b86fc16 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -661,7 +661,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) case kIOHIDElementTypeInput_Button: { TRACE("kIOHIDElementTypeInput_Button usage_page %d\n", usage_page); - if (usage_page != kHIDPage_Button) + if ((usage_page != kHIDPage_Button) && (usage_page != kHIDPage_Consumer)) { /* avoid strange elements found on the 360 controller */ continue;

1 0

Henri Verbeet : d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 70c09cd89d7b6c181dcef4ad35f49f13ee429ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c09cd89d7b6c181dcef4ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:23:58 2021 +0100 d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a1a215858a2..ff734ba453c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27846,6 +27846,13 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_UINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_SINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_B8G8R8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R16G16_TYPELESS, 4, FALSE}, {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, @@ -27879,6 +27886,7 @@ static void test_format_compatibility(void) for (i = 0; i < ARRAY_SIZE(test_data); ++i) { unsigned int x, y, texel_dwords; + BOOL broken = FALSE; D3D11_BOX box; texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); @@ -27906,15 +27914,23 @@ 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) + colour = get_readback_color(&rb, 0, 0, 0); + if (test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && colour == bitmap_data[0]) + { + win_skip("Broken destination offset for %#x -> %#x copy.\n", + test_data[i].src_format, test_data[i].dst_format); + broken = TRUE; + } + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !broken; ++j) { 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); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && 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); @@ -27927,8 +27943,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_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && 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);

1 0

Henri Verbeet : d3d10core/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 22e16b5681ed14c68f5f6e2436f67d8146b50c94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e16b5681ed14c68f5f6e24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:23:59 2021 +0100 d3d10core/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 9e116729e82..5edd2fc1fbb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16024,6 +16024,12 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_FLOAT, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_UINT, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_SINT, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R16G16_TYPELESS, 4, FALSE}, {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE},

1 0

Henri Verbeet : d3d11/tests: Add format compatibility tests for compressed formats.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 172a90bd519be84924e283755bdb4092758bbff5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=172a90bd519be84924e28375… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:24:00 2021 +0100 d3d11/tests: Add format compatibility tests for compressed formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=172a90bd519be84924e2…

1 0

Henri Verbeet : d3d10core/tests: Add format compatibility tests for compressed formats.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 281f8ed4a51e7941a90a604c307d8eae93f696a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=281f8ed4a51e7941a90a604c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:24:01 2021 +0100 d3d10core/tests: Add format compatibility tests for compressed formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 205 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 5edd2fc1fbb..f21431b2243 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16129,6 +16129,210 @@ static void test_format_compatibility(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_compressed_format_compatibility(void) +{ + const struct format_info *src_format, *dst_format; + unsigned int row_block_count, row_count, i, j, k; + ID3D10Texture2D *src_texture, *dst_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + unsigned int block_idx, y; + DWORD colour, expected; + ID3D10Device *device; + const BYTE *row; + ULONG refcount; + D3D10_BOX box; + HRESULT hr; + + static const struct format_info + { + DXGI_FORMAT id; + size_t block_size; + size_t block_edge; + } + formats[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_UINT, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_SINT, 16, 1}, + + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_UNORM, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_UINT, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_SNORM, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_SINT, 8, 1}, + + {DXGI_FORMAT_R32G32_TYPELESS, 8, 1}, + {DXGI_FORMAT_R32G32_FLOAT, 8, 1}, + {DXGI_FORMAT_R32G32_UINT, 8, 1}, + {DXGI_FORMAT_R32G32_SINT, 8, 1}, + + {DXGI_FORMAT_R32_TYPELESS, 4, 1}, + {DXGI_FORMAT_R32_FLOAT, 4, 1}, + {DXGI_FORMAT_R32_UINT, 4, 1}, + {DXGI_FORMAT_R32_SINT, 4, 1}, + + {DXGI_FORMAT_R32G8X24_TYPELESS, 8, 1}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 4, 1}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R16G16_TYPELESS, 4, 1}, + {DXGI_FORMAT_R24G8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 4, 1}, + {DXGI_FORMAT_R8G8_TYPELESS, 2, 1}, + {DXGI_FORMAT_R16_TYPELESS, 2, 1}, + {DXGI_FORMAT_R8_TYPELESS, 1, 1}, + + {DXGI_FORMAT_BC1_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC1_UNORM, 8, 4}, + {DXGI_FORMAT_BC1_UNORM_SRGB, 8, 4}, + + {DXGI_FORMAT_BC2_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC2_UNORM, 16, 4}, + {DXGI_FORMAT_BC2_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC3_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC3_UNORM, 16, 4}, + {DXGI_FORMAT_BC3_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC4_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC4_UNORM, 8, 4}, + {DXGI_FORMAT_BC4_SNORM, 8, 4}, + + {DXGI_FORMAT_BC5_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC5_UNORM, 16, 4}, + {DXGI_FORMAT_BC5_SNORM, 16, 4}, + }; + + static const DWORD initial_data[64] = {0}; + static const DWORD texture_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + row_block_count = 4; + + texture_desc.MipLevels = 1; + 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; + + resource_data.SysMemSlicePitch = 0; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + src_format = &formats[i]; + row_count = sizeof(texture_data) / (row_block_count * src_format->block_size); + texture_desc.Width = row_block_count * src_format->block_edge; + texture_desc.Height = row_count * src_format->block_edge; + texture_desc.Format = src_format->id; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = row_block_count * src_format->block_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(hr == S_OK, "Source format %#x: Got unexpected hr %#x.\n", src_format->id, hr); + + for (j = 0; j < ARRAY_SIZE(formats); ++j) + { + dst_format = &formats[j]; + + if ((src_format->block_edge == 1 && dst_format->block_edge == 1) + || (src_format->block_edge != 1 && dst_format->block_edge != 1)) + continue; + + row_count = sizeof(initial_data) / (row_block_count * dst_format->block_size); + texture_desc.Width = row_block_count * dst_format->block_edge; + texture_desc.Height = row_count * dst_format->block_edge; + texture_desc.Format = dst_format->id; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = row_block_count * dst_format->block_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(hr == S_OK, "%#x -> %#x: Got unexpected hr %#x.\n", src_format->id, dst_format->id, hr); + + set_box(&box, 0, 0, 0, src_format->block_edge, src_format->block_edge, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, + dst_format->block_edge, dst_format->block_edge, 0, (ID3D10Resource *)src_texture, 0, &box); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + expected = initial_data[k]; + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + expected = initial_data[k]; + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + } + + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void check_clip_distance(struct d3d10core_test_context *test_context, ID3D10Buffer *vb) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -18633,6 +18837,7 @@ START_TEST(d3d10core) queue_test(test_stream_output_resume); queue_test(test_depth_bias); queue_test(test_format_compatibility); + queue_test(test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); queue_test(test_generate_mips);

1 0

Henri Verbeet : wined3d: Allow resource copies between block-compatible formats.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 02385a4042daf096a6ca693e74e6bc9043e3ae5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=02385a4042daf096a6ca693e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:24:02 2021 +0100 wined3d: Allow resource copies between block-compatible formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 ++--- dlls/wined3d/device.c | 24 ++++++++++-- dlls/wined3d/utils.c | 83 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 76 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02385a4042daf096a6ca…

1 0