Commit 98e26689 authored by Jan Sikorski's avatar Jan Sikorski Committed by Alexandre Julliard

dxgi: Don't grab wined3d lock for wined3d_resource_map/unmap().

parent 48bc9ba4
...@@ -196,14 +196,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAP ...@@ -196,14 +196,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAP
if (flags & DXGI_MAP_DISCARD) if (flags & DXGI_MAP_DISCARD)
wined3d_map_flags |= WINED3D_MAP_DISCARD; wined3d_map_flags |= WINED3D_MAP_DISCARD;
wined3d_mutex_lock();
if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0, if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0,
&wined3d_map_desc, NULL, wined3d_map_flags))) &wined3d_map_desc, NULL, wined3d_map_flags)))
{ {
mapped_rect->Pitch = wined3d_map_desc.row_pitch; mapped_rect->Pitch = wined3d_map_desc.row_pitch;
mapped_rect->pBits = wined3d_map_desc.data; mapped_rect->pBits = wined3d_map_desc.data;
} }
wined3d_mutex_unlock();
return hr; return hr;
} }
...@@ -213,11 +211,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) ...@@ -213,11 +211,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface)
struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); struct dxgi_surface *surface = impl_from_IDXGISurface1(iface);
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0); wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0);
wined3d_mutex_unlock();
return S_OK; return S_OK;
} }
......
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