Zebediah Figura : d3d11: Use wined3d_device_context_draw_indirect().
Alexandre Julliard
julliard at winehq.org
Mon Apr 5 16:28:24 CDT 2021
Module: wine
Branch: master
Commit: 72043f8cc7cfd4053a19a0d1988d3460084aa22c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=72043f8cc7cfd4053a19a0d1988d3460084aa22c
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Apr 2 11:00:07 2021 -0500
d3d11: Use wined3d_device_context_draw_indirect().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 685551c014c..3b1c42fc592 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -1082,7 +1082,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);
@@ -1090,15 +1090,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, true);
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);
@@ -1106,8 +1105,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, false);
wined3d_mutex_unlock();
}
More information about the wine-cvs
mailing list