Commit 7c74b5b9 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

d3d11: Use wined3d_device_context_draw_indexed().

parent 8cdad7d4
...@@ -576,14 +576,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo ...@@ -576,14 +576,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo
static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext1 *iface, static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceContext1 *iface,
UINT index_count, UINT start_index_location, INT base_vertex_location) UINT index_count, UINT start_index_location, INT base_vertex_location)
{ {
struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface);
TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n",
iface, index_count, start_index_location, base_vertex_location); iface, index_count, start_index_location, base_vertex_location);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); wined3d_device_context_draw_indexed(context->wined3d_context,
wined3d_device_draw_indexed_primitive(device->wined3d_device, start_index_location, index_count); base_vertex_location, start_index_location, index_count, 0, 0);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
...@@ -704,7 +704,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 ...@@ -704,7 +704,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1
UINT instance_index_count, UINT instance_count, UINT start_index_location, INT base_vertex_location, UINT instance_index_count, UINT instance_count, UINT start_index_location, INT base_vertex_location,
UINT start_instance_location) UINT start_instance_location)
{ {
struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface);
TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, "
"base_vertex_location %d, start_instance_location %u.\n", "base_vertex_location %d, start_instance_location %u.\n",
...@@ -712,9 +712,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 ...@@ -712,9 +712,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1
base_vertex_location, start_instance_location); base_vertex_location, start_instance_location);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); wined3d_device_context_draw_indexed(context->wined3d_context, base_vertex_location,
wined3d_device_draw_indexed_primitive_instanced(device->wined3d_device, start_index_location, start_index_location, instance_index_count, start_instance_location, instance_count);
instance_index_count, start_instance_location, instance_count);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment