ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Rename wined3d_resource_from_resource() to wined3d_resource_from_d3d10_resource().

This commit is contained in:
Józef Kucia 2015-09-08 01:12:44 +02:00 committed by Alexandre Julliard
parent 41740bec89
commit 916b1564d3
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d11/d3d11_private.h
View File

@ -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; 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; 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; 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; 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; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN;

10
dlls/d3d11/device.c
View File

@ -1139,8 +1139,8 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 *
iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z,
src_resource, src_subresource_idx, src_box); src_resource, src_subresource_idx, src_box);
wined3d_dst_resource = wined3d_resource_from_resource(dst_resource); wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource);
wined3d_src_resource = wined3d_resource_from_resource(src_resource); wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource);
wined3d_src_box.left = src_box->left; wined3d_src_box.left = src_box->left;
wined3d_src_box.top = src_box->top; wined3d_src_box.top = src_box->top;
wined3d_src_box.front = src_box->front; 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); 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_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource);
wined3d_src_resource = wined3d_resource_from_resource(src_resource); wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_copy_resource(device->wined3d_device, wined3d_dst_resource, wined3d_src_resource); wined3d_device_copy_resource(device->wined3d_device, wined3d_dst_resource, wined3d_src_resource);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
@ -1189,7 +1189,7 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac
wined3d_box.back = box->back; wined3d_box.back = box->back;
} }
wined3d_resource = wined3d_resource_from_resource(resource); wined3d_resource = wined3d_resource_from_d3d10_resource(resource);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource,
subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch); subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch);

2
dlls/d3d11/utils.c
View File

@ -502,7 +502,7 @@ UINT d3d10_resource_misc_flags_from_d3d11_resource_misc_flags(UINT resource_misc
return d3d10_resource_misc_flags; 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; D3D10_RESOURCE_DIMENSION dimension;

6
dlls/d3d11/view.c
View File

@ -693,7 +693,7 @@ HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, struct d3
} }
wined3d_mutex_lock(); wined3d_mutex_lock();
if (!(wined3d_resource = wined3d_resource_from_resource(resource))) if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource)))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();
ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); 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(); wined3d_mutex_lock();
if (!(wined3d_resource = wined3d_resource_from_resource(resource))) if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource)))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();
ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); 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(); 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); ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource);
return E_FAIL; return E_FAIL;