ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dxgi/tests: Fix some test failures in test_find_closest_matching_mode(). 

DXGI_MODE_SCALING_CENTERED and DXGI_MODE_SCALING_STRETCHED modes may be
supported by drivers. When these flags are specified, IDXGIOutput_FindClosestMatchingMode()
will try to find a mode matching the scaling field first, which may not
be the same as the original mode. So make sure such a mode exists before
finding them.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2020-04-08 18:00:50 +08:00 committed by Alexandre Julliard
parent 3d336d4326
commit ab59ed1a4c
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/dxgi/tests/dxgi.c
View File

@ -1298,8 +1298,13 @@ static void test_output(void)
static void test_find_closest_matching_mode(void)
{
static const DXGI_MODE_SCALING scaling_tests[] =
{
DXGI_MODE_SCALING_CENTERED,
DXGI_MODE_SCALING_STRETCHED
};
DXGI_MODE_DESC *modes, mode, matching_mode;
unsigned int i, mode_count;
unsigned int i, j, mode_count;
IDXGIAdapter *adapter;
IDXGIDevice *device;
IDXGIOutput *output;
@ -1451,23 +1456,25 @@ static void test_find_closest_matching_mode(void)
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT);
memset(&mode, 0, sizeof(mode));
mode.Width = modes[0].Width;
mode.Height = modes[0].Height;
mode.Format = modes[0].Format;
mode.Scaling = DXGI_MODE_SCALING_CENTERED;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT);
for (i = 0; i < ARRAY_SIZE(scaling_tests); ++i)
{
for (j = 0; j < mode_count; ++j)
{
if (modes[j].Scaling != scaling_tests[i])
continue;
memset(&mode, 0, sizeof(mode));
mode.Width = modes[0].Width;
mode.Height = modes[0].Height;
mode.Format = modes[0].Format;
mode.Scaling = DXGI_MODE_SCALING_STRETCHED;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT);
memset(&mode, 0, sizeof(mode));
mode.Width = modes[j].Width;
mode.Height = modes[j].Height;
mode.Format = modes[j].Format;
mode.Scaling = modes[j].Scaling;
hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL);
ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
check_mode_desc(&matching_mode, &modes[j],
MODE_DESC_IGNORE_REFRESH_RATE | MODE_DESC_IGNORE_SCANLINE_ORDERING);
break;
}
}
heap_free(modes);