Module: wine Branch: master Commit: 916b1564d3e17304e3e1f4a6fc9c4eea96b142c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916b1564d3e17304e3e1f4a6fc...
Author: Józef Kucia jkucia@codeweavers.com Date: Tue Sep 8 01:12:44 2015 +0200
d3d11: Rename wined3d_resource_from_resource() to wined3d_resource_from_d3d10_resource().
---
dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 10 +++++----- dlls/d3d11/utils.c | 2 +- dlls/d3d11/view.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5549c9c..6c88747 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -63,7 +63,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; -struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; +struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN;
enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e62e3e9..069c565 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1139,8 +1139,8 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box);
- wined3d_dst_resource = wined3d_resource_from_resource(dst_resource); - wined3d_src_resource = wined3d_resource_from_resource(src_resource); + wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_src_box.left = src_box->left; wined3d_src_box.top = src_box->top; wined3d_src_box.front = src_box->front; @@ -1161,8 +1161,8 @@ static void STDMETHODCALLTYPE d3d10_device_CopyResource(ID3D10Device1 *iface,
TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst_resource, src_resource);
- wined3d_dst_resource = wined3d_resource_from_resource(dst_resource); - wined3d_src_resource = wined3d_resource_from_resource(src_resource); + wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); wined3d_mutex_lock(); wined3d_device_copy_resource(device->wined3d_device, wined3d_dst_resource, wined3d_src_resource); wined3d_mutex_unlock(); @@ -1189,7 +1189,7 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac wined3d_box.back = box->back; }
- wined3d_resource = wined3d_resource_from_resource(resource); + wined3d_resource = wined3d_resource_from_d3d10_resource(resource); wined3d_mutex_lock(); wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 3d1da1f..514b147 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -502,7 +502,7 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc return d3d10_resource_misc_flags; }
-struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) +struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension;
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 331808b..0d20314 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -693,7 +693,7 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3 }
wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) { wined3d_mutex_unlock(); ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); @@ -957,7 +957,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc }
wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) { wined3d_mutex_unlock(); ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); @@ -1158,7 +1158,7 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, }
wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) { ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); return E_FAIL;