March 2021 - Wine-Devel - list.winehq.org

Re: [PATCH 4/5] wined3d: Introduce wined3d_device_context_draw_indirect().

by Marvin

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=88030 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 error: patch failed: dlls/wined3d/cs.c:1072 error: patch failed: dlls/wined3d/device.c:4484 error: patch failed: dlls/wined3d/wined3d.spec:168 error: patch failed: dlls/wined3d/wined3d_private.h:4735 error: patch failed: include/wine/wined3d.h:2563 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 error: patch failed: dlls/wined3d/cs.c:1072 error: patch failed: dlls/wined3d/device.c:4484 error: patch failed: dlls/wined3d/wined3d.spec:168 error: patch failed: dlls/wined3d/wined3d_private.h:4735 error: patch failed: include/wine/wined3d.h:2563 Task: Patch failed to apply

March 31, 2021

Re: [PATCH 3/5] d3d11: Use wined3d_device_context_draw_indexed().

by Marvin

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=88029 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 Task: Patch failed to apply

March 31, 2021

Re: [PATCH 2/5] wined3d: Introduce wined3d_device_context_draw_indexed().

by Marvin

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=88028 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 error: patch failed: dlls/wined3d/device.c:2409 error: patch failed: dlls/wined3d/wined3d.spec:167 error: patch failed: include/wine/wined3d.h:2561 Task: Patch failed to apply

March 31, 2021

Re: [PATCH 1/5] wined3d: Check for a valid index buffer in d3d[89]_device_DrawIndexedPrimitive().

by Marvin

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=88027 Your paranoid android. === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 Task: Patch failed to apply === debiant2 (build log) === error: patch failed: dlls/wined3d/device.c:4480 Task: Patch failed to apply

March 31, 2021

Re: [PATCH 8/8] ntoskrnl/tests: Add a basic PnP test driver.

by Marvin

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=88026 Your paranoid android. === w7u_2qxl (32 bit report) === ntoskrnl.exe: ntoskrnl.c:1101: Test failed: failed to install device, error 0x103 ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 1121 === w7u_el (32 bit report) === ntoskrnl.exe: ntoskrnl.c:1101: Test failed: failed to install device, error 0x103 ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 1121 === w8 (32 bit report) === ntoskrnl.exe: ntoskrnl.c:1101: Test failed: failed to install device, error 0x103 ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 1121 === debiant2 (32 bit report) === ntoskrnl.exe: ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 6681336 === debiant2 (32 bit French report) === ntoskrnl.exe: ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 6681336 === debiant2 (32 bit Japanese:Japan report) === ntoskrnl.exe: ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 6681336 === debiant2 (32 bit Chinese:China report) === ntoskrnl.exe: ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 6681336 === debiant2 (32 bit WoW report) === ntoskrnl.exe: ntoskrnl.c:1106: Test failed: got error 2 ntoskrnl.c:1121: Test failed: failed to open service, error 1060 ntoskrnl.c:283: Test failed: expected SERVICE_STOPPED, got 6681336 ntoskrnl.c:1139: Test failed: Failed to delete file, error 3

March 31, 2021

Re: [PATCH v3 6/7] wined3d: Introduce wined3d_gl_get_internal_format().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

March 31, 2021

Re: [PATCH v3 4/7] wined3d: Add resolve_format parameter to blitter_blit.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

March 31, 2021

Re: [PATCH v3 3/7] wined3d: Pass format id for typeless resolve through wined3d_blt_fx.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

March 31, 2021

Re: [PATCH 4/4] d3d11: Use nameless unions.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

March 31, 2021

[PATCH 5/5] d3d11: Use wined3d_device_context_draw_indirect().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7311f6e4d7b..fe9fa7482c6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1081,7 +1081,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_buffer *d3d_buffer; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -1089,15 +1089,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndire d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); wined3d_mutex_lock(); - wined3d_device_draw_indexed_primitive_instanced_indirect(device->wined3d_device, - d3d_buffer->wined3d_buffer, offset); + wined3d_device_context_draw_indirect(context->wined3d_context, d3d_buffer->wined3d_buffer, offset, false); wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext1 *iface, ID3D11Buffer *buffer, UINT offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_buffer *d3d_buffer; TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); @@ -1105,8 +1104,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); wined3d_mutex_lock(); - wined3d_device_draw_primitive_instanced_indirect(device->wined3d_device, - d3d_buffer->wined3d_buffer, offset); + wined3d_device_context_draw_indirect(context->wined3d_context, d3d_buffer->wined3d_buffer, offset, true); wined3d_mutex_unlock(); } -- 2.30.2

March 31, 2021