[PATCH] d3d9: Remove duplicate condition in d3d9_device_SetStreamSource().
Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d9/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dc3363bab8..61d72e5135 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3564,12 +3564,13 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, iface, stream_idx, buffer, offset, stride); wined3d_mutex_lock(); + if (!buffer_impl) + { wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, &offset, &stride); - - if (!buffer_impl) wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) wined3d_buffer = buffer_impl->draw_buffer; else -- 2.21.0
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=55159 Your paranoid android. === debian10 (32 bit report) === d3d9: d3d9ex: Timeout device: Timeout stateblock: Timeout visual.c:9410: Test failed: Test 0 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 6 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 10 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 11 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 12 shading has color1 000000ff, expected 0000ff00. visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 0, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 1, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 2, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 3, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 4, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 5, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 6, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 7, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 8, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 9, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 10, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 11, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 12, 7, size 0). visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 0, location 3x2. visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 2, location 3x2. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 80. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 80. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 80. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 77. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 77. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 75. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 75. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 75. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 1515474505. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 1515474505. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 1515474505. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x1000. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x3000. === debian10 (32 bit Chinese:China report) === d3d9: visual.c:9410: Test failed: Test 0 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 6 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 10 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 11 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 12 shading has color1 000000ff, expected 0000ff00. visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 0, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 1, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 2, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 3, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 4, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 5, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 6, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 7, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 8, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 9, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 10, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 11, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 12, 7, size 0). visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 0, location 3x2. visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 2, location 3x2. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 80. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 80. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 80. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 77. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 77. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 75. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 75. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 75. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 1515474505. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 1515474505. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 1515474505. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x1000. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x3000. Report errors: d3d9:d3d9ex has no test summary line (early exit of the main process?) d3d9:d3d9ex has unaccounted for todo messages === debian10 (build log) === X Error of failed request: BadMatch (invalid parameter attributes) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 7 (RRSetScreenSize) === debian10 (32 bit WoW report) === d3d9: d3d9ex: Timeout device: Timeout stateblock: Timeout visual.c:9410: Test failed: Test 0 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 6 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 10 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 11 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 12 shading has color1 000000ff, expected 0000ff00. visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 0, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 1, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 2, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 3, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 4, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 5, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 6, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 7, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 8, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 9, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 10, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 11, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 12, 7, size 0). visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 0, location 3x2. visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 2, location 3x2. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 80. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 80. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 80. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 77. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 77. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 75. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 75. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 75. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 1515474505. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 1515474505. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 1515474505. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x1000. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x3000. === debian10 (64 bit WoW report) === d3d9: visual.c:9410: Test failed: Test 0 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 6 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 10 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 11 shading has color1 000000ff, expected 0000ff00. visual.c:9410: Test failed: Test 12 shading has color1 000000ff, expected 0000ff00. visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 0, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 1, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 2, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 3, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 4, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 5, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 6, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 7, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 8, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x00ff0000 (case 9, 3, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 10, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 11, 7, size 0). visual.c:11914: Test failed: Got unexpected color 0x0000ff00 (case 12, 7, size 0). visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 0, location 3x2. visual.c:20743: Test failed: Expected color 0x00000000, got 0x000000ff, format D3DFMT_Q8W8V8U8, test 2, location 3x2. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 80. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 80. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 80. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 77. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 77. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 75. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 75. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 75. visual.c:22006: Test failed: Got unexpected color 00ffffff at x=64, format 1515474505. visual.c:22013: Test failed: Got unexpected color 000000ff at x=194, format 1515474505. visual.c:22023: Test failed: Got unexpected color 00000000 at x=446, format 1515474505. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x1000. visual.c:25153: Test failed: Expected unsynchronised map for flags 0x3000. Report errors: d3d9:d3d9ex has no test summary line (early exit of the main process?) d3d9:d3d9ex has unaccounted for todo messages === debian10 (build log) === X Error of failed request: BadMatch (invalid parameter attributes) Major opcode of failed request: 140 (RANDR) Minor opcode of failed request: 7 (RRSetScreenSize)
On Mon, 5 Aug 2019 at 22:33, Andrey Gusev <andrey.goosev(a)gmail.com> wrote:
if (!buffer_impl) + { wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, &offset, &stride); - - if (!buffer_impl) wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) wined3d_buffer = buffer_impl->draw_buffer; else
The change is not necessarily wrong, but I'm not sure it's an improvement either. The compiler doesn't care, and I can't say it makes things more readable.
participants (3)
-
Andrey Gusev -
Henri Verbeet -
Marvin