[PATCH 1/2] d3d11/tests: Require D3D_FEATURE_LEVEL_11_0 for using DSV flags.
Fixes test failures on older Testbot Windows versions in test_sample_attached_rtv(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 47a974e9fc..675a9ee49c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29392,6 +29392,7 @@ static void test_sample_attached_rtv(void) struct d3d11_test_context test_context; ID3D11RenderTargetView *rtv, *rtvs[2]; D3D11_TEXTURE2D_DESC texture_desc; + D3D_FEATURE_LEVEL feature_level; D3D11_SAMPLER_DESC sampler_desc; ID3D11DepthStencilView *dsview; ID3D11BlendState *blend_state; @@ -29475,6 +29476,8 @@ static void test_sample_attached_rtv(void) device = test_context.device; context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); + texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; @@ -29644,6 +29647,16 @@ static void test_sample_attached_rtv(void) for (i = 0; i < ARRAY_SIZE(ds_tests); ++i) { + if (ds_tests[i].dsv_flags && feature_level < D3D_FEATURE_LEVEL_11_0) + { + static unsigned int skip_once; + + if (!skip_once++) + skip("Read only depths or stencils are not supported.\n"); + + continue; + } + texture_desc.Format = ds_tests[i].texture_format; hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dstexture); ok(hr == S_OK, "Test %u, got unexpected hr %#x.\n", i, hr); -- 2.23.0
This undoes unintended change of wined3d_resource_check_fbo_attached() behaviour for pre-10.0 APIs. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2974227d0c..cd831cdd42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5316,8 +5316,8 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { - return srv_format && ((srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) - || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL))); + return !srv_format || (srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, -- 2.23.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=58873 Your paranoid android. === w1064v1809_ar (32 bit report) === d3d11: d3d11.c:5776: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5777: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5778: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5781: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5782: Test failed: Got unexpected CPrimitives count: 0. === wvistau64 (64 bit report) === d3d11: d3d11.c:5776: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5777: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5778: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5781: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5782: Test failed: Got unexpected CPrimitives count: 0. === debian10 (32 bit report) === d3d11: d3d11.c:6109: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. d3d11.c:17958: Test failed: Got {0xffffffff, 0x00000001, 0x00000000, 0x00000000}, expected {0x00000000, 0x00000001, 0x00000000, 0x00000000} at (0, 0), sub-resource 0. === debian10 (32 bit French report) === d3d11: d3d11.c:5782: Test failed: Got unexpected CPrimitives count: 3. d3d11.c:5785: Test failed: Got unexpected HSInvocations count: 4. d3d11.c:5786: Test failed: Got unexpected DSInvocations count: 4. d3d11.c:5787: Test failed: Got unexpected CSInvocations count: 311040. d3d11.c:5799: Test failed: Got unexpected CPrimitives count: 3. d3d11.c:5801: Test failed: Got unexpected HSInvocations count: 4. d3d11.c:5802: Test failed: Got unexpected DSInvocations count: 4. d3d11.c:5803: Test failed: Got unexpected CSInvocations count: 311040. d3d11.c:6109: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. d3d11.c:6119: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff0000ff at (0, 0). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff00ffff at (1, 0). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff00ff00 at (2, 0). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xffffff00 at (3, 0). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xffff0000 at (0, 1). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xffff00ff at (1, 1). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff000000 at (2, 1). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff7f7f7f at (3, 1). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xffffffff at (0, 2). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xffffffff at (1, 2). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xffffffff at (2, 2). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff000000 at (3, 2). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xffffffff at (0, 3). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff000000 at (2, 3). d3d11.c:8316: Test failed: Test 60: Got unexpected color 0xff000000 at (3, 3). d3d11.c:16860: Test failed: Got {-1.00003052e+000, 0.00000000e+000, 1.00000000e+000, 0.00000000e+000}, expected {-1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 0.00000000e+000} at (0, 0), sub-resource 0. d3d11.c:17958: Test failed: Got {0x00000000, 0x00000000, 0x00000000, 0x00000000}, expected {0x00000000, 0xffffffff, 0x00000000, 0x00000000} at (0, 0), sub-resource 0. d3d11.c:17958: Test failed: Got {0x00000000, 0x00000000, 0x00000000, 0x00000000}, expected {0xffffffff, 0x00000000, 0x00000000, 0x00000000} at (0, 0), sub-resource 0. d3d11.c:17958: Test failed: Got {0xffffffff, 0x00000001, 0x00000000, 0x00000000}, expected {0x00000000, 0x00000001, 0x00000000, 0x00000000} at (0, 0), sub-resource 0. d3d11.c:17958: Test failed: Got {0x00000001, 0xffffffff, 0x00000000, 0x00000000}, expected {0x00000001, 0x00000000, 0x00000000, 0x00000000} at (0, 0), sub-resource 0. d3d11.c:16860: Test failed: Got {-1.00787401e+000, 0.00000000e+000, 1.00000000e+000, 5.03937006e-001}, expected {-1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 5.03937006e-001} at (0, 0), sub-resource 0. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (200, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (280, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (360, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (440, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (200, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (280, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (360, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 1, test 7: pixel (440, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (200, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (280, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (360, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (440, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (200, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (280, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (360, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 1, test 8: pixel (440, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (200, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (280, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (360, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (440, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (200, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (280, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (360, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 2, test 7: pixel (440, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (200, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (280, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (360, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (440, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (200, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (280, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (360, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 2, test 8: pixel (440, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (200, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (280, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (360, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (440, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (200, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (280, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (360, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 3, test 7: pixel (440, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (200, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (280, 200) has color 00000000, expected ffff0000. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (360, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (440, 200) has color 00000000, expected ff00ff00. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (200, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (280, 270) has color 00000000, expected ff0000ff. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (360, 270) has color 00000000, expected ff000000. d3d11.c:27602: Test failed: Resource type 3, test 8: pixel (440, 270) has color 00000000, expected ff000000. d3d11.c:25838: Test failed: Got depth 2.51951814e-003, expected 2.51948950e-003. d3d11.c:25838: Test failed: Got depth 2.51951814e-003, expected 2.51948950e-003. d3d11.c:25838: Test failed: Got depth 1.27950311e-003, expected 1.27948953e-003. d3d11.c:25838: Test failed: Got depth 1.27950311e-003, expected 1.27948953e-003. d3d11.c:25838: Test failed: Got depth 1.27950311e-003, expected 1.27948953e-003. d3d11.c:25838: Test failed: Got depth 1.27950311e-003, expected 1.27948953e-003. d3d11.c:25838: Test failed: Got depth 1.27950311e-003, expected 1.27948953e-003. d3d11.c:25838: Test failed: Got depth 1.27950311e-003, expected 1.27948953e-003. d3d11.c:25838: Test failed: Got depth 5.03277779e-003, expected 5.03897900e-003. d3d11.c:25838: Test failed: Got depth 5.03277779e-003, expected 5.03897900e-003. d3d11.c:25838: Test failed: Got depth 2.54905224e-003, expected 2.54897905e-003. d3d11.c:25838: Test failed: Got depth 7.52645731e-003, expected 7.53897894e-003. d3d11.c:25838: Test failed: Got depth 7.52645731e-003, expected 7.53897894e-003. d3d11.c:25838: Test failed: Got depth 2.54905224e-003, expected 2.54897905e-003. d3d11.c:25838: Test failed: Got depth 1.25139356e-002, expected 1.25389788e-002. d3d11.c:25838: Test failed: Got depth 1.25139356e-002, expected 1.25389788e-002. d3d11.c:25838: Test failed: Got depth 2.54905224e-003, expected 2.54897905e-003. d3d11.c:25838: Test failed: Got depth 6.40938997e-001, expected 6.42538965e-001. d3d11.c:25838: Test failed: Got depth 6.40938997e-001, expected 6.42538965e-001. d3d11.c:25838: Test failed: Got depth 2.54905224e-003, expected 2.54897905e-003. d3d11.c:25838: Test failed: Got depth 2.54905224e-003, expected 2.54897905e-003. d3d11.c:25838: Test failed: Got depth 2.54905224e-003, expected 2.54897905e-003. d3d11.c:25846: Test failed: Got value 0x149d4 (5.03277809e-003), expected 0x14a3c (5.03897697e-003). d3d11.c:25846: Test failed: Got value 0x149d4 (5.03277809e-003), expected 0x14a3c (5.03897697e-003). d3d11.c:25846: Test failed: Got value 0x5c5c2 (2.25487961e-002), expected 0x5c5c6 (2.25490345e-002). d3d11.c:25846: Test failed: Got value 0x1ed41 (7.52645776e-003), expected 0x1ee13 (7.53897473e-003). d3d11.c:25846: Test failed: Got value 0x1ed41 (7.52645776e-003), expected 0x1ee13 (7.53897473e-003). d3d11.c:25846: Test failed: Got value 0x5c5c2 (2.25487961e-002), expected 0x5c5c6 (2.25490345e-002). d3d11.c:25846: Test failed: Got value 0x3341d (1.25139363e-002), expected 0x335c1 (1.25389703e-002). d3d11.c:25846: Test failed: Got value 0x3341d (1.25139363e-002), expected 0x335c1 (1.25389703e-002). d3d11.c:25846: Test failed: Got value 0x5c5c2 (2.25487961e-002), expected 0x5c5c6 (2.25490345e-002). d3d11.c:25846: Test failed: Got value 0xa41493 (6.40938976e-001), expected 0xa47d6e (6.42538943e-001). d3d11.c:25846: Test failed: Got value 0xa41493 (6.40938976e-001), expected 0xa47d6e (6.42538943e-001). d3d11.c:25846: Test failed: Got value 0x5c5c2 (2.25487961e-002), expected 0x5c5c6 (2.25490345e-002). d3d11.c:25846: Test failed: Got value 0x5c5c2 (2.25487961e-002), expected 0x5c5c6 (2.25490345e-002). d3d11.c:25846: Test failed: Got value 0x5c5c2 (2.25487961e-002), expected 0x5c5c6 (2.25490345e-002). d3d11.c:25855: Test failed: Got value 0x3d8 (1.50148775e-002), expected 0x3da (1.50453956e-002). d3d11.c:25855: Test failed: Got value 0x3d8 (1.50148775e-002), expected 0x3da (1.50453956e-002). d3d11.c:25855: Test failed: Got value 0x333 (1.24971389e-002), expected 0x336 (1.25429160e-002). d3d11.c:25855: Test failed: Got value 0x333 (1.24971389e-002), expected 0x336 (1.25429160e-002). d3d11.c:25855: Test failed: Got value 0x479 (1.74715801e-002), expected 0x47d (1.75326162e-002). d3d11.c:25855: Test failed: Got value 0x479 (1.74715801e-002), expected 0x47d (1.75326162e-002). d3d11.c:25855: Test failed: Got value 0xa414 (6.40939956e-001), expected 0xa47c (6.42526894e-001). d3d11.c:25855: Test failed: Got value 0xa414 (6.40939956e-001), expected 0xa47c (6.42526894e-001). Report errors: d3d11:d3d11 prints too much data (35785 bytes) === debian10 (32 bit Chinese:China report) === d3d11: d3d11.c:6109: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. d3d11.c:6119: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. === debian10 (32 bit WoW report) === d3d11: d3d11.c:6109: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. === debian10 (64 bit WoW report) === d3d11: d3d11.c:6119: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. d3d11.c:16860: Test failed: Got {-1.00787401e+000, 0.00000000e+000, 1.00000000e+000, 5.03937006e-001}, expected {-1.00000000e+000, 0.00000000e+000, 1.00000000e+000, 5.03937006e-001} at (0, 0), sub-resource 0.
participants (3)
-
Henri Verbeet -
Marvin -
Paul Gofman